svn commit: r16485 - trunk/src/argouml-app/src/org/argouml: ui uml/diagram/activity/ui uml/diagram/deployment/ui uml/diagram/state/ui uml/diagram/static_structure/ui uml/diagram/ui
Tom Morris <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: tfmorris
Date: 2009-01-02 12:40:58-0800
New Revision: 16485
Modified:
trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigStereotypesGroup.java
Log:
STARTED - task 5579: Replace line width magic numbers with constants
http://argouml.tigris.org/issues/show_bug.cgi?id=5579
Modified: trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java?view=diff&pathrev=16485&r1=16484&r2=16485
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/StylePanelFig.java 2009-01-02 12:40:58-0800
@@ -43,6 +43,7 @@
import org.argouml.i18n.Translator;
import org.argouml.swingext.SpacerPanel;
import org.argouml.uml.diagram.DiagramSettings.StereotypeStyle;
+import org.argouml.uml.diagram.ui.ArgoFig;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.argouml.util.ArgoFrame;
@@ -466,7 +467,7 @@
if (c instanceof Color) {
target.setLineColor((Color) c);
}
- target.setLineWidth((c instanceof Color) ? 1 : 0);
+ target.setLineWidth((c instanceof Color) ? ArgoFig.LINE_WIDTH : 0);
target.endTrans();
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java?view=diff&pathrev=16485&r1=16484&r2=16485
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java 2009-01-02 12:40:58-0800
@@ -91,8 +91,7 @@
private void initFigs() {
// TODO: define constants for magic numbers
- setBigPort(new FigRect(X0, Y0, 160, 200, ArgoFig.DEBUG_COLOR,
- ArgoFig.DEBUG_COLOR));
+ setBigPort(new FigRect(X0, Y0, 160, 200, DEBUG_COLOR, DEBUG_COLOR));
getBigPort().setFilled(false);
getBigPort().setLineWidth(0);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java?view=diff&pathrev=16485&r1=16484&r2=16485
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java 2009-01-02 12:40:58-0800
@@ -133,8 +133,8 @@
s2 = new FigRRect(x - 11, y + 9, 8, 6, LINE_COLOR, FILL_COLOR);
s1.setFilled(true);
s2.setFilled(true);
- s1.setLineWidth(1);
- s2.setLineWidth(1);
+ s1.setLineWidth(LINE_WIDTH);
+ s2.setLineWidth(LINE_WIDTH);
s1.setCornerRadius(SH);
s2.setCornerRadius(SH);
s3 = new FigLine(x - 18, y + 6, x - 7, y + 12, LINE_COLOR);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java?view=diff&pathrev=16485&r1=16484&r2=16485
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java 2009-01-02 12:40:58-0800
@@ -92,7 +92,7 @@
getBigPort().setFilled(false);
getBigPort().setLineWidth(0);
cover = new FigCube(DEFAULT_X, DEFAULT_Y, DEFAULT_WIDTH,
- DEFAULT_HEIGHT, ArgoFig.LINE_COLOR, ArgoFig.FILL_COLOR);
+ DEFAULT_HEIGHT, LINE_COLOR, FILL_COLOR);
getNameFig().setLineWidth(0);
getNameFig().setFilled(false);
@@ -237,7 +237,7 @@
@Override
public void mouseClicked(MouseEvent me) {
super.mouseClicked(me);
- setLineColor(ArgoFig.LINE_COLOR);
+ setLineColor(LINE_COLOR);
}
@Override
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java?view=diff&pathrev=16485&r1=16484&r2=16485
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java 2009-01-02 12:40:58-0800
@@ -133,7 +133,7 @@
public void mouseClicked(MouseEvent me) {
super.mouseClicked(me);
// TODO: What is this needed for? - tfm
- setLineColor(ArgoFig.LINE_COLOR);
+ setLineColor(LINE_COLOR);
}
/*
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java?view=diff&pathrev=16485&r1=16484&r2=16485
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java 2009-01-02 12:40:58-0800
@@ -90,7 +90,7 @@
handleColor,
LINE_COLOR);
- bigPort.setLineWidth(1);
+ bigPort.setLineWidth(LINE_WIDTH);
inCircle.setLineWidth(0);
addFig(bigPort);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java?view=diff&pathrev=16485&r1=16484&r2=16485
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java 2009-01-02 12:40:58-0800
@@ -97,16 +97,16 @@
// lines. Initially not set to be displayed, but this will be changed
// when we try to render it, if we find we have a stereotype.
getStereotypeFig().setFilled(true);
- getStereotypeFig().setLineWidth(1);
+ getStereotypeFig().setLineWidth(LINE_WIDTH);
// +1 to have 1 pixel overlap with getNameFig()
getStereotypeFig().setHeight(STEREOHEIGHT + 1);
borderFig = new FigEmptyRect(X0, Y0, 0, 0);
- borderFig.setLineWidth(ArgoFig.LINE_WIDTH);
- borderFig.setLineColor(ArgoFig.LINE_COLOR);
+ borderFig.setLineWidth(LINE_WIDTH);
+ borderFig.setLineColor(LINE_COLOR);
getBigPort().setLineWidth(0);
- getBigPort().setFillColor(ArgoFig.FILL_COLOR);
+ getBigPort().setFillColor(FILL_COLOR);
}
private Rectangle getDefaultBounds() {
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java?view=diff&pathrev=16485&r1=16484&r2=16485
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java 2009-01-02 12:40:58-0800
@@ -135,7 +135,7 @@
outlineFig.addPoint(0, height - 1);
outlineFig.addPoint(0, 0);
outlineFig.setFilled(true);
- outlineFig.setLineWidth(1);
+ outlineFig.setLineWidth(LINE_WIDTH);
urCorner = new FigPoly(fg, fill);
urCorner.addPoint(width - 1 - dogear, 0);
@@ -145,7 +145,7 @@
urCorner.setFilled(true);
Color col = outlineFig.getFillColor();
urCorner.setFillColor(col.darker());
- urCorner.setLineWidth(1);
+ urCorner.setLineWidth(LINE_WIDTH);
setBigPort(new FigRect(0, 0, width, height, null, null));
getBigPort().setFilled(false);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java?view=diff&pathrev=16485&r1=16484&r2=16485
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java 2009-01-02 12:40:58-0800
@@ -183,7 +183,7 @@
setFilled(true);
setFillColor(FILL_COLOR);
setLineColor(LINE_COLOR);
- setLineWidth(1);
+ setLineWidth(LINE_WIDTH);
updateEdges();
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java?view=diff&pathrev=16485&r1=16484&r2=16485
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java 2009-01-02 12:40:58-0800
@@ -84,13 +84,13 @@
// lines. Initially not set to be displayed, but this will be changed
// when we try to render it, if we find we have a stereotype.
getStereotypeFig().setFilled(true);
- getStereotypeFig().setLineWidth(1);
+ getStereotypeFig().setLineWidth(LINE_WIDTH);
// +1 to have 1 pixel overlap with getNameFig()
- getStereotypeFig().setHeight(STEREOHEIGHT + 1);
+ getStereotypeFig().setHeight(STEREOHEIGHT + LINE_WIDTH);
// The outside border of the box around all compartments.
borderFig = new FigEmptyRect(X0, Y0, 0, 0);
- borderFig.setLineWidth(1);
+ borderFig.setLineWidth(LINE_WIDTH);
getBigPort().setLineWidth(0);
getBigPort().setFillColor(FILL_COLOR);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java?view=diff&pathrev=16485&r1=16484&r2=16485
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java 2009-01-02 12:40:58-0800
@@ -194,15 +194,15 @@
comp = createFigText(umlObject, new Rectangle(
xpos + 1,
ypos + 1 + acounter
- * ArgoFig.ROWHEIGHT,
+ * ROWHEIGHT,
0,
- ArgoFig.ROWHEIGHT - 2),
+ ROWHEIGHT - 2),
getSettings());
} else {
/* This one is still usable, so let's retain it, */
/* but its position may have been changed: */
Rectangle b = comp.getBounds();
- b.y = ypos + 1 + acounter * ArgoFig.ROWHEIGHT;
+ b.y = ypos + 1 + acounter * ROWHEIGHT;
// bounds not relevant here, but I am perfectionist...
comp.setBounds(b);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&pathrev=16485&r1=16484&r2=16485
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2009-01-02 12:40:58-0800
@@ -310,8 +310,7 @@
notationSettings = new NotationSettings();
// this rectangle marks the whole modelelement figure; everything
// is inside it:
- bigPort = new FigRect(X0, Y0, 0, 0, ArgoFig.DEBUG_COLOR,
- ArgoFig.DEBUG_COLOR);
+ bigPort = new FigRect(X0, Y0, 0, 0, DEBUG_COLOR, DEBUG_COLOR);
nameFig = new FigNameWithAbstractAndBold(X0, Y0, WIDTH, 21, true);
stereotypeFig = new FigStereotypesGroup(X0, Y0, WIDTH, 15);
@@ -323,9 +322,7 @@
* rendering settings.
*/
private void constructFigs() {
-
-
- nameFig.setLineWidth(1);
+ nameFig.setLineWidth(LINE_WIDTH);
nameFig.setFilled(true);
nameFig.setText(placeString());
nameFig.setBotMargin(7); // make space for the clarifier
@@ -386,8 +383,7 @@
// this rectangle marks the whole modelelement figure; everything
// is inside it:
- bigPort = new FigRect(X0, Y0, 0, 0, ArgoFig.DEBUG_COLOR,
- ArgoFig.DEBUG_COLOR);
+ bigPort = new FigRect(X0, Y0, 0, 0, DEBUG_COLOR, DEBUG_COLOR);
nameFig = new FigNameWithAbstractAndBold(element,
new Rectangle(X0, Y0, WIDTH, 21), getSettings(), true);
stereotypeFig = new FigStereotypesGroup(element,
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=16485&r1=16484&r2=16485
==============================================================================
--- 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-02 12:40:58-0800
@@ -336,9 +336,9 @@
bigPort.getX() + 1,
bigPort.getY() + 1
+ (stereotypeCount
- * ArgoFig.ROWHEIGHT),
+ * ROWHEIGHT),
0,
- ArgoFig.ROWHEIGHT - 2);
+ ROWHEIGHT - 2);
}
private void updateHiddenStereotypes() {
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1000040
To unsubscribe from this discussion, e-mail: [[email protected]].