svn commit: r12631 - trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java

Author: bobtarling
Date: 2007-05-21 14:00:27-0700
New Revision: 12631

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

Log:
Fix NPE during remove from diagram

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=12631&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=12630&r2=12631
==============================================================================
--- 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-21 14:00:27-0700
@@ -280,6 +280,8 @@
     
     public void removeFromDiagramImpl() {
 	int width = getWidth();
+	FigPool figPool = getFigPool();
+	int newFigPoolWidth = figPool.getWidth() - width;
 	
 	super.removeFromDiagramImpl();
 	
@@ -300,7 +302,7 @@
 	setPreviousPartition(null);
 	setNextPartition(null);
 	
-	getFigPool().setWidth(getFigPool().getWidth() - width);
+	figPool.setWidth(newFigPoolWidth);
     }
     
     // TODO: Needs work. Must determine which Figs enclosed