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

Author: bobtarling
Date: 2009-04-05 08:51:36-0700
New Revision: 17044

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/ListFactory.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementOrderedListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java

Log:
Continue moving behavioural data to ListModels and simplify JLists

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=17044&r1=17043&r2=17044
==============================================================================
--- 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-04-05 08:51:36-0700
@@ -68,20 +68,11 @@
             model = new UMLNamespaceOwnedElementListModel();
         } else if ("elementImport".equals(propName)) {
             model = new UMLClassifierPackageImportsListModel();
-            model.setTarget(modelElement);
-            list = new ScrollList(new UMLMutableLinkedList(model,
-                    // TODO: It's OK to change the visibility of this actions?
-                    null, // new ActionAddPackageImport(),
-                    null,
-                    null));
         } else if ("parameter".equals(propName)) {
             if (Model.getFacade().isAObjectFlowState(modelElement)) {
                 model = new UMLObjectFlowStateParameterListModel(metaType);
             } else {
                 model = new UMLClassifierParameterListModel();
-                model.setTarget(modelElement);
-                list = new ScrollList(new UMLLinkedList(model, 
-                        true, false));
             }
         } else if ("raisedSignal".equals(propName)) {
             model = new UMLOperationRaisedSignalsListModel();
@@ -111,10 +102,6 @@
             model = new UMLAssociationEndQualifiersListModel();
         } else if ("annotatedElement".equals(propName)) {
             model = new UMLCommentAnnotatedElementListModel();
-            model.setTarget(modelElement);
-            UMLMutableLinkedList l = new UMLMutableLinkedList(
-                    model, null, null, null);
-            list = new ScrollList(l);
         } else if ("context".equals(propName)) {
             model = new UMLSignalContextListModel(metaType);
         } else if ("reception".equals(propName)) {
@@ -126,19 +113,8 @@
         } else if ("extensionPoint".equals(propName)) {
             if (Model.getFacade().isAUseCase(modelElement)) {
                 model = new UMLUseCaseExtensionPointListModel();
-                model.setTarget(modelElement);
-                JList l = new UMLMutableLinkedList(
-                            model, null,
-                            ActionNewUseCaseExtensionPoint.SINGLETON);
-                list = new ScrollList(l);
             } else {
-                model = new UMLExtendExtensionPointListModel();
-                model.setTarget(modelElement);
-                JList l =
-                    new UMLMutableLinkedList(model, 
-                        ActionAddExtendExtensionPoint.getInstance(),
-                        ActionNewExtendExtensionPoint.SINGLETON);
-                list = new ScrollList(l);
+                model = new UMLExtendExtensionPointListModel(modelElement);
             }
         } else if ("base".equals(propName)) {
             model = new UMLClassifierRoleBaseListModel(metaType);

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java?view=diff&pathrev=17044&r1=17043&r2=17044
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLExtendExtensionPointListModel.java	2009-04-05 08:51:36-0700
@@ -27,6 +27,8 @@
 import java.util.List;
 
 import org.argouml.model.Model;
+import org.argouml.uml.ui.behavior.use_cases.ActionAddExtendExtensionPoint;
+import org.argouml.uml.ui.behavior.use_cases.ActionNewExtendExtensionPoint;
 
 /**
  * @since Oct 6, 2002
@@ -38,8 +40,11 @@
     /**
      * Constructor for UMLExtendExtensionPointListModel.
      */
-    public UMLExtendExtensionPointListModel() {
-        super("extensionPoint");
+    public UMLExtendExtensionPointListModel(Object modelElement) {
+        super("extensionPoint", Model.getMetaTypes().getExtensionPoint(), 
+              ActionAddExtendExtensionPoint.getInstance(),
+              ActionNewExtendExtensionPoint.SINGLETON,
+              null);
     }
 
     /*

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementOrderedListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementOrderedListModel.java?view=diff&pathrev=17044&r1=17043&r2=17044
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementOrderedListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementOrderedListModel.java	2009-04-05 08:51:36-0700
@@ -30,6 +30,9 @@
 import javax.swing.JPopupMenu;
 
 import org.argouml.i18n.Translator;
+import org.argouml.uml.ui.AbstractActionAddModelElement2;
+import org.argouml.uml.ui.AbstractActionNewModelElement;
+import org.argouml.uml.ui.AbstractActionRemoveElement;
 import org.tigris.gef.undo.UndoableAction;
 
 /**
@@ -51,6 +54,21 @@
      * @param name
      *            the name
      */
+    public UMLModelElementOrderedListModel(
+            final String name, 
+            final Object theMetaType, 
+            final AbstractActionAddModelElement2 addAction, 
+            final AbstractActionNewModelElement newAction, 
+            final AbstractActionRemoveElement removeAction) {
+        super(name, theMetaType, addAction, newAction, removeAction);
+    }
+
+    /**
+     * The constructor.
+     *
+     * @param name
+     *            the name
+     */
     public UMLModelElementOrderedListModel(String name) {
         super(name);
     }

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java?view=diff&pathrev=17044&r1=17043&r2=17044
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java	2009-04-05 08:51:36-0700
@@ -30,6 +30,7 @@
 
 import org.argouml.model.Model;
 import org.argouml.uml.ui.UMLModelElementOrderedListModel2;
+import org.argouml.uml.ui.behavior.use_cases.ActionNewUseCaseExtensionPoint;
 
 /**
  * Model for the ExtensionPoints of a UseCase. <p>
@@ -47,7 +48,11 @@
      * Constructor for UMLUseCaseExtensionPointListModel.
      */
     public UMLUseCaseExtensionPointListModel() {
-        super("extensionPoint");
+        super("extensionPoint", 
+                Model.getMetaTypes().getExtensionPoint(), 
+                null, 
+                ActionNewUseCaseExtensionPoint.SINGLETON, 
+                null);
     }
 
     /*

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

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