Changeset 1773

Timestamp:

02/24/12 15:18:55 (12 years ago)

Author:

twagoo

Message:

Created ChildNameValidator? which checks if a component or element name is unique among siblings. Both ComponentEdit? and ElementEdit? add set it as a validator on the NameInputLine? field, which now takes a validator as constructor parameter.

Location:

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

Files:

• ChildNameValidator.as (added)
• ComponentEdit.as (modified) (3 diffs)
• ElementEdit.as (modified) (2 diffs)
• FormItemInputLine.as (modified) (1 diff)
• NameInputLine.as (modified) (2 diffs)

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

@@ -29 +29 @@
         
         [Event(name="removeComponent", type="flash.events.Event")]
-        public class ComponentEdit extends Form implements CMDValidator {
+        public class ComponentEdit extends Form {
                 public static const REMOVE_COMPONENT_EVENT:String = "removeComponent";
                 private static const DRAG_ITEMS:String = "items";
@@ -161 +161 @@
                 private function addNameInput():void {
                         var nameInput:FormItemInputLine = new NameInputLine(_component.name, function(val:String):void {
-                                _component.name = val;
-                        });
+                                _component.name = val;  
+                        }, new ChildNameValidator(_parentComponent, component));
                         addChild(nameInput);
                 }
@@ -291 +291 @@
                         return heading;
                 }
-                
-                public function validate():Boolean{
-                        // Parent must not have another component or element of the same name
-                        for each (var component:CMDComponent in _parentComponent.cmdComponents) {
-                                if(component != _component && component.name == _component.name){
-                                        return false;
-                                }       
-                        }
-                        for each (var element:CMDComponentElement in _parentComponent.cmdElements) {
-                                if(element.name == _component.name){
-                                        return false;
-                                }
-                        }
-                        return true;
-                }
         }
 }

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

@@ -21 +21 @@
 
         [Event(name="removeElement", type="flash.events.Event")]
-        public class ElementEdit extends Form implements CMDValidator {
+        public class ElementEdit extends Form {
                 public static const REMOVE_ELEMENT_EVENT:String = "removeElement";
                 private var _element:CMDComponentElement;
@@ -150 +150 @@
                         var nameInput:NameInputLine = new NameInputLine(_element.name, function(val:String):void {
                                         _element.name = val;
-                                })
+                        }, new ChildNameValidator(_parentComponent, element));
                         addChild(nameInput);
-                }
-                
-                
-                public function validate():Boolean{
-                        // Parent must not have another component or element of the same name
-                        for each (var component:CMDComponent in _parentComponent.cmdComponents) {
-                                if(component.name == _element.name){
-                                        return false;
-                                }       
-                        }
-                        for each (var element:CMDComponentElement in _parentComponent.cmdElements) {
-                                if(element != _element && element.name == _element.name){
-                                        return false;
-                                }
-                        }
-                        return true;
                 }
         }

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

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.editor {
         import clarin.cmdi.componentregistry.common.StyleConstants;
-        
-        import flash.events.Event;
         
         import mx.binding.utils.BindingUtils;
         import mx.containers.FormItem;
         import mx.controls.TextInput;
-        import mx.events.FlexEvent;
         import mx.events.ValidationResultEvent;
         import mx.validators.Validator;

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

@@ -1 +1 @@
 package clarin.cmdi.componentregistry.editor {
         import clarin.cmdi.componentregistry.common.LabelConstants;
-
+        
         import mx.events.ValidationResultEvent;
         import mx.validators.Validator;
@@ -9 +9 @@
                 private var validator:Validator;
 
-                public function NameInputLine(value:String, bindingFunction:Function) {
-                        super(LabelConstants.NAME, value, bindingFunction, true, InputValidators.getNameValidator());
+                public function NameInputLine(value:String, bindingFunction:Function, validator:Validator=null) {
+                        super(LabelConstants.NAME, value, bindingFunction, true, validator);
                 }