svn commit: r16606 - trunk/src/argouml-app/src/org/argouml/uml/diagram: activity/ui state/ui ui

Author: tfmorris
Date: 2009-01-15 10:28:25-0800
New Revision: 16606

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java
   trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java

Log:
Use constants.  No functional change.

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java?view=diff&pathrev=16606&r1=16605&r2=16606
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java	2009-01-15 10:28:25-0800
@@ -86,7 +86,7 @@
     private static final int PADDING = 8;
     private static final int WIDTH = 70;
     private static final int HEIGHT = 50;
-    private static final int STATE_HEIGHT = 21;
+    private static final int STATE_HEIGHT = NAME_FIG_HEIGHT;
 
     private NotationProvider notationProviderType;
     private NotationProvider notationProviderState;

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java?view=diff&pathrev=16606&r1=16605&r2=16606
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigState.java	2009-01-15 10:28:25-0800
@@ -117,6 +117,8 @@
     }
 
     private void initializeState() {
+        // TODO: Get rid of magic numbers!  Figure out which represent line
+        // widths vs padding vs offsets
         setBigPort(new FigRRect(getInitialX() + 1, getInitialY() + 1,
                 getInitialWidth() - 2, getInitialHeight() - 2,
                 DEBUG_COLOR, DEBUG_COLOR));
@@ -128,9 +130,10 @@
 
         internal =
             new FigText(getInitialX() + 2,
-                    getInitialY() + 2 + 21 + 4,
+                    getInitialY() + 2 + NAME_FIG_HEIGHT + 4,
                     getInitialWidth() - 4,
-                    getInitialHeight() - (getInitialY() + 2 + 21 + 4));
+                    getInitialHeight() 
+                    - (getInitialY() + 2 + NAME_FIG_HEIGHT + 4));
         internal.setFont(getSettings().getFont(Font.PLAIN));
         internal.setTextColor(TEXT_COLOR);
         internal.setLineWidth(0);

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java?view=diff&pathrev=16606&r1=16605&r2=16606
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java	2009-01-15 10:28:25-0800
@@ -47,7 +47,7 @@
 
 public class FigSubmachineState extends FigState {
 
-    private static final int INCLUDE_HEIGHT = 21;
+    private static final int INCLUDE_HEIGHT = NAME_FIG_HEIGHT;
     private static final int WIDTH = 90;
     
     private FigRect cover;

Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java?view=diff&pathrev=16606&r1=16605&r2=16606
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java	2009-01-15 10:28:25-0800
@@ -81,7 +81,8 @@
 //      The following does not seem to work - centered the Fig instead.
 //        getNameFig().setJustificationByName("center");
 
-        getStereotypeFig().setBounds(X + 10, Y + 22, 0, 21);
+        getStereotypeFig().setBounds(X + 10, Y + NAME_FIG_HEIGHT + 1, 
+                0, NAME_FIG_HEIGHT);
         getStereotypeFig().setFilled(false);
         getStereotypeFig().setLineWidth(0);
 
@@ -292,7 +293,7 @@
         getNameFig().setBounds(x + (w - nm.width) / 2, 
                 y + h / 2 - nm.height / 2, 
                 nm.width, nm.height);
-        
+        // TODO: Replace magic numbers with constants
         if (getStereotypeFig().isVisible()) {
             /* TODO: Test this. */
             getStereotypeFig().setBounds(x, y + h / 2 - 20, w, 15);

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

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