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

Author: tfmorris
Date: 2009-01-16 10:44:16-0800
New Revision: 16635

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:
Issue 5500: Update FigPool to new constructor

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&pathrev=16635&r1=16634&r2=16635
==============================================================================
--- 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	2009-01-16 10:44:16-0800
@@ -34,7 +34,6 @@
 
 import org.argouml.model.Model;
 import org.argouml.uml.diagram.DiagramSettings;
-import org.argouml.uml.diagram.ui.ArgoFig;
 import org.argouml.uml.diagram.ui.FigNodeModelElement;
 import org.tigris.gef.base.Globals;
 import org.tigris.gef.base.Layer;
@@ -289,7 +288,7 @@
                 getOwner(), activityGraph);
 	
 	if (partitions.size() == 1) {
-	    FigPool fp = new FigPool(getBounds());
+	    FigPool fp = new FigPool(getOwner(), getBounds(), getSettings());
 	    getLayer().add(fp);
 	    getLayer().bringToFront(this);
 	} else if (partitions.size() > 1) {

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&pathrev=16635&r1=16634&r2=16635
==============================================================================
--- 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	2009-01-16 10:44:16-0800
@@ -1,5 +1,5 @@
 // $Id$
-// Copyright (c) 2003-2008 The Regents of the University of California. All
+// Copyright (c) 2003-2009 The Regents of the University of California. All
 // Rights Reserved. Permission to use, copy, modify, and distribute this
 // software and its documentation without fee, and without a written
 // agreement is hereby granted, provided that the above copyright notice
@@ -45,13 +45,21 @@
 
     /**
      * Constructor.
+     * 
      * @param r the bounds for the pool
+     * @deprecated for 0.28 by tfmorris. Use
+     *             {@link #FigPool(Object, Rectangle, DiagramSettings)}.
      */
+    @Deprecated
     public FigPool(Rectangle r) {
+        initialize(r);
+    }
+
+    private void initialize(Rectangle r) {
         setBigPort(new FigEmptyRect(r.x, r.y, r.width, r.height));
         getBigPort().setFilled(false);
         getBigPort().setLineWidth(0);
-        
+
         addFig(getBigPort());
 
         setBounds(r);
@@ -60,14 +68,13 @@
     /**
      * Constructor used by PGML parser when loading.
      * 
-     * @param owner ignored
+     * @param owner owning UML element
      * @param bounds bounding box rectangle
-     * @param settings diagram settings (unused)
+     * @param settings (ignored since this is just an empty rectangle)
      */
-    public FigPool(@SuppressWarnings("unused") Object owner, 
-            Rectangle bounds, 
-            @SuppressWarnings("unused") DiagramSettings settings) {
-        this(bounds);
+    public FigPool(Object owner, Rectangle bounds, DiagramSettings settings) {
+        super(owner, bounds, settings);
+        initialize(bounds);
     }
 
 
@@ -177,7 +184,7 @@
      */
     @Override
     public boolean isSelectable() {
-	return false;
+        return false;
     }
 
 }

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1029360

To unsubscribe from this discussion, e-mail: [[email protected]].