svn commit: r15157 - trunk/src/argouml-app/src/org/argouml/uml/diagram: activity/ui ui

Author: mvw
Date: 2008-07-03 22:53:28-0700
New Revision: 15157

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPool.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java

Log:
The remaining part of the fix for issue 5038: Deleting last Swimlane leaves hidden FigPool.

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java?view=diff&rev=15157&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java&r1=15156&r2=15157
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java	2008-07-03 22:53:28-0700
@@ -291,6 +291,7 @@
 	int width = getWidth();
 	FigPool figPool = getFigPool();
         if (figPool == null) { //Needed for project deletion
+            super.removeFromDiagramImpl();
             return;
         }
         

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPool.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPool.java?view=diff&rev=15157&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPool.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPool.java&r1=15156&r2=15157
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPool.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPool.java	2008-07-03 22:53:28-0700
@@ -165,5 +165,16 @@
     public boolean isSelectable() {
 	return false;
     }
+
+    /**
+     * Used by FigPartition.
+     * 
+     * @see org.argouml.uml.diagram.ui.FigNodeModelElement#removeFromDiagramImpl()
+     */
+    @Override
+    protected void removeFromDiagramImpl() {
+        super.removeFromDiagramImpl();
+    }
+
 }
 

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=15157&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=15156&r2=15157
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java	2008-07-03 22:53:28-0700
@@ -1822,6 +1822,10 @@
         return this;
     }
     
+    /**
+     * If you override this method, make sure to remove all listeners:
+     * If you don't, objects in a deleted project will still receive events.
+     */
     protected void removeFromDiagramImpl() {
         if (notationProviderName != null) { //This test needed for a FigPool
             notationProviderName.cleanListener(this, getOwner());