svn commit: r16589 - trunk/src/argouml-app/src/org/argouml/uml/diagram: ui use_case/ui

Author: tfmorris
Date: 2009-01-13 14:34:36-0800
New Revision: 16589

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

Log:
Issue 5518: Assign owner to FigExtend path item Figs 
http://argouml.tigris.org/issues/show_bug.cgi?id=5518

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java?view=diff&pathrev=16589&r1=16588&r2=16589
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFigText.java	2009-01-13 14:34:36-0800
@@ -106,8 +106,11 @@
         // per-fig basis, so we can just use the project/diagram defaults
 //        settings = new DiagramSettings(renderSettings);
         settings = renderSettings;
-        setFontFamily(settings.getFontName());
-        setFontSize(settings.getFontSize());
+        super.setFontFamily(settings.getFontName());
+        super.setFontSize(settings.getFontSize());
+        super.setFillColor(FILL_COLOR);
+        super.setTextFillColor(FILL_COLOR);
+        super.setTextColor(TEXT_COLOR);
         // Certain types of fixed text (e.g. a FigStereotype with a keyword)
         // may not have an owner
         if (owner != null) {

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigExtend.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigExtend.java?view=diff&pathrev=16589&r1=16588&r2=16589
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigExtend.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigExtend.java	2009-01-13 14:34:36-0800
@@ -25,6 +25,7 @@
 package org.argouml.uml.diagram.use_case.ui;
 
 import java.awt.Graphics;
+import java.awt.Rectangle;
 import java.beans.PropertyChangeEvent;
 import java.util.HashSet;
 import java.util.Set;
@@ -32,12 +33,12 @@
 import org.argouml.model.Model;
 import org.argouml.notation.providers.uml.NotationUtilityUml;
 import org.argouml.uml.diagram.DiagramSettings;
+import org.argouml.uml.diagram.ui.ArgoFigText;
 import org.argouml.uml.diagram.ui.FigEdgeModelElement;
+import org.argouml.uml.diagram.ui.FigTextGroup;
 import org.tigris.gef.base.PathConvPercent;
 import org.tigris.gef.presentation.ArrowHeadGreater;
 import org.tigris.gef.presentation.Fig;
-import org.tigris.gef.presentation.FigGroup;
-import org.tigris.gef.presentation.FigText;
 
 /**
  * A fig for use with extend relationships on use case diagrams.<p>
@@ -49,6 +50,8 @@
  */
 public class FigExtend extends FigEdgeModelElement {
 
+    private static final int DEFAULT_WIDTH = 90;
+
     /**
      * Serialization ID - generated by Eclipse for rev. 1.22
      */
@@ -57,17 +60,17 @@
     /**
      * The &laquo;extend&raquo; label.<p>
      */
-    private FigText label;
+    private ArgoFigText label;
 
     /**
      * The condition expression.<p>
      */
-    private FigText condition;
+    private ArgoFigText condition;
 
     /**
      * The group of label and condition.<p>
      */
-    private FigGroup fg;
+    private FigTextGroup fg;
 
 
     private ArrowHeadGreater endArrow = new ArrowHeadGreater();
@@ -83,20 +86,19 @@
     @SuppressWarnings("deprecation")
     @Deprecated
     public FigExtend() {
-        initialize();
+        initialize(null);
     }
 
 
-    private void initialize() {
+    private void initialize(Object owner) {
         // The <<extend>> label.
         // It's not a true stereotype, so don't use the stereotype support
         //int y = getNameFig().getBounds().height;
-        int h = 20;
-        int y = Y0 + h;
-        label = new FigText(X0, y, 90, h);
-        y = y + h;
-        label.setTextColor(TEXT_COLOR);
-        label.setTextFilled(false);
+        int y = Y0 + STEREOHEIGHT;
+        label = new ArgoFigText(owner, 
+                new Rectangle(X0, y, DEFAULT_WIDTH, STEREOHEIGHT), 
+                getSettings(), false);
+        y = y + STEREOHEIGHT;
         label.setFilled(false);
         label.setLineWidth(0);
         label.setEditable(false);
@@ -104,17 +106,16 @@
         label.calcBounds();
 
         // Set up FigText to hold the condition.
-        condition = new FigText(X0, y, 90, h);
-        y = y + h;
-        condition.setTextColor(TEXT_COLOR);
-        condition.setTextFilled(false);
+        condition = new ArgoFigText(owner, 
+                new Rectangle(X0, y, DEFAULT_WIDTH, STEREOHEIGHT), 
+                getSettings(), false);
+        y = y + STEREOHEIGHT;
         condition.setFilled(false);
         condition.setLineWidth(0);
-        condition.setExpandOnly(false);
 
         // Join all into a group
 
-        fg = new FigGroup();
+        fg = new FigTextGroup(owner, getSettings());
 
         // UML spec for Extend doesn't call for name nor stereotype
         fg.addFig(label);
@@ -161,7 +162,7 @@
      */
     public FigExtend(Object owner, DiagramSettings settings) {
         super(owner, settings);
-        initialize();
+        initialize(owner);
     }
     
     /**

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

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