Changeset 2112

Timestamp:

08/17/12 11:37:24 (12 years ago)

Author:

twagoo

Message:

Took component child elements and components out of the hideable area

Location:

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

Files:

• ComponentEdit.as (modified) (6 diffs)
• ComponentSummary.mxml (modified) (1 diff)
• ElementSummary.mxml (modified) (1 diff)

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

@@ -141 +141 @@
                                 drawFocus(false);
                         });
-                        hideableForm.addChild(addComponentLabel);
+                        addChild(addComponentLabel);
                 }
                 
@@ -158 +158 @@
                                 drawFocus(false);
                         });
-                        hideableForm.addChild(addElementLabel);
+                        addChild(addElementLabel);
                 }
                 
@@ -279 +279 @@
                         comp.setStyle("paddingLeft", "50");
                         if (!addComponentLabel) {
-                                hideableForm.addChild(comp);
+                                addChild(comp);
                         } else {
-                                hideableForm.addChildAt(comp, hideableForm.getChildIndex(addComponentLabel));
+                                addChildAt(comp, getChildIndex(addComponentLabel));
                         }
                 }
@@ -288 +288 @@
                         var comp:CMDComponent = ComponentEdit(event.currentTarget).component;
                         _component.removeComponent(comp);
-                        hideableForm.removeChild(event.currentTarget as DisplayObject);
+                        removeChild(event.currentTarget as DisplayObject);
                 }
                 
@@ -302 +302 @@
                         elem.addEventListener(ElementEdit.REMOVE_ELEMENT_EVENT, removeElement);
                         if (!addElementLabel) {
-                                hideableForm.addChild(elem);
+                                addChild(elem);
                         } else {
-                                hideableForm.addChildAt(elem, hideableForm.getChildIndex(addElementLabel));
+                                addChildAt(elem, getChildIndex(addElementLabel));
                         }
                 }
@@ -311 +311 @@
                         var elem:CMDComponentElement = ElementEdit(event.currentTarget).element;
                         _component.removeElement(elem);
-                        hideableForm.removeChild(event.currentTarget as DisplayObject);
+                        removeChild(event.currentTarget as DisplayObject);
                 }
                 

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/ComponentSummary.mxml

@@ -31 +31 @@
                 </mx:HBox>
                 
-                <mx:HBox minWidth="150">
+                <mx:HBox minWidth="160">
                         <mx:Label text="Cardinality: " fontWeight="bold"/>
-                        <mx:Label text="{component.cardinalityMin+':'+component.cardinalityMax}" />
-                </mx:HBox>
-                
-                <mx:HBox minWidth="120"
-                                 visible="{component.cmdComponents.length > 0}"
-                                 includeInLayout="{component.cmdComponents.length > 0}">
-                        <mx:Label text="Child components: " fontWeight="bold"/>
-                        <mx:Label text="{component.cmdComponents.length}" />
-                </mx:HBox>
-
-                <mx:HBox minWidth="120"
-                                 visible="{component.cmdElements.length > 0}"
-                                 includeInLayout="{component.cmdElements.length > 0}">
-                        <mx:Label text="Child elements: " fontWeight="bold"/>
-                        <mx:Label text="{component.cmdElements.length}" />
+                        <mx:Label text="{component.cardinalityMin+' - '+component.cardinalityMax}" />
                 </mx:HBox>
 

ComponentRegistry/branches/ComponentRegistry-1.12.0/ComponentBrowserGui/src/main/flex/clarin/cmdi/componentregistry/editor/ElementSummary.mxml

@@ -41 +41 @@
         <mx:HBox>       
                 -->
-                <mx:HBox minWidth="150">
+                <mx:HBox minWidth="160">
                         <mx:Label text="Cardinality: " fontWeight="bold"/>
-                        <mx:Label text="{element.cardinalityMin+':'+element.cardinalityMax}" />
+                        <mx:Label text="{element.cardinalityMin+' - '+element.cardinalityMax}" />
                 </mx:HBox>