Author: bobtarling
Date: 2007-05-15 17:04:47-0700
New Revision: 12624
Removed:
trunk/src_new/org/argouml/uml/diagram/activity/ui/PartitionUtility.java
Modified:
trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java
trunk/src_new/org/argouml/uml/diagram/activity/ui/UMLActivityDiagram.java
trunk/src_new/org/argouml/uml/diagram/state/ui/FigStateVertex.java
Log:
Manage specialist activity diagram enclosement in UMLActivityDiagram
Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java?view=diff&rev=12624&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java&r1=12623&r2=12624
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java 2007-05-15 17:04:47-0700
@@ -218,7 +218,6 @@
// If the layer is null, then most likely we are being deleted.
if (layer == null) return;
- PartitionUtility.handleEnclosing(getEncloser(), encloser, getOwner());
super.setEnclosingFig(encloser);
}
Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java?view=diff&rev=12624&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java&r1=12623&r2=12624
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java 2007-05-15 17:04:47-0700
@@ -56,7 +56,6 @@
private FigLine topLine;
private FigLine bottomLine;
private FigLine seperator;
- private boolean placed;
private FigPartition previousPartition;
private FigPartition nextPartition;
Removed: trunk/src_new/org/argouml/uml/diagram/activity/ui/PartitionUtility.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/PartitionUtility.java?view=auto&rev=12623
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=12624&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=12623&r2=12624
==============================================================================
--- 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-15 17:04:47-0700
@@ -27,6 +27,7 @@
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,6 +38,7 @@
import org.argouml.i18n.Translator;
import org.argouml.kernel.ProjectManager;
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;
@@ -48,6 +50,7 @@
import org.argouml.uml.diagram.state.ui.ButtonActionNewChangeEvent;
import org.argouml.uml.diagram.state.ui.ButtonActionNewSignalEvent;
import org.argouml.uml.diagram.state.ui.ButtonActionNewTimeEvent;
+import org.argouml.uml.diagram.state.ui.FigStateVertex;
import org.argouml.uml.diagram.ui.RadioAction;
import org.argouml.uml.diagram.ui.UMLDiagram;
import org.argouml.uml.ui.behavior.common_behavior.ActionNewActionSequence;
@@ -700,11 +703,53 @@
* @param newEncloser The encloser (null if none)
*/
public void encloserChanged(
+
FigNode enclosed, FigNode oldEncloser, FigNode newEncloser) {
- // TODO: Implement enclosement within pool here and determine
- // which pools are overlapped.
- super.encloserChanged(enclosed, oldEncloser, newEncloser);
+ if (enclosed instanceof FigStateVertex
+ || enclosed instanceof FigObjectFlowState) {
+
+ changePartition(enclosed.getOwner(), oldEncloser, newEncloser);
+ }
+ }
+
+ /**
+ * 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) {
+
+ 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);
+ }
+ }
}
+
} /* end class UMLActivityDiagram */
Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/FigStateVertex.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/FigStateVertex.java?view=diff&rev=12624&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/FigStateVertex.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/FigStateVertex.java&r1=12623&r2=12624
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/FigStateVertex.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/FigStateVertex.java 2007-05-15 17:04:47-0700
@@ -27,7 +27,6 @@
import java.util.Iterator;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.activity.ui.PartitionUtility;
import org.argouml.uml.diagram.activity.ui.SelectionActionState;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.base.Editor;
@@ -78,7 +77,6 @@
// If the layer is null, then most likely we are being deleted.
if (layer == null) return;
- PartitionUtility.handleEnclosing(getEncloser(), encloser, getOwner());
super.setEnclosingFig(encloser);
if (!(Model.getFacade().isAStateVertex(getOwner()))) return;
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.