Changeset 371

Timestamp:

04/21/10 16:30:07 (14 years ago)

Author:

patdui

Message:

• added displayPriority to browser and editor

Location:

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry

Files:

• browser/XMLBrowser.as (modified) (3 diffs)
• editor/CardinalityInput.as (modified) (3 diffs)
• editor/ElementEdit.as (modified) (2 diffs)
• editor/NumericStepperInputLine.as (added)
• editor/model/CMDComponentElement.as (modified) (2 diffs)
• editor/model/CMDComponentElementTest.as (modified) (1 diff)
• editor/model/CMDModelFactory.as (modified) (1 diff)

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/browser/XMLBrowser.as

@@ -37 +37 @@
                 public static const CARDINALITY_MAX:String = "CardinalityMax";
                 public static const DOCUMENTATION:String = "Documentation";
+                public static const DISPLAY_PRIORITY:String = "DisplayPriority";
 
                 private var _spec:CMDSpec;
@@ -99 +100 @@
                         addFormChild(ruler);
                         addFormHeading(COMPONENT);
-                        createAndAddFormChild("Name", component.name);
+                        createAndAddFormChild(NAME, component.name);
                         createAndAddFormChild(CONCEPTLINK, component.conceptLink);
                         createAndAddFormChild("FileName", component.filename);
@@ -114 +115 @@
                                 indent = true;
                                 addFormHeading("Element");
-                                createAndAddFormChild("Name", element.name);
+                                createAndAddFormChild(NAME, element.name);
                                 createAndAddFormChild(CONCEPTLINK, element.conceptLink);
-                                createAndAddFormChild("Documentation", element.documentation);
+                                createAndAddFormChild(DOCUMENTATION, element.documentation);
+                                createAndAddFormChild(DISPLAY_PRIORITY, element.displayPriority);
                                 if (element.cardinalityMin != "" || element.cardinalityMax != "")
                                         createAndAddFormChild("Cardinality", element.cardinalityMin + " - " + element.cardinalityMax);

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/CardinalityInput.as

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.editor {
         import clarin.cmdi.componentregistry.common.StyleConstants;
-
-        import flash.events.Event;
-        import flash.events.TextEvent;
 
         import mx.binding.utils.BindingUtils;
@@ -10 +7 @@
         import mx.containers.FormItemDirection;
         import mx.controls.ComboBox;
-        import mx.controls.TextInput;
-        import mx.events.ListEvent;
 
         public class CardinalityInput extends FormItem {
                 private var numericList:ComboBox = new ComboBox();
+
+                private static var cardinalityData:ArrayCollection = createCardinalityData();
+
+                private static function createCardinalityData():ArrayCollection {
+                        var result:ArrayCollection = new ArrayCollection([{label: "unbounded", data: "unbounded"}]);
+                        for (var i:int = 0; i < 10; i++) {
+                                result.addItem({label: i, data: i});
+                        }
+                        return result;
+                }
 
                 public function CardinalityInput(name:String, value:String, bindingFunction:Function, editable:Boolean = true) {
@@ -22 +27 @@
                         styleName = StyleConstants.XMLBROWSER_FIELD;
                         BindingUtils.bindSetter(bindingFunction, numericList, "text");
+                        numericList.width = 300;
                         numericList.editable = true;
                         numericList.prompt = value;
-                        numericList.toolTip = "Pick a value or type a number";
-                        numericList.dataProvider = new ArrayCollection([{label: "unbounded", data: "unbounded"}, {label: "0", data: "0"}, {label: "1", data: "1"}]);
+                        numericList.toolTip = "Pick a value or type any number";
+                        numericList.dataProvider = cardinalityData;
                 }
 

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/ElementEdit.as

@@ -3 +3 @@
         import clarin.cmdi.componentregistry.common.StyleConstants;
         import clarin.cmdi.componentregistry.editor.model.CMDComponentElement;
-
+        
         import flash.events.Event;
         import flash.events.MouseEvent;
-
+        
         import mx.containers.Form;
         import mx.containers.FormItem;
@@ -43 +43 @@
                         addChild(new FormItemInputLine(XMLBrowser.DOCUMENTATION, _element.documentation, function(val:String):void {
                                         _element.documentation = val;
+                                }));
+                        addChild(new NumericStepperInputLine(XMLBrowser.DISPLAY_PRIORITY, _element.displayPriority, function(val:String):void {
+                                        _element.displayPriority = val;
                                 }));
                         addChild(new CardinalityInput(XMLBrowser.CARDINALITY_MIN, _element.cardinalityMin, function(val:String):void {

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/model/CMDComponentElement.as

@@ -11 +11 @@
                 public var conceptLink:String;
                 public var documentation:String;
+                public var displayPriority:String;
                 private var _valueSchemeSimple:String;
                 public var cardinalityMin:String = "1";
@@ -56 +57 @@
                         if (documentation)
                                 result.@Documentation = documentation;
+                        if (displayPriority)
+                                result.@DisplayPriority = displayPriority;
                         if (valueSchemeSimple)
                                 result.@ValueScheme = valueSchemeSimple;

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/model/CMDComponentElementTest.as

@@ -21 +21 @@
                         result.valueSchemeSimple = "string";
                         result.documentation = "Docu";
+                        result.displayPriority = "0";
                         var att:CMDAttribute = new CMDAttribute();
                         att.name = "test";
                         att.valueSchemeSimple = "string";
                         result.attributeList.addItem(att);
-                        var expected:XML = <CMD_Element name="aap" Documentation="Docu" ValueScheme="string" CardinalityMin="1" CardinalityMax="1">
+                        var expected:XML = <CMD_Element name="aap" Documentation="Docu" DisplayPriority="0" ValueScheme="string" CardinalityMin="1" CardinalityMax="1">
                                         <AttributeList>
                                                 <Attribute>

ComponentRegistry/trunk/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/model/CMDModelFactory.as

@@ -51 +51 @@
                         result.conceptLink = xml.@ConceptLink;
                         result.documentation = xml.@Documentation;
+                        result.displayPriority = xml.@DisplayPriority;
                         result.valueSchemeSimple = xml.@ValueScheme;
                         result.cardinalityMin = xml.@CardinalityMin;