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

Author: mvw
Date: 2008-07-04 12:19:11-0700
New Revision: 15164

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

Log:
Improvement 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=15164&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=15163&r2=15164
==============================================================================
--- 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-04 12:19:11-0700
@@ -98,7 +98,8 @@
      * @param gm ignored
      * @param node the UML element
      */
-    public FigPartition(GraphModel gm, Object node) {
+    public FigPartition(@SuppressWarnings("unused")
+            GraphModel gm, Object node) {
         this();
         setOwner(node);
     }
@@ -307,7 +308,7 @@
 
         if (nextPartition == null && previousPartition == null) {
             /* We removed the last partition, so now remove the pool, too: */
-            figPool.removeFromDiagramImpl();
+            figPool.removeFromDiagram();
             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=15164&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=15163&r2=15164
==============================================================================
--- 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-04 12:19:11-0700
@@ -166,15 +166,5 @@
 	return false;
     }
 
-    /**
-     * Used by FigPartition.
-     * 
-     * @see org.argouml.uml.diagram.ui.FigNodeModelElement#removeFromDiagramImpl()
-     */
-    @Override
-    protected void removeFromDiagramImpl() {
-        super.removeFromDiagramImpl();
-    }
-
 }