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

Author: bobtarling
Date: 2009-03-30 16:51:16-0700
New Revision: 17007

Modified:
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/SwingUIFactory.java
   trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionList.java

Log:
Handle TODO for common behaviour

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=17007&r1=17006&r2=17007
==============================================================================
--- 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-03-30 16:51:16-0700
@@ -814,9 +814,9 @@
             model.setTarget(target);
             list = new ScrollList(new UMLSignalEventSignalList(model));                    
         } else if ("action".equals(prop.getName())) {
-            // TODO: we need to set up the target. 
-            // This creates a model without it.
-            list = new ScrollList(new UMLActionSequenceActionList());
+            model = new UMLActionSequenceActionListModel();
+            model.setTarget(target);
+            list = new ScrollList(new UMLActionSequenceActionList(model));
         }
         
         if (list != null) {

Modified: trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionList.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionList.java?view=diff&pathrev=17007&r1=17006&r2=17007
==============================================================================
--- trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionList.java	(original)
+++ trunk/src/argouml-core-umlpropertypanels/src/org/argouml/core/propertypanels/ui/UMLActionSequenceActionList.java	2009-03-30 16:51:16-0700
@@ -26,6 +26,7 @@
 
 import javax.swing.JPopupMenu;
 
+import org.argouml.uml.ui.UMLModelElementListModel2;
 import org.argouml.uml.ui.UMLMutableLinkedList;
 import org.argouml.uml.ui.behavior.common_behavior.ActionNewAction;
 import org.argouml.uml.ui.behavior.common_behavior.PopupMenuNewAction;
@@ -35,8 +36,8 @@
     /**
      * Construct a default object with a new UMLActionSequenceActionListModel.
      */
-    public UMLActionSequenceActionList() {
-        super(new UMLActionSequenceActionListModel());
+    public UMLActionSequenceActionList(UMLModelElementListModel2 dataModel) {
+        super(dataModel);
     }
 
     /*

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

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