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

Author: mvw
Date: 2009-01-03 11:51:05-0800
New Revision: 16493

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

Log:
Fix for issue 5581: FillColor applied to stereotype figs.

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=16493&r1=16492&r2=16493
==============================================================================
--- 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	2009-01-03 11:51:05-0800
@@ -719,7 +719,7 @@
                 : h;
 
         // set new bounds for all included figs
-        Iterator figs = epVec.iterator();
+        Iterator figs = epVec.getFigs().iterator();
         figs.next(); // skip epBigPort
         Fig fi;
         int fw, fh;
@@ -758,13 +758,14 @@
     /**
      * Set the line colour for the use case oval.<p>
      *
-     * This involves setting the _cover oval, not the bigPort.<p>
+     * This involves setting the <code>cover</code> oval, not the bigPort.
+     * Calling the super method would cause all FigGroup elements
+     * to follow suit - which is not wanted.
      *
      * @param col The colour desired.
      */
     @Override
     public void setLineColor(Color col) {
-        super.setLineColor(col);
         if (cover != null) {
             cover.setLineColor(col);
         }
@@ -773,8 +774,8 @@
     /**
      * Get the line colour for the use case oval.<p>
      *
-     * This involves getting the _cover oval colour, not the bigPort.<p>
-     *
+     * This involves getting the <code>cover</code> oval colour, not the bigPort.
+     * 
      * @return  The colour in use.
      */
     @Override
@@ -785,13 +786,14 @@
     /**
      * Set the fill colour for the use case oval.<p>
      *
-     * This involves setting the _cover oval, not the bigPort.<p>
+     * This involves setting the <code>cover</code> oval, not the bigPort.
+     * Calling the super method would cause all FigGroup elements
+     * to follow suit - which is not wanted.
      *
      * @param col  The colour desired.
      */
     @Override
     public void setFillColor(Color col) {
-        super.setFillColor(col);
         if (cover != null) {
             cover.setFillColor(col);
         }
@@ -800,7 +802,7 @@
     /**
      * Get the line colour for the use case oval.<p>
      *
-     * This involves getting the _cover oval colour, not the bigPort.<p>
+     * This involves getting the <code>cover</code> oval colour, not the bigPort.
      *
      * @return  The colour in use.
      */
@@ -812,14 +814,16 @@
     /**
      * Set whether the use case oval is to be filled.<p>
      *
-     * This involves setting the _cover oval, not the bigPort.<p>
+     * This involves setting the <code>cover</code> oval, 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.
      */
     @Override
     public void setFilled(boolean f) {
-        super.setFilled(f);
         if (cover != null) {
             cover.setFilled(f);
         }
@@ -828,7 +832,7 @@
     /**
      * Get whether the use case oval is to be filled.<p>
      *
-     * This involves getting the _cover oval, not the bigPort.<p>
+     * This involves getting the <code>cover</code> oval, not the bigPort.<p>
      *
      * @return  <code>true</code> if the oval is to be filled,
      *          <code>false</code> if not.
@@ -841,7 +845,9 @@
     /**
      * Set the line width for the use case oval.<p>
      *
-     * This involves setting the _cover oval, not the bigPort.<p>
+     * This involves setting the <code>cover</code> oval, not the bigPort.
+     * Calling the super method would cause all FigGroup elements
+     * to be filled, too - which is not wanted for e.g. the stereotype figs.
      *
      * @param w  The line width desired.
      */
@@ -855,7 +861,7 @@
     /**
      * Get the line width for the use case oval.<p>
      *
-     * This involves getting the _cover oval colour, not the bigPort.<p>
+     * This involves getting the <code>cover</code> oval colour, not the bigPort.<p>
      *
      * @return  The line width set.
      */

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

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