svn commit: r17635 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels: ui xml

Author: bobtarling
Date: 2009-12-11 04:22:07-0800
New Revision: 17635

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XMLPropertyPanelsDataRecord.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XMLPropertyPanelsHandler.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XmlSinglePanelHandler.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/panels.xml

Log:
Some refactoring to make purpose of methods clearer. Remove method that is never called.

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java?view=diff&pathrev=17635&r1=17634&r2=17635
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java	2009-12-11 04:22:07-0800
@@ -309,7 +309,7 @@
         p.setBorder(border);
         
         if ("modifiers".equals(prop.getName())) {  
-            for (XMLPropertyPanelsDataRecord data : prop.getChildren()) {
+            for (XMLPropertyPanelsDataRecord data : prop.getCheckboxes()) {
                 buildCheckBox(p, target, data);
             }                            
         }

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XMLPropertyPanelsDataRecord.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XMLPropertyPanelsDataRecord.java?view=diff&pathrev=17635&r1=17634&r2=17635
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XMLPropertyPanelsDataRecord.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XMLPropertyPanelsDataRecord.java	2009-12-11 04:22:07-0800
@@ -56,15 +56,11 @@
         return name;
     }
     
-    public List<XMLPropertyPanelsDataRecord> getChildren() {
+    public List<XMLPropertyPanelsDataRecord> getCheckboxes() {
         return Collections.unmodifiableList(children);
     }
     
-    public void addChild(XMLPropertyPanelsDataRecord child) {
+    public void addCheckbox(XMLPropertyPanelsDataRecord child) {
         children.add(child);
     }
-    public void removeChild(XMLPropertyPanelsDataRecord child) {
-        children.remove(child);
-    }
-    
 }

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XMLPropertyPanelsHandler.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XMLPropertyPanelsHandler.java?view=diff&pathrev=17635&r1=17634&r2=17635
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XMLPropertyPanelsHandler.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XMLPropertyPanelsHandler.java	2009-12-11 04:22:07-0800
@@ -56,7 +56,7 @@
             new XMLPropertyPanelsDataRecord(localName, attr.getValue("name"));
         
         if (isChild(localName)) {
-            current.addChild(record);
+            current.addCheckbox(record);
         }
         else if (hasChildren(localName)) {
             current = record;

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XmlSinglePanelHandler.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XmlSinglePanelHandler.java?view=diff&pathrev=17635&r1=17634&r2=17635
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XmlSinglePanelHandler.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/XmlSinglePanelHandler.java	2009-12-11 04:22:07-0800
@@ -78,7 +78,7 @@
                 new XMLPropertyPanelsDataRecord(localName, 
                         attr.getValue("name"));            
             if (isChild(localName)) {
-                current.addChild(record);
+                current.addCheckbox(record);
             }
             else if (hasChildren(localName)) {
                 current = record;

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/panels.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/panels.xml?view=diff&pathrev=17635&r1=17634&r2=17635
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/panels.xml	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/xml/panels.xml	2009-12-11 04:22:07-0800
@@ -3930,4 +3930,7 @@
     <attribute name="package" type="Package" />
     <attribute name="importedElement" type="ModelElement" />
   </panel>
+  <panel name="TemplateParameter">
+    <text name="name" type="Name" />
+  </panel>
 </panels>
\ No newline at end of file

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2429752

To unsubscribe from this discussion, e-mail: [[email protected]].