svn commit: r17923 - trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java

Author: bobtarling
Date: 2010-01-26 21:23:07-0800
New Revision: 17923

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java

Log:
Remove use of deprecated interface.
More strictly control fill and line colors

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java?view=diff&pathrev=17923&r1=17922&r2=17923
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java	2010-01-26 21:23:07-0800
@@ -56,7 +56,6 @@
 import org.argouml.ui.ArgoJMenu;
 import org.argouml.ui.targetmanager.TargetManager;
 import org.argouml.uml.diagram.DiagramSettings;
-import org.argouml.uml.diagram.ExtensionPointsCompartmentContainer;
 import org.argouml.uml.diagram.ui.ActionAddExtensionPoint;
 import org.argouml.uml.diagram.ui.ActionAddNote;
 import org.argouml.uml.diagram.ui.ActionCompartmentDisplay;
@@ -118,8 +117,7 @@
  * origin is at our top left corner, and the Y coordinates are
  * reversed.<p>
  */
-public class FigUseCase extends FigCompartmentBox
-    implements ExtensionPointsCompartmentContainer {
+public class FigUseCase extends FigCompartmentBox {
 
     /**
      * The minimum padding allowed above the rectangle for
@@ -169,9 +167,9 @@
 
         // Make all the parts match the main fig
         setFilled(true);
-        setFillColor(FILL_COLOR);
-        setLineColor(LINE_COLOR);
-        setLineWidth(LINE_WIDTH);
+        super.setFillColor(FILL_COLOR);
+        super.setLineColor(LINE_COLOR);
+        super.setLineWidth(LINE_WIDTH);
         
         // by default, do not show extension points:
         setExtensionPointsVisible(false);
@@ -190,6 +188,8 @@
     protected Fig createBigPortFig() {
         /* Use arbitrary dimensions for now. */
         Fig b = new FigMyCircle(0, 0, 100, 60);
+        b.setFilled(true);
+        b.setFillColor(FILL_COLOR);
         b.setLineColor(LINE_COLOR);
         b.setLineWidth(LINE_WIDTH);
         return b;
@@ -410,26 +410,6 @@
     }
 
     /**
-     * Set the line colour for the use case oval.<p>
-     *
-     * This involves setting the line color of all the figs, but not the bigPort.
-     * Calling the super method causes all FigGroup elements
-     * to follow suit - which is not wanted for the bigPort and the separator.
-     *
-     * @param col The colour desired.
-     */
-    @Override
-    public void setLineColor(Color col) {
-           super.setLineColor(col);
-           getBigPort().setLineColor(null);
-    }
-    
-    @Override
-    public void setLineWidth(int w) {
-        super.setLineWidth(w);
-    }
-
-    /**
      * Set the fill colour for the use case oval.<p>
      *
      * This involves setting the fill color of all figs, but not the bigPort.
@@ -440,23 +420,30 @@
      */
     @Override
     public void setFillColor(Color col) {
-        super.setFillColor(col);
+        getBigPort().setFillColor(col);
+    }
+    
+    public Color getFillColor() {
+        return getBigPort().getFillColor();
+    }
+    
+    public boolean getFilled() {
+        return getBigPort().isFilled();
+    }
+    
+    public boolean isFilled() {
+        return getBigPort().isFilled();
     }
 
     /**
      * Set whether the use case oval is to be filled.<p>
      *
-     * This involves making all figs filled, but not the bigPort.<p>
-     * Calling the super method would cause all FigGroup elements
-     * to be filled, too - which is not wanted for e.g. the stereotype figs.
-     * See issue 5581.
-     *
-     * @param f  <code>true</code> if the oval is to be filled,
-     *           <code>false</code> if not.
+     * This is overridden to have no effect as the use case is always filled
+     * @param f this argument is ignored.
      */
     @Override
     public void setFilled(boolean f) {
-        super.setFilled(f);
+        //
     }
 
     /**

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

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