svn commit: r14251 - trunk/src/app/src/org/argouml/uml/diagram/sequence/ui

Author: tfmorris
Date: 2008-03-27 23:42:08-0700
New Revision: 14251

Modified:
   trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java
   trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java

Log:
Make FigHead member private and provide getter

Modified: trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java?view=diff&rev=14251&p1=trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java&p2=trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java&r1=14250&r2=14251
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java	(original)
+++ trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java	2008-03-27 23:42:08-0700
@@ -102,7 +102,7 @@
     /**
      * The filled box for the object box (object fig without lifeline).
      */
-    FigHead headFig;
+    private FigHead headFig;
 
     /**
      * The lifeline (dashed line under the object box to which activations are
@@ -745,13 +745,6 @@
         return headFig.getFillColor();
     }
 
-    /*
-     * @see org.tigris.gef.presentation.Fig#getFilled()
-     */
-    @Override
-    public boolean getFilled() {
-        return headFig.isFilled();
-    }
 
     @Override
     public boolean isFilled() {
@@ -1270,6 +1263,13 @@
     }
 
     /**
+     * @return the fig which forms the top box of the composite fig
+     */
+    FigHead getHeadFig() {
+        return headFig;
+    }
+
+    /**
      * The UID.
      */
     private static final long serialVersionUID = 7763573563940441408L;

Modified: trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java?view=diff&rev=14251&p1=trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java&p2=trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java&r1=14250&r2=14251
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java	(original)
+++ trunk/src/app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java	2008-03-27 23:42:08-0700
@@ -63,6 +63,7 @@
     /*
      * @see org.tigris.gef.presentation.Fig#getMinimumSize()
      */
+    @Override
     public Dimension getMinimumSize() {
 
         int h = FigClassifierRole.MIN_HEAD_HEIGHT;
@@ -74,12 +75,11 @@
                     FigClassifierRole.MIN_HEAD_HEIGHT);
         }
 
-        List figs = layer.getContents();
-        for (Iterator i = figs.iterator(); i.hasNext();) {
-            Object o = i.next();
-            if (o instanceof FigClassifierRole) {
-                FigClassifierRole other = (FigClassifierRole) o;
-                int otherHeight = other.headFig.getMinimumHeight();
+        List<Fig> figs = layer.getContents();
+        for (Fig f : figs) {
+            if (f instanceof FigClassifierRole) {
+                FigClassifierRole other = (FigClassifierRole) f;
+                int otherHeight = other.getHeadFig().getMinimumHeight();
                 if (otherHeight > h) {
                     h = otherHeight;
                 }