svn commit: r14570 - trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java

Author: tfmorris
Date: 2008-05-01 13:21:27-0700
New Revision: 14570

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

Log:
Add TODO for issue 5052

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=14570&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=14569&r2=14570
==============================================================================
--- 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-05-01 13:21:27-0700
@@ -106,6 +106,7 @@
     /*
      * @see java.lang.Object#clone()
      */
+    @Override
     public Object clone() {
         FigPartition figClone = (FigPartition) super.clone();
         Iterator it = figClone.getFigs().iterator();
@@ -122,6 +123,7 @@
     /*
      * @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
      */
+    @Override
     public void setLineColor(Color col) {
         rightLine.setLineColor(col);
         leftLine.setLineColor(col);
@@ -133,6 +135,7 @@
     /*
      * @see org.tigris.gef.presentation.Fig#getLineColor()
      */
+    @Override
     public Color getLineColor() {
         return rightLine.getLineColor();
     }
@@ -140,6 +143,7 @@
     /*
      * @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
      */
+    @Override
     public void setFillColor(Color col) {
         getBigPort().setFillColor(col);
         getNameFig().setFillColor(col);
@@ -148,6 +152,7 @@
     /*
      * @see org.tigris.gef.presentation.Fig#getFillColor()
      */
+    @Override
     public Color getFillColor() {
         return getBigPort().getFillColor();
     }
@@ -179,6 +184,7 @@
     /*
      * @see org.tigris.gef.presentation.Fig#getLineWidth()
      */
+    @Override
     public int getLineWidth() {
         return rightLine.getLineWidth();
     }
@@ -186,6 +192,7 @@
     /*
      * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
      */
+    @Override
     public String placeString() {
 	// TODO: i18n
         return "new Swimlane";
@@ -194,6 +201,7 @@
     /*
      * @see org.tigris.gef.presentation.Fig#getMinimumSize()
      */
+    @Override
     public Dimension getMinimumSize() {
         Dimension nameDim = getNameFig().getMinimumSize();
         int w = nameDim.width;
@@ -209,6 +217,7 @@
     /*
      * @see org.tigris.gef.presentation.Fig#setBoundsImpl(int, int, int, int)
      */
+    @Override
     protected void setStandardBounds(int x, int y, int w, int h) {
 	
         if (getNameFig() == null) {
@@ -231,6 +240,7 @@
         updateEdges();
     }
     
+    @Override
     public Selection makeSelection() {
 	return new SelectionPartition(this);
     }
@@ -241,7 +251,8 @@
      */
     public void appendToPool() {
 	List partitions = getPartitions(getLayer());
-	
+        // TODO: There is a cyclic dependency between FigPartition and
+        // UMLActivityDiagram which needs to be removed. - tfm
         UMLActivityDiagram diagram = 
             (UMLActivityDiagram) getProject().getActiveDiagram();
         Object machine = diagram.getStateMachine();
@@ -277,6 +288,7 @@
 	}
     }
     
+    @Override
     public void removeFromDiagramImpl() {
 	int width = getWidth();
 	FigPool figPool = getFigPool();
@@ -312,9 +324,7 @@
     // in the pool are within the bounds of this Fig
     // and translate those.
     private void translateWithContents(int dx) {
-	Iterator it = getFigPool().getEnclosedFigs().iterator();
-	while (it.hasNext()) {
-	    Fig f = (Fig) it.next();
+        for (Fig f : getFigPool().getEnclosedFigs()) {
             f.setX(f.getX() + dx);
 	}
 	setX(getX() + dx);
@@ -325,14 +335,12 @@
      * Get all the partitions on the same layer as this FigPartition
      * @return th partitions
      */
-    private List getPartitions(Layer layer) {
-        final List partitions = new ArrayList();
+    private List<FigPartition> getPartitions(Layer layer) {
+        final List<FigPartition> partitions = new ArrayList<FigPartition>();
         
-        Iterator it = layer.getContents().iterator();
-        while (it.hasNext()) {
-            Object o = it.next();
+        for (Object o : layer.getContents()) {
             if (o instanceof FigPartition) {
-                partitions.add(o);
+                partitions.add((FigPartition) o);
             }
         }
         
@@ -375,6 +383,7 @@
      * When dragging this partition drag all other partitions with it.
      * @return all the partitions to drag togther.
      */
+    @Override
     public List getDragDependencies() {
 	List dependents = getPartitions(getLayer());
 	dependents.add(getFigPool());
@@ -486,6 +495,7 @@
         
         /** Paint the handles at the four corners and midway along each edge
          * of the bounding box.  */
+        @Override
         public void paint(Graphics g) {
             final Fig fig = getContent();
             if (getContent().isResizable()) {
@@ -638,7 +648,7 @@
         	int width, 
         	int height) {
             
-            final List partitions = getPartitions(getLayer());
+            final List<FigPartition> partitions = getPartitions(getLayer());
             
             int newNeighbourWidth = 0;
             if (neighbour != null) {
@@ -651,9 +661,7 @@
             
             int lowX = 0;
             int totalWidth = 0;
-            Iterator it = partitions.iterator();
-            while (it.hasNext()) {
-        	Fig f = (Fig) it.next();
+            for (Fig f : partitions) {
         	if (f == getContent()) {
                     f.setHandleBox(x, y, width, height);
         	} else if (f == neighbour && f == previousPartition) {