svn commit: r12855 - trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java

Author: tfmorris
Date: 2007-06-15 16:08:48-0700
New Revision: 12855

Modified:
   trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java

Log:
Issue 1597 - restore extension compartment of UseCase fig on load

Modified: trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java?view=diff&rev=12855&p1=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java&r1=12854&r2=12855
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java	(original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java	2007-06-15 16:08:48-0700
@@ -302,6 +302,8 @@
         // which we set as our bounds.
         Rectangle r = getBounds();
         setBounds(r.x, r.y, r.width, r.height);
+        
+        updateExtensionPoint();
     }
 
     /**
@@ -1210,12 +1212,12 @@
 
             // Take each EP and its corresponding fig in turn
             Iterator iter = eps.iterator();
-            Vector figs = new Vector(epVec.getFigs());
+            List<Fig> figs = new ArrayList<Fig>(epVec.getFigs());
             if (figs.size() > 0) {
                 // Ignore the first fig:
-                figs.removeElementAt(0);
+                figs.remove(0);
             }
-            Vector toBeRemoved = new Vector(figs);
+            List<Fig> toBeRemoved = new ArrayList<Fig>(figs);
 
             while (iter.hasNext()) {
                 CompartmentFigText epFig = null;
@@ -1278,9 +1280,7 @@
 
             // Remove any spare figs we have if there are now fewer extension
             // points than figs
-            Iterator i = toBeRemoved.iterator();
-            while (i.hasNext()) {
-                Fig f = (Fig) i.next();
+            for (Fig f : toBeRemoved) {
                 epVec.removeFig(f);    
             }
         }