svn commit: r16985 - trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigGeneralization.java

Author: bobtarling
Date: 2009-03-27 14:10:06-0700
New Revision: 16985

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

Log:
Issue 5726: Show stereotype together with discriminator as a draggable text group

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigGeneralization.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigGeneralization.java?view=diff&pathrev=16985&r1=16984&r2=16985
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigGeneralization.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigGeneralization.java	2009-03-27 14:10:06-0700
@@ -53,6 +53,13 @@
      */
     private static final long serialVersionUID = 3983170503390943894L;
 
+
+    /**
+     * Group for the FigTexts concerning the name and stereotype of the
+     * association itself.
+     */
+    private FigTextGroup middleGroup;
+    
     /**
      * Text box for discriminator.
      */
@@ -70,18 +77,23 @@
     public FigGeneralization() {
         discriminator = new ArgoFigText(null, new Rectangle(X0, Y0,
                 DISCRIMINATOR_WIDTH, TEXT_HEIGHT), getSettings(), false);
+        middleGroup = new FigTextGroup();
         initialize();
     }
 
     private void initialize() {
-        // UML spec for Generalizations doesn't call for name or stereotype
+        // UML spec for Generalizations doesn't call for name
 
 	discriminator.setFilled(false);
 	discriminator.setLineWidth(0);
 	discriminator.setReturnAction(FigText.END_EDITING);
 	discriminator.setTabAction(FigText.END_EDITING);
-	addPathItem(discriminator, 
-	        new PathItemPlacement(this, discriminator, 50, -10));
+	
+        middleGroup.addFig(discriminator);
+        middleGroup.addFig(getStereotypeFig());        
+	
+	addPathItem(middleGroup, 
+	        new PathItemPlacement(this, middleGroup, 50, -10));
 
         endArrow = new ArrowHeadTriangle();
 	endArrow.setFillColor(FILL_COLOR);
@@ -101,6 +113,7 @@
     @Deprecated
     public FigGeneralization(Object edge, Layer lay) {
 	this();
+        middleGroup = new FigTextGroup();
 	setLayer(lay);
 	setOwner(edge);
     }
@@ -116,6 +129,9 @@
         super(owner, settings);
         discriminator = new ArgoFigText(owner, new Rectangle(X0, Y0,
                 DISCRIMINATOR_WIDTH, TEXT_HEIGHT), settings, false);
+        middleGroup = new FigTextGroup(owner, settings);
+        
+        
         initialize();
         fixup(owner);
         addListener(owner);

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

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