Changeset 2071

Timestamp:

08/08/12 12:57:14 (12 years ago)

Author:

twagoo

Message:

Merged from trunk: made unbounded option in CardinalityInput?? optional, took it away for minimal occurences
Fixes #210

Location:

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui

Files:

• . (modified) (1 prop)
• src/main/flex/clarin/cmdi/componentregistry/editor/CardinalityInput.as (modified) (4 diffs)
• src/main/flex/clarin/cmdi/componentregistry/editor/ComponentEdit.as (modified) (1 diff)
• src/main/flex/clarin/cmdi/componentregistry/editor/ElementEdit.as (modified) (1 diff)

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/CardinalityInput.as

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.editor {
         import clarin.cmdi.componentregistry.common.StyleConstants;
-
+        
         import mx.binding.utils.BindingUtils;
         import mx.collections.ArrayCollection;
@@ -7 +7 @@
         import mx.containers.FormItemDirection;
         import mx.controls.ComboBox;
-
+        
         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"}]);
+                public static const BOUNDED:String = "bounded";
+                public static const UNBOUNDED:String = "unbounded";
+                
+                private static var BOUNDED_CARDINALITY_DATA:ArrayCollection = createCardinalityData(false);
+                private static var UNBOUNDED_CARDINALITY_DATA:ArrayCollection = createCardinalityData(true);
+                
+                private static function createCardinalityData(includeUnbounded:Boolean):ArrayCollection {
+                        var result:ArrayCollection = new ArrayCollection();
+                        if(includeUnbounded){
+                                result.addItem({label: "unbounded", data: "unbounded"});
+                        }
                         for (var i:int = 0; i < 10; i++) {
                                 result.addItem({label: i, data: i});
@@ -20 +25 @@
                         return result;
                 }
-
-                public function CardinalityInput(name:String, value:String, bindingFunction:Function, editable:Boolean = true) {
+                
+                private var numericList:ComboBox = new ComboBox();
+                
+                public function CardinalityInput(name:String, value:String, cardinalityType:String, bindingFunction:Function, editable:Boolean = true) {
                         super();
                         label = name;
@@ -31 +38 @@
                         numericList.prompt = value;
                         numericList.toolTip = "Pick a value or type any number";
-                        numericList.dataProvider = cardinalityData;
+                        if(cardinalityType == BOUNDED){
+                                numericList.dataProvider = BOUNDED_CARDINALITY_DATA;
+                        } else if(cardinalityType == UNBOUNDED){
+                                numericList.dataProvider = UNBOUNDED_CARDINALITY_DATA
+                        }
                 }
-
-
+                
+                
                 protected override function createChildren():void {
                         super.createChildren();
                         addChild(numericList);
                 }
-
+                
         }
 }

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/ComponentEdit.as

@@ -167 +167 @@
                 
                 private function addCardinalityInput():void {
-                        addChild(new CardinalityInput(LabelConstants.CARDINALITY_MIN, _component.cardinalityMin, function(val:String):void {
+                        addChild(new CardinalityInput(LabelConstants.CARDINALITY_MIN, _component.cardinalityMin, CardinalityInput.BOUNDED, function(val:String):void {
                                 _component.cardinalityMin = val;
                         }));
-                        addChild(new CardinalityInput(LabelConstants.CARDINALITY_MAX, _component.cardinalityMax, function(val:String):void {
+                        addChild(new CardinalityInput(LabelConstants.CARDINALITY_MAX, _component.cardinalityMax, CardinalityInput.UNBOUNDED,function(val:String):void {
                                 _component.cardinalityMax = val;
                         }));

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/ElementEdit.as

@@ -57 +57 @@
                                 }));
                         
-                        var cardinalityMinInput:CardinalityInput = new CardinalityInput(LabelConstants.CARDINALITY_MIN, _element.cardinalityMin, function(val:String):void {
+                        var cardinalityMinInput:CardinalityInput = new CardinalityInput(LabelConstants.CARDINALITY_MIN, _element.cardinalityMin, CardinalityInput.BOUNDED, function(val:String):void {
                                 _element.cardinalityMin = val;
                         });
                         addChild(cardinalityMinInput);
                         
-                        var cardinalityMaxInput:CardinalityInput = new CardinalityInput(LabelConstants.CARDINALITY_MAX, _element.cardinalityMax, function(val:String):void {
+                        var cardinalityMaxInput:CardinalityInput = new CardinalityInput(LabelConstants.CARDINALITY_MAX, _element.cardinalityMax, CardinalityInput.UNBOUNDED, function(val:String):void {
                                 _element.cardinalityMax = val;
                         });