svn commit: r12664 - trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java

Author: bobtarling
Date: 2007-05-26 10:40:18-0700
New Revision: 12664

Modified:
   trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java

Log:
Move elements between partitions when moved between swimlanes

Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java?view=diff&rev=12664&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java&r1=12663&r2=12664
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java	2007-05-26 10:40:18-0700
@@ -27,7 +27,6 @@
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyVetoException;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -37,8 +36,8 @@
 
 import org.argouml.i18n.Translator;
 import org.argouml.kernel.ProjectManager;
+import org.argouml.model.ActivityGraphsHelper;
 import org.argouml.model.DeleteInstanceEvent;
-import org.argouml.model.InvalidElementException;
 import org.argouml.model.Model;
 import org.argouml.ui.CmdCreateNode;
 import org.argouml.ui.ActionSetMode;
@@ -703,12 +702,15 @@
      * @param newEncloser The encloser (null if none)
      */
     public void encloserChanged(
-	    
             FigNode enclosed, FigNode oldEncloser, FigNode newEncloser) {
+	
+	if (oldEncloser == null && newEncloser == null) {
+	    return;
+	}
+	
 	if (enclosed instanceof FigStateVertex
 		|| enclosed instanceof FigObjectFlowState) {
-	    
-	    changePartition(enclosed.getOwner(), oldEncloser, newEncloser);
+	    changePartition(enclosed);
 	}
     }
     
@@ -716,40 +718,29 @@
      * Extends basic functionality to handle logic for enclosement of states
      * within a swimlane.
      * @param enclosed The FigNode enclosed.
-     * @param oldEncloser The previous encloser (null if none)
-     * @param newEncloser The encloser (null if none)
      */
-    private void changePartition(
-            Object owner, FigNode oldEncloser, FigNode newEncloser) {
+    private void changePartition(FigNode enclosed) {
 	
-        if (newEncloser == null || newEncloser != oldEncloser) {
-            if (oldEncloser != null) {
-                Object partition = oldEncloser.getOwner();
-                if (partition != null 
-                        && Model.getFacade().isAPartition(partition)) {
-                    try {
-                        Collection c = Model.getFacade().getContents(partition);
-                        c.remove(owner);
-                        Model.getActivityGraphsHelper().setContents(
-                                partition, c);
-                    } catch (InvalidElementException e) {
-                        // This just happens sometimes when deleting elements...
-                    }
-                }
-            }
-        }
-        
-        // add to new partition
-        if (newEncloser != null) {
-            Object partition = newEncloser.getOwner();
-            if (Model.getFacade().isAPartition(partition)) {
-                Collection c = Model.getFacade().getContents(partition);
-                c.add(owner);
-                Model.getActivityGraphsHelper().setContents(partition, c);
+	assert enclosed != null;
+	
+	Object state = enclosed.getOwner();
+	ActivityGraphsHelper activityGraph = Model.getActivityGraphsHelper();
+	
+        for (Object f : getLayer().getContentsNoEdges()) {
+            if (f instanceof FigPartition) {
+        	FigPartition fig = (FigPartition) f;
+        	Object partition = fig.getOwner();
+        	if (fig.getBounds().intersects(enclosed.getBounds())) {
+                    activityGraph.addContent(partition, state);
+        	} else if (isStateInPartition(state, partition)) {
+                    activityGraph.removeContent(partition, state);
+        	}
             }
         }
     }
 
-    
+    private boolean isStateInPartition(Object state, Object partition) {
+	return Model.getFacade().getContents(partition).contains(state);
+    }
 
 } /* end class UMLActivityDiagram */