Changeset 1899

Timestamp:

04/20/12 14:25:37 (12 years ago)

Author:

twagoo

Message:

Created AttributeNameValidator? based on ChildNameValidator? to check uniqueness of attribute names. CMDComponent and CMDComponentElement now implement new interface AttributeContainer? so that validator can work on both through this interface. AttributeListEdit? now gets attribute parent (of type AttributeContainer?) instead of just the list so that it can pass it on to the validator, and take the list from it.

Fixes #184

Location:

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

Files:

• AttributeListEdit.as (modified) (4 diffs)
• AttributeNameValidator.as (added)
• CMDComponentXMLEditor.as (modified) (1 diff)
• ComponentEdit.as (modified) (1 diff)
• ElementEdit.as (modified) (1 diff)
• model/AttributeContainer.as (added)
• model/CMDComponent.as (modified) (2 diffs)
• model/CMDComponentElement.as (modified) (2 diffs)

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

@@ -4 +4 @@
         import clarin.cmdi.componentregistry.common.components.AddAttributeLabelButton;
         import clarin.cmdi.componentregistry.common.components.RemoveLabelButton;
+        import clarin.cmdi.componentregistry.editor.model.AttributeContainer;
         import clarin.cmdi.componentregistry.editor.model.CMDAttribute;
         import clarin.cmdi.componentregistry.editor.model.ValueSchemeInterface;
@@ -26 +27 @@
                 private var _attributes:ArrayCollection;
                 private var _parent:UIComponent;
+                private var _parentContainer:AttributeContainer;
                 private var noAttributesLabel:Label = new Label();
                 [Bindable]
@@ -31 +33 @@
                 private var addAttributeLabelButton:AddAttributeLabelButton;
 
-                public function AttributeListEdit(attributes:ArrayCollection, parent:UIComponent) {
+                public function AttributeListEdit(parentContainer:AttributeContainer, parent:UIComponent) {
                         super();
-                        _attributes = attributes;
+                        _parentContainer = parentContainer;
+                        _attributes = parentContainer.getAttributeList();
+                        _parent = parent;
                         hasNoAttributes = _attributes.length == 0;
-                        _parent = parent;
                         styleName = StyleConstants.XMLBROWSER;
                         noAttributesLabel.text = "No Attributes";
@@ -128 +131 @@
                         var name:NameInputLine = new NameInputLine(attribute.name, function(val:String):void {
                                         attribute.name = val;
-                                }, InputValidators.getNameValidator());
+                                }, new AttributeNameValidator(_parentContainer, attribute));
                         name.direction = FormItemDirection.HORIZONTAL
                         var removeButton:Label = new RemoveLabelButton();

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

@@ -243 +243 @@
                         addChild(link);
                         
-                        addChild(new AttributeListEdit(_firstComponent.attributeList, this))
+                        addChild(new AttributeListEdit(_firstComponent, this))
                 }
 

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

@@ -236 +236 @@
                 
                 private function handleCMDAttributeList():void {
-                        addChild(new AttributeListEdit(_component.attributeList, this));
+                        addChild(new AttributeListEdit(_component, this));
                 }
                 

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

@@ -136 +136 @@
 
                 private function handleCMDAttributeList():void {
-                        var attributeEdit:Container = new AttributeListEdit(_element.attributeList, this);
+                        var attributeEdit:Container = new AttributeListEdit(_element, this);
                         addChild(attributeEdit);
                 }

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

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.editor.model {
         import clarin.cmdi.componentregistry.common.XmlAble;
-
+        
         import mx.collections.ArrayCollection;
 
-        public class CMDComponent implements XmlAble {
+        public class CMDComponent implements XmlAble, AttributeContainer {
 
                 //Attributes
@@ -111 +111 @@
                         return result;
                 }
-
+                
+                public function getAttributeList():ArrayCollection {
+                        return attributeList;
+                }
         }
 }

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

@@ -8 +8 @@
 
         [Bindable]
-        public class CMDComponentElement implements XmlAble, ValueSchemeInterface {
+        public class CMDComponentElement implements XmlAble, ValueSchemeInterface, AttributeContainer {
 
                 //Attributes
@@ -97 +97 @@
                 }
 
+                public function getAttributeList():ArrayCollection {
+                        return attributeList;
+                }
 
         }