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

Author: tfmorris
Date: 2009-01-05 16:50:20-0800
New Revision: 16528

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

Log:
RESOLVED - task 5593: Enumerations get a <<datatype>> keyword 
http://argouml.tigris.org/issues/show_bug.cgi?id=5593

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigKeyword.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigKeyword.java?view=diff&pathrev=16528&r1=16527&r2=16528
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigKeyword.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigKeyword.java	2009-01-05 16:50:20-0800
@@ -47,7 +47,7 @@
  */
 public class FigKeyword extends FigSingleLineText {
 
-    private final String keywordText;
+    private String keywordText;
 
     /**
      * @param keyword the text to show
@@ -69,6 +69,7 @@
         setJustification(FigText.JUSTIFY_CENTER);
         setRightMargin(3);
         setLeftMargin(3);
+        super.setLineWidth(0);
     }
     
     /* Force the line-width to 0, since the FigGroup that contains the 
@@ -81,6 +82,7 @@
     /**
      * This is needed for updating the guillemet style.
      */
+    @Override
     protected void setText() {
         setText(keywordText);
     }
@@ -89,8 +91,9 @@
      * Add guillemets to any text set to this Fig.
      * {@inheritDoc}
      */
+    @Override
     public void setText(String text) {
-        assert keywordText.equals(text);
+        keywordText = text;
         super.setText(NotationUtilityUml.formatStereotype(text,
                 getSettings().getNotationSettings().isUseGuillemets()));
     }

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java?view=diff&pathrev=16528&r1=16527&r2=16528
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java	2009-01-05 16:50:20-0800
@@ -215,6 +215,8 @@
 	List<Fig> figsWithOutIcon = new ArrayList<Fig>();
 	List<Fig> others = new ArrayList<Fig>();
 
+	// TODO: This doesn't do anything special with keywords.
+	// They should probably go first.
 	for (Fig f : allFigs) {
             if (f instanceof FigStereotype) {
                 FigStereotype s = (FigStereotype) f;
@@ -297,6 +299,8 @@
             } else {
                 // The keyword fig already exists.
                 removeCollection.remove(keywordFig);
+                // Make sure it has the right text
+                keywordFig.setText(keyword);
             }
             ++stereotypeCount;
         }

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

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