svn commit: r17645 - trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels: meta ui

Author: bobtarling
Date: 2009-12-11 12:17:50-0800
New Revision: 17645

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierFeatureListModel.java

Log:
Add templateParameters list to Class and Interface

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml?view=diff&pathrev=17645&r1=17644&r2=17645
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/meta/panels.xml	2009-12-11 12:17:50-0800
@@ -197,6 +197,7 @@
       <checkbox name="isAbstract" type="Boolean" />
       <checkbox name="isActive" type="Boolean" />
     </checkgroup>
+    <list name="templateParameter" type="TemplateParameter" />
 	<separator />
     <list name="clientDependency" type="Dependency" />
     <list name="supplierDependency" type="ModelElement" />
@@ -215,7 +216,6 @@
     <attribute name="targetFlow" type="Flow" />
     <attribute name="sourceFlow" type="Flow" />
     <attribute name="comment" type="Comment" />
-    <attribute name="templateParameter" type="TemplateParameter" />
     <attribute name="presentation" type="ModelElement" />
     <attribute name="defaultedParameter" type="ModelElement" />
     <attribute name="elementResidence" type="ModelElement" />
@@ -401,6 +401,7 @@
       <checkbox name="isLeaf" type="Boolean" />
       <checkbox name="isAbstract" type="Boolean" />
     </checkgroup>
+    <list name="templateParameter" type="TemplateParameter" />
 	<separator/>
 	<list name="generalization" type="Generalization" />    
     <list name="specialization" type="GeneralizableElement" />

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java?view=diff&pathrev=17645&r1=17644&r2=17645
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java	2009-12-11 12:17:50-0800
@@ -186,6 +186,8 @@
             list = new ScrollList(new UMLActionSequenceActionList(model));     
         } else if ("typedValue".equals(propName)) {
             model = new UMLTagDefinitionTypedValuesListModel(modelElement); 
+        } else if ("templateParameter".equals(propName)) {
+            model = new UMLModelElementTemplateParameterListModel(modelElement); 
         }
         
         if (list != null) {

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java?view=diff&pathrev=17645&r1=17644&r2=17645
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/RowSelector.java	2009-12-11 12:17:50-0800
@@ -170,7 +170,7 @@
     /**
      * The toolbar of controls for manipulating items in the list
      */
-    private final JToolBar tb;
+    private final JToolBar toolbar;
 
     /**
      * The delete action that we must enable/disable
@@ -243,7 +243,7 @@
             scroll.setVerticalScrollBarPolicy(
                     JScrollPane.VERTICAL_SCROLLBAR_NEVER);
             expander = null;
-            tb = null;
+            toolbar = null;
             deleteAction = null;
             moveUpAction = null;
             moveDownAction = null;
@@ -280,9 +280,9 @@
             }
 
             final ToolBarFactory tbf = new ToolBarFactory(actions);
-            tb = tbf.createToolBar();
-            tb.setRollover(true);
-            tb.setOrientation(ToolBar.VERTICAL);
+            toolbar = tbf.createToolBar();
+            toolbar.setRollover(true);
+            toolbar.setOrientation(ToolBar.VERTICAL);
 
             JPanel buttonPanel =
                 new JPanel(new FlexiGridLayout(2, 1, FlexiGridLayout.ROWCOLPREFERRED));
@@ -290,9 +290,9 @@
             this.addMouseListener(this);
             setIcon();
             buttonPanel.add(expander);
-            if (tb != null) {
-                tb.setVisible(false);
-                buttonPanel.add(tb);
+            if (toolbar != null) {
+                toolbar.setVisible(false);
+                buttonPanel.add(toolbar);
             }
             add(buttonPanel, BorderLayout.WEST);
 
@@ -377,8 +377,8 @@
         expanded = !expanded;
 
         setIcon();
-        if (tb != null) {
-            tb.setVisible(expanded);
+        if (toolbar != null) {
+            toolbar.setVisible(expanded);
         }
 
         // Froce the parent to redraw

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierFeatureListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierFeatureListModel.java?view=diff&pathrev=17645&r1=17644&r2=17645
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierFeatureListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierFeatureListModel.java	2009-12-11 12:17:50-0800
@@ -51,16 +51,14 @@
      * @see org.argouml.uml.ui.UMLModelElementListModel2#buildModelList()
      */
     protected void buildModelList() {
-        if (getTarget() != null) {
-            setAllElements(getModelElements());
-        }
+        setAllElements(getModelElements());
     }
 
     /*
      * @see org.argouml.uml.ui.UMLModelElementListModel2#isValidElement(Object)
      */
     protected boolean isValidElement(Object element) {
-        return Model.getFacade().getFeatures(getTarget()).contains(element);
+        return getModelElements().contains(element);
     }
 
     @Override

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

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