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

Author: bobtarling
Date: 2009-11-25 15:02:27-0800
New Revision: 17553

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndSpecificationListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleBaseListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCreateActionClassifierListModel.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/UMLInstanceClassifierListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessagePredecessorListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementClientDependencyListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementSupplierDependencyListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOFSStateListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionContentListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalContextListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalReceptionListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateInternalTransitionListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeBaseClassListModel.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLUseCaseExtensionPointListModel.java

Log:
Make it clear which controls still contain popup actions by the constructor they use. We should seek to remove these constructors over time and build more into the toolbar.

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndSpecificationListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndSpecificationListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndSpecificationListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLAssociationEndSpecificationListModel.java	2009-11-25 15:02:27-0800
@@ -41,8 +41,7 @@
      */
     public UMLAssociationEndSpecificationListModel(Object metaType) {
         super("specification", metaType,
-                ActionAddAssociationSpecification.getInstance(),
-                null, null);
+                ActionAddAssociationSpecification.getInstance());
     }
 
     /*

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleBaseListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleBaseListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleBaseListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLClassifierRoleBaseListModel.java	2009-11-25 15:02:27-0800
@@ -41,7 +41,6 @@
     public UMLClassifierRoleBaseListModel(Object metaType) {
         super("base", metaType,
             ActionAddClassifierRoleBase.SINGLETON,
-            null,
             ActionRemoveClassifierRoleBase.getInstance());
     }
 

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCreateActionClassifierListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCreateActionClassifierListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCreateActionClassifierListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLCreateActionClassifierListModel.java	2009-11-25 15:02:27-0800
@@ -38,8 +38,7 @@
      */
     public UMLCreateActionClassifierListModel(Object metaType) {
         super("instantiation", metaType,
-            new ActionAddCreateActionInstantiation(), 
-            null, null);
+            new ActionAddCreateActionInstantiation());
     }
 
     /*

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=17553&r1=17552&r2=17553
==============================================================================
--- 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-11-25 15:02:27-0800
@@ -44,8 +44,7 @@
     public UMLExtendExtensionPointListModel(Object modelElement) {
         super("extensionPoint", Model.getMetaTypes().getExtensionPoint(), 
               ActionAddExtendExtensionPoint.getInstance(),
-              ActionNewExtendExtensionPoint.SINGLETON,
-              null);
+              ActionNewExtendExtensionPoint.SINGLETON);
     }
 
     /*

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceClassifierListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceClassifierListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceClassifierListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLInstanceClassifierListModel.java	2009-11-25 15:02:27-0800
@@ -40,8 +40,7 @@
     public UMLInstanceClassifierListModel(Object metaType) {
         super("classifier", metaType,
             new ActionAddInstanceClassifier(
-                    Model.getMetaTypes().getClassifier()), 
-            null, null);
+                    Model.getMetaTypes().getClassifier()));
     }
 
     /*

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessagePredecessorListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessagePredecessorListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessagePredecessorListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLMessagePredecessorListModel.java	2009-11-25 15:02:27-0800
@@ -43,8 +43,7 @@
      */
     public UMLMessagePredecessorListModel(Object metaType) {
         super("predecessor", metaType,
-            ActionAddMessagePredecessor.getInstance(),
-            null, null);
+            ActionAddMessagePredecessor.getInstance());
     }
 
     /*

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementClientDependencyListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementClientDependencyListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementClientDependencyListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementClientDependencyListModel.java	2009-11-25 15:02:27-0800
@@ -43,9 +43,7 @@
     public UMLModelElementClientDependencyListModel(Object metaType) {
         super("clientDependency", 
                 metaType, 
-                new ActionAddClientDependencyAction(), 
-                null, 
-                null);
+                new ActionAddClientDependencyAction());
     }
 
     /*

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementListModel.java	2009-11-25 15:02:27-0800
@@ -59,7 +59,7 @@
  * @since Oct 2, 2002
  * @author [email protected]
  */
-public abstract class UMLModelElementListModel
+abstract class UMLModelElementListModel
         extends DefaultListModel implements PropertyChangeListener {
 
     private static final Logger LOG = 
@@ -112,7 +112,7 @@
      * MELementListener methods and setTarget method implemented in this
      * class.
      */
-    public UMLModelElementListModel() {
+    UMLModelElementListModel() {
         super();
         showIcon = true;
         showPath = true;
@@ -124,14 +124,14 @@
      * @param name the name of the event to listen to, which triggers us
      *             to update the list model from the UML data
      */
-    public UMLModelElementListModel(String name) {
+    UMLModelElementListModel(String name) {
         super();
         eventName = name;
         showIcon = true;
         showPath = true;
     }
     
-    public UMLModelElementListModel(
+    UMLModelElementListModel(
             final String name,
             final boolean showIcon,
             final boolean showPath) {
@@ -141,7 +141,7 @@
         this.showPath = showPath;
     }
     
-    public UMLModelElementListModel(
+    UMLModelElementListModel(
             final String name,
             final boolean showIcon,
             final boolean showPath,
@@ -161,7 +161,7 @@
      * @param theMetaType the type of model element that the list model
      *                 is designed to contain.
      */
-    public UMLModelElementListModel(String name, Object theMetaType) {
+    UMLModelElementListModel(String name, Object theMetaType) {
         super();
         this.metaType = theMetaType;
         eventName = name;
@@ -193,6 +193,58 @@
         this.removeAction = removeAction;
     }
     
+    public UMLModelElementListModel(
+            final String name, 
+            final Object theMetaType, 
+            final AbstractActionAddModelElement2 addAction) {
+        super();
+        this.metaType = theMetaType;
+        eventName = name;
+        showIcon = true;
+        showPath = true;
+        this.addAction = addAction;
+    }
+    
+    public UMLModelElementListModel(
+            final String name, 
+            final Object theMetaType, 
+            final AbstractActionNewModelElement newAction) {
+        super();
+        this.metaType = theMetaType;
+        eventName = name;
+        showIcon = true;
+        showPath = true;
+        this.newAction = newAction;
+    }
+    
+    public UMLModelElementListModel(
+            final String name, 
+            final Object theMetaType, 
+            final AbstractActionAddModelElement2 addAction, 
+            final AbstractActionRemoveElement removeAction) {
+        super();
+        this.metaType = theMetaType;
+        eventName = name;
+        showIcon = true;
+        showPath = true;
+        this.addAction = addAction;
+        this.removeAction = removeAction;
+    }
+    
+    public UMLModelElementListModel(
+            final String name, 
+            final Object theMetaType, 
+            final AbstractActionAddModelElement2 addAction, 
+            final AbstractActionNewModelElement newAction) { 
+        super();
+        this.metaType = theMetaType;
+        eventName = name;
+        showIcon = true;
+        showPath = true;
+        this.addAction = addAction;
+        this.newAction = newAction;
+    }
+    
     /**
      * Constructor for UMLModelElementListModel2.
      *

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementSupplierDependencyListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementSupplierDependencyListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementSupplierDependencyListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLModelElementSupplierDependencyListModel.java	2009-11-25 15:02:27-0800
@@ -38,7 +38,7 @@
      * Constructor for UMLModelElementSupplierDependencyListModel.
      */
     public UMLModelElementSupplierDependencyListModel(Object metaType) {
-        super("supplierDependency", metaType, new ActionAddSupplierDependencyAction(), null, null);
+        super("supplierDependency", metaType, new ActionAddSupplierDependencyAction());
     }
 
     /*

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOFSStateListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOFSStateListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOFSStateListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLOFSStateListModel.java	2009-11-25 15:02:27-0800
@@ -43,7 +43,6 @@
          */
         super("type", metaType,
             new ActionAddOFSState(),
-            null,
             new ActionRemoveOFSState());
     }
 

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionContentListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionContentListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionContentListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLPartitionContentListModel.java	2009-11-25 15:02:27-0800
@@ -33,8 +33,7 @@
 
     public UMLPartitionContentListModel(Object metaType) {
         super("contents", metaType,
-                new ActionAddPartitionContent(),
-                null, null);
+                new ActionAddPartitionContent());
     }
 
     protected void buildModelList() {

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalContextListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalContextListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalContextListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalContextListModel.java	2009-11-25 15:02:27-0800
@@ -40,7 +40,7 @@
      */
     public UMLSignalContextListModel(Object metaType) {
         super("context", metaType,
-            new ActionAddContextSignal(), null, 
+            new ActionAddContextSignal(), 
             new ActionRemoveContextSignal());
     }
 

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalReceptionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalReceptionListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalReceptionListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLSignalReceptionListModel.java	2009-11-25 15:02:27-0800
@@ -44,7 +44,7 @@
          * and see the result displayed in the list.
          */
         super("reception", metaType,
-            new ActionAddReceptionSignal(), null, 
+            new ActionAddReceptionSignal(), 
             new ActionRemoveReceptionSignal());
     }
 

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateInternalTransitionListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateInternalTransitionListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateInternalTransitionListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStateInternalTransitionListModel.java	2009-11-25 15:02:27-0800
@@ -38,9 +38,7 @@
      */
     public UMLStateInternalTransitionListModel(Object metaType) {
         super("internalTransition", metaType,
-                null,
-                new ActionNewTransition(),
-                null);
+                new ActionNewTransition());
     }
 
     /*

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeBaseClassListModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeBaseClassListModel.java?view=diff&pathrev=17553&r1=17552&r2=17553
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeBaseClassListModel.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLStereotypeBaseClassListModel.java	2009-11-25 15:02:27-0800
@@ -43,7 +43,6 @@
     public UMLStereotypeBaseClassListModel(Object metaType) {
         super("baseClass", metaType,
                 new ActionAddStereotypeBaseClass(),
-                null,
                 new ActionDeleteStereotypeBaseClass());
     }
 

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=17553&r1=17552&r2=17553
==============================================================================
--- 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-11-25 15:02:27-0800
@@ -50,10 +50,8 @@
      */
     public UMLUseCaseExtensionPointListModel() {
         super("extensionPoint", 
-                Model.getMetaTypes().getExtensionPoint(), 
-                null, 
-                ActionNewUseCaseExtensionPoint.SINGLETON, 
-                null);
+                Model.getMetaTypes().getExtensionPoint(),
+                ActionNewUseCaseExtensionPoint.SINGLETON);
     }
 
     /*

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

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