svn commit: r16227 - trunk/src/argouml-app/src/org/argouml/uml/diagram: activity/ui collaboration/ui deployment/ui state/ui static_structure/ui ui use_case/ui
Tom Morris <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: tfmorris
Date: 2008-12-03 11:18:02-0800
New Revision: 16227
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.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/collaboration/ui/FigClassifierRole.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigForkState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSynchState.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/FigClassifierBoxWithAttributes.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigCompartmentBox.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEditableCompartment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigGeneralization.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigMessage.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigNodeModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigActor.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigExtend.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigInclude.java
Log:
Factor out constants for origin X,Y positions
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java 2008-12-03 11:18:02-0800
@@ -50,13 +50,11 @@
*/
public class FigActionState extends FigStateVertex {
- ////////////////////////////////////////////////////////////////
- // constants
+ private static final int HEIGHT = 25;
- private static final int PADDING = 8;
+ private static final int WIDTH = 90;
- ////////////////////////////////////////////////////////////////
- // instance variables
+ private static final int PADDING = 8;
private FigRRect cover;
@@ -65,22 +63,20 @@
*/
private NotationProvider notationProvider;
- ////////////////////////////////////////////////////////////////
- // constructors
/**
* Constructor FigActionState.
*/
public FigActionState() {
- setBigPort(new FigRRect(10 + 1, 10 + 1, 90 - 2, 25 - 2, Color.cyan,
+ setBigPort(new FigRRect(X0 + 1, Y0 + 1, WIDTH - 2, HEIGHT - 2, Color.cyan,
Color.cyan));
((FigRRect) getBigPort()).setCornerRadius(getBigPort().getHeight() / 2);
- cover = new FigRRect(10, 10, 90, 25, Color.black, Color.white);
+ cover = new FigRRect(X0, Y0, WIDTH, HEIGHT, Color.black, Color.white);
cover.setCornerRadius(getHeight() / 2);
// overrule the single-line namefig created by the parent
- setNameFig(new FigMultiLineTextWithBold(10 + PADDING, 10,
- 90 - PADDING * 2, 25,
+ setNameFig(new FigMultiLineTextWithBold(X0 + PADDING, Y0,
+ WIDTH - PADDING * 2, HEIGHT,
true));
getNameFig().setText(placeString());
getNameFig().setBotMargin(7); // make space for the clarifier
@@ -325,4 +321,4 @@
* The UID.
*/
private static final long serialVersionUID = -3526461404860044420L;
-} /* end class FigActionState */
+}
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=16227&r1=16226&r2=16227
==============================================================================
--- 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 2008-12-03 11:18:02-0800
@@ -80,7 +80,6 @@
public class FigObjectFlowState extends FigNodeModelElement {
private static final int PADDING = 8;
- private static final int OFFSET = 10;
private static final int WIDTH = 70;
private static final int HEIGHT = 50;
@@ -95,16 +94,16 @@
* Main Constructor FigObjectFlowState (called from file loading).
*/
public FigObjectFlowState() {
- setBigPort(new FigRect(OFFSET, OFFSET, WIDTH, HEIGHT,
+ setBigPort(new FigRect(X0, Y0, WIDTH, HEIGHT,
Color.cyan, Color.cyan));
cover =
- new FigRect(OFFSET, OFFSET, WIDTH, HEIGHT,
+ new FigRect(X0, Y0, WIDTH, HEIGHT,
Color.black, Color.white);
getNameFig().setUnderline(true);
getNameFig().setLineWidth(0);
- state = new FigSingleLineText(OFFSET, OFFSET, WIDTH, 21, true);
+ state = new FigSingleLineText(X0, Y0, WIDTH, 21, true);
// add Figs to the FigNode in back-to-front order
addFig(getBigPort());
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=16227&r1=16226&r2=16227
==============================================================================
--- 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 2008-12-03 11:18:02-0800
@@ -64,19 +64,19 @@
* Constructor.
*/
public FigPartition() {
- setBigPort(new FigRect(10, 10, 160, 200, Color.cyan, Color.cyan));
+ setBigPort(new FigRect(X0, Y0, 160, 200, Color.cyan, Color.cyan));
getBigPort().setFilled(false);
getBigPort().setLineWidth(0);
- leftLine = new FigLine(10, 10, 10, 300);
- rightLine = new FigLine(150, 10, 160, 300);
- bottomLine = new FigLine(10, 300, 150, 300);
- topLine = new FigLine(10, 10, 150, 10);
+ leftLine = new FigLine(X0, Y0, 10, 300);
+ rightLine = new FigLine(150, Y0, 160, 300);
+ bottomLine = new FigLine(X0, 300, 150, 300);
+ topLine = new FigLine(X0, Y0, 150, 10);
getNameFig().setLineWidth(0);
- getNameFig().setBounds(10, 10, 50, 25);
+ getNameFig().setBounds(X0, Y0, 50, 25);
getNameFig().setFilled(false);
- seperator = new FigLine(10, 25, 150, 25);
+ seperator = new FigLine(X0, Y0 + 15, 150, 25);
addFig(getBigPort());
addFig(rightLine);
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=16227&r1=16226&r2=16227
==============================================================================
--- 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 2008-12-03 11:18:02-0800
@@ -51,8 +51,8 @@
private static final int PADDING = 8;
- private static final int X = 10;
- private static final int Y = 10;
+ private static final int X = X0;
+ private static final int Y = Y0;
private static final int W = 90;
private static final int H = 25;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java 2008-12-03 11:18:02-0800
@@ -83,8 +83,8 @@
public FigClassifierRole() {
// The big port and cover. Color of the big port is irrelevant
- setBigPort(new FigRect(10, 10, 90, 50, Color.cyan, Color.cyan));
- cover = new FigRect(10, 10, 90, 50, Color.black, Color.white);
+ setBigPort(new FigRect(X0, Y0, 90, 50, Color.cyan, Color.cyan));
+ cover = new FigRect(X0, Y0, 90, 50, Color.black, Color.white);
// The stereotype. Width is the same as the cover, height is whatever
// its minimum permitted is. The text should be centred.
@@ -95,7 +95,7 @@
getStereotypeFig().setVisible(true);
//getStereotypeFig().setFilled(false);
getStereotypeFig().setFillColor(Color.red);
- getStereotypeFig().setBounds(10, 10, 90, stereoMin.height);
+ getStereotypeFig().setBounds(X0, Y0, 90, stereoMin.height);
// The name. Width is the same as the cover, height is whatever its
// minimum permitted is. The text of the name will be centred by
@@ -110,7 +110,7 @@
getNameFig().setFilled(false);
getNameFig().setUnderline(true);
- getNameFig().setBounds(10, 10, 90, nameMin.height);
+ getNameFig().setBounds(X0, Y0, 90, nameMin.height);
// add Figs to the FigNode in back-to-front order
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java 2008-12-03 11:18:02-0800
@@ -51,13 +51,13 @@
* Main constructor.
*/
public FigObject() {
- setBigPort(new FigRect(10, 10, 90, 50, Color.cyan, Color.cyan));
- cover = new FigRect(10, 10, 90, 50, Color.black, Color.white);
+ setBigPort(new FigRect(X0, Y0, 90, 50, Color.cyan, Color.cyan));
+ cover = new FigRect(X0, Y0, 90, 50, Color.black, Color.white);
getNameFig().setLineWidth(0);
getNameFig().setFilled(false);
getNameFig().setUnderline(true);
Dimension nameMin = getNameFig().getMinimumSize();
- getNameFig().setBounds(10, 10, nameMin.width + 20, nameMin.height);
+ getNameFig().setBounds(X0, Y0, nameMin.width + 20, nameMin.height);
// add Figs to the FigNode in back-to-front order
addFig(getBigPort());
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java 2008-12-03 11:18:02-0800
@@ -43,31 +43,20 @@
*/
public class FigBranchState extends FigStateVertex {
- ////////////////////////////////////////////////////////////////
- // constants
-
- private static final int X = 10;
- private static final int Y = 10;
private static final int WIDTH = 24;
private static final int HEIGHT = 24;
- ////////////////////////////////////////////////////////////////
- // instance variables
-
private FigCircle head;
private FigCircle bp;
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* Constructor.
*/
public FigBranchState() {
setEditable(false);
- bp = new FigCircle(X, Y, WIDTH, HEIGHT, Color.cyan, Color.cyan);
+ bp = new FigCircle(X0, Y0, WIDTH, HEIGHT, Color.cyan, Color.cyan);
setBigPort(bp);
- head = new FigCircle(X, Y, WIDTH, HEIGHT, Color.black, Color.white);
+ head = new FigCircle(X0, Y0, WIDTH, HEIGHT, Color.black, Color.white);
// add Figs to the FigNode in back-to-front order
addFig(getBigPort());
@@ -92,6 +81,7 @@
*
* @see org.tigris.gef.presentation.Fig#getClosestPoint(java.awt.Point)
*/
+ @Override
public Point getClosestPoint(Point anotherPt) {
Point p = bp.connectionPoint(anotherPt);
return p;
@@ -100,6 +90,7 @@
/*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigBranchState figClone = (FigBranchState) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -108,14 +99,13 @@
return figClone;
}
- ////////////////////////////////////////////////////////////////
- // Fig accessors
/**
* Choice states are fixed size.
*
* @return false
*/
+ @Override
public boolean isResizable() {
return false;
}
@@ -123,6 +113,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
head.setLineColor(col);
}
@@ -130,6 +121,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
+ @Override
public Color getLineColor() {
return head.getLineColor();
}
@@ -137,6 +129,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
head.setFillColor(col);
}
@@ -144,6 +137,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return head.getFillColor();
}
@@ -152,10 +146,12 @@
* Ignored - figure has a fixed rendering.
* @param f ignored
*/
+ @Override
public void setFilled(boolean f) {
// ignored - fixed rendering
}
+ @Override
public boolean isFilled() {
return true;
}
@@ -163,6 +159,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
head.setLineWidth(w);
}
@@ -170,6 +167,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return head.getLineWidth();
}
@@ -180,6 +178,7 @@
/*
* @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
*/
+ @Override
public void mouseClicked(MouseEvent me) {
// ignored
}
@@ -209,4 +208,4 @@
*/
static final long serialVersionUID = 6572261327347541373L;
-} /* end class FigBranchState */
+}
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=16227&r1=16226&r2=16227
==============================================================================
--- 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 2008-12-03 11:18:02-0800
@@ -44,8 +44,6 @@
*/
public class FigFinalState extends FigStateVertex {
- private static final int X = 10;
- private static final int Y = 10;
private static final int WIDTH = 24;
private static final int HEIGHT = 24;
@@ -59,11 +57,11 @@
setEditable(false);
Color handleColor = Globals.getPrefs().getHandleColor();
FigCircle bigPort =
- new FigCircle(X, Y, WIDTH, HEIGHT, Color.black, Color.white);
+ new FigCircle(X0, Y0, WIDTH, HEIGHT, Color.black, Color.white);
inCircle =
new FigCircle(
- X + 5,
- Y + 5,
+ X0 + 5,
+ Y0 + 5,
WIDTH - 10,
HEIGHT - 10,
handleColor,
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigForkState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigForkState.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigForkState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigForkState.java 2008-12-03 11:18:02-0800
@@ -39,8 +39,8 @@
*/
public class FigForkState extends FigStateVertex {
- private static final int X = 10;
- private static final int Y = 10;
+ private static final int X = X0;
+ private static final int Y = Y0;
private static final int WIDTH = 80;
private static final int HEIGHT = 7;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java 2008-12-03 11:18:02-0800
@@ -42,8 +42,8 @@
*/
public abstract class FigHistoryState extends FigStateVertex {
- private static final int X = 10;
- private static final int Y = 10;
+ private static final int X = X0;
+ private static final int Y = Y0;
private static final int WIDTH = 24;
private static final int HEIGHT = 24;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java 2008-12-03 11:18:02-0800
@@ -44,8 +44,8 @@
*/
public class FigInitialState extends FigStateVertex {
- private static final int X = 10;
- private static final int Y = 10;
+ private static final int X = X0;
+ private static final int Y = Y0;
private static final int WIDTH = 16;
private static final int HEIGHT = 16;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java 2008-12-03 11:18:02-0800
@@ -39,8 +39,8 @@
*/
public class FigJoinState extends FigStateVertex {
- private static final int X = 10;
- private static final int Y = 10;
+ private static final int X = X0;
+ private static final int Y = Y0;
private static final int WIDTH = 80;
private static final int HEIGHT = 7;
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=16227&r1=16226&r2=16227
==============================================================================
--- 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 2008-12-03 11:18:02-0800
@@ -74,7 +74,7 @@
getInitialY() + 2 + getNameFig().getBounds().height + 1,
Color.black);
- include = new FigSingleLineText(10, 10, 90, 21, true);
+ include = new FigSingleLineText(X0, Y0, 90, 21, true);
include.setText(placeString());
include.setBounds(getInitialX() + 2, getInitialY() + 2,
getInitialWidth() - 4, include.getBounds().height);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java 2008-12-03 11:18:02-0800
@@ -46,8 +46,8 @@
*/
public class FigSynchState extends FigStateVertex {
- private static final int X = 10;
- private static final int Y = 10;
+ private static final int X = X0;
+ private static final int Y = Y0;
private static final int WIDTH = 25;
private static final int HEIGHT = 25;
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=16227&r1=16226&r2=16227
==============================================================================
--- 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 2008-12-03 11:18:02-0800
@@ -25,7 +25,6 @@
package org.argouml.uml.diagram.static_structure.ui;
import java.awt.Color;
-import java.awt.Dimension;
import java.awt.Rectangle;
import java.awt.event.MouseEvent;
import java.beans.PropertyChangeEvent;
@@ -81,7 +80,7 @@
// are inside it
operationsFig =
new FigOperationsCompartment(
- 10, 31 + ROWHEIGHT, 60, ROWHEIGHT + 2);
+ X0, Y0 + 21 + ROWHEIGHT, 60, ROWHEIGHT + 2);
// Set properties of the stereotype box. Make it 1 pixel higher than
// before, so it overlaps the name box, and the blanking takes out both
@@ -92,7 +91,7 @@
// +1 to have 1 pixel overlap with getNameFig()
getStereotypeFig().setHeight(STEREOHEIGHT + 1);
- borderFig = new FigEmptyRect(10, 10, 0, 0);
+ borderFig = new FigEmptyRect(X0, Y0, 0, 0);
borderFig.setLineWidth(1);
borderFig.setLineColor(Color.black);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigClassifierBoxWithAttributes.java 2008-12-03 11:18:02-0800
@@ -59,7 +59,7 @@
public FigClassifierBoxWithAttributes() {
super();
attributesFigCompartment =
- new FigAttributesCompartment(10, 30, 60, ROWHEIGHT + 2);
+ new FigAttributesCompartment(X0, Y0 + 20, WIDTH, ROWHEIGHT + 2);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigDataType.java 2008-12-03 11:18:02-0800
@@ -97,7 +97,7 @@
// Set the bounds of the figure to the total of the above (hardcoded)
enableSizeChecking(true);
- setBounds(10, 10, 60, 21 + ROWHEIGHT);
+ setBounds(X0, Y0, WIDTH, 21 + ROWHEIGHT);
}
/**
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java 2008-12-03 11:18:02-0800
@@ -283,8 +283,8 @@
// Set bounds will be called from our superclass constructor before
// our constructor has run, so make sure this gets set up if needed.
if (literalsCompartment == null) {
- literalsCompartment = new FigEnumLiteralsCompartment(10, 30, 60,
- ROWHEIGHT + 2);
+ literalsCompartment = new FigEnumLiteralsCompartment(X0, Y0 + 20,
+ 60, ROWHEIGHT + 2);
}
return literalsCompartment;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigInterface.java 2008-12-03 11:18:02-0800
@@ -98,7 +98,7 @@
// Set the bounds of the figure to the total of the above (hardcoded)
enableSizeChecking(true);
- setBounds(10, 10, 60, 21 + ROWHEIGHT);
+ setBounds(X0, Y0, WIDTH, 21 + ROWHEIGHT);
}
/**
@@ -184,7 +184,7 @@
aSize = addChildDimensions(aSize, getOperationsFig());
// we want to maintain a minimum width for Interfaces
- aSize.width = Math.max(60, aSize.width);
+ aSize.width = Math.max(WIDTH, aSize.width);
return aSize;
}
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=16227&r1=16226&r2=16227
==============================================================================
--- 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 2008-12-03 11:18:02-0800
@@ -176,8 +176,8 @@
// display is linked to whether to display the stereotype.
// TODO: Do we really still need this? - Bob
- stereoLineBlinder =
- new FigRect(11, 10 + STEREOHEIGHT, 58, 2, Color.white, Color.white);
+ stereoLineBlinder = new FigRect(X0 + 1, Y0 + STEREOHEIGHT, WIDTH - 2,
+ 2, Color.white, Color.white);
stereoLineBlinder.setLineWidth(1);
stereoLineBlinder.setVisible(false);
@@ -188,7 +188,7 @@
addFig(stereoLineBlinder);
addFig(body);
- setBlinkPorts(false); //make port invisble unless mouse enters
+ setBlinkPorts(false); //make port invisible unless mouse enters
setLocation(x, y);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigStereotypeDeclaration.java 2008-12-03 11:18:02-0800
@@ -85,7 +85,7 @@
setSuppressCalcBounds(false);
// Set the bounds of the figure to the total of the above (hardcoded)
- setBounds(10, 10, 60, 22 + 2 * ROWHEIGHT);
+ setBounds(X0, Y0, WIDTH, 22 + 2 * ROWHEIGHT);
}
/**
@@ -167,7 +167,7 @@
// TODO: Allow space for each of the Tags & Constraints we have
// we want to maintain a minimum width for the class
- aSize.width = Math.max(60, aSize.width);
+ aSize.width = Math.max(WIDTH, aSize.width);
return aSize;
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/ArgoFig.java 2008-12-03 11:18:02-0800
@@ -38,6 +38,17 @@
*/
public interface ArgoFig {
+ // TODO: These have been used for most instances of new FigFoo(X0, Y0, ...
+ // but additional work is required to extract the constant from
+ // calculations, etc.
+
+ /** Default X offset of origin used when building figs */
+ static final int X0 = 10;
+
+ /** Default Y offset of origin used when building figs */
+ static final int Y0 = 10;
+
+
/**
* Set the owning project for this Fig. This is an optional operation which
* may throw an {@link UnsupportedOperationException} if not implemented.
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociation.java 2008-12-03 11:18:02-0800
@@ -535,7 +535,7 @@
private HashMap<String, Object> npArguments = new HashMap<String, Object>();
FigMultiplicity() {
- super(10, 10, 90, 20, false, "multiplicity");
+ super(X0, Y0, 90, 20, false, "multiplicity");
setTextFilled(false);
setJustification(FigText.JUSTIFY_CENTER);
@@ -610,7 +610,7 @@
private static final long serialVersionUID = 5385230942216677015L;
FigOrdering() {
- super(10, 10, 90, 20, false, "ordering");
+ super(X0, Y0, 90, 20, false, "ordering");
setTextFilled(false);
setJustification(FigText.JUSTIFY_CENTER);
setEditable(false);
@@ -661,7 +661,7 @@
private HashMap<String, Object> npArguments = new HashMap<String, Object>();
FigRole() {
- super(10, 10, 90, 20, false/*,
+ super(X0, Y0, 90, 20, false/*,
// no need to listen to these property changes - the
// notationProvider takes care of this.
new String[] {"name", "visibility", "stereotype"}*/);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigAssociationEnd.java 2008-12-03 11:18:02-0800
@@ -77,7 +77,7 @@
public FigAssociationEnd() {
super();
- srcMult = new FigText(10, 10, 90, 20);
+ srcMult = new ArgoFigText(X0, Y0, 90, 20);
srcMult.setTextColor(Color.black);
srcMult.setTextFilled(false);
srcMult.setFilled(false);
@@ -85,7 +85,7 @@
srcMult.setReturnAction(FigText.END_EDITING);
srcMult.setJustification(FigText.JUSTIFY_CENTER);
- srcOrdering = new FigText(10, 10, 90, 20);
+ srcOrdering = new ArgoFigText(X0, Y0, 90, 20);
srcOrdering.setTextColor(Color.black);
srcOrdering.setTextFilled(false);
srcOrdering.setFilled(false);
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=16227&r1=16226&r2=16227
==============================================================================
--- 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 2008-12-03 11:18:02-0800
@@ -29,7 +29,6 @@
import java.awt.Rectangle;
import java.awt.event.InputEvent;
import java.awt.event.MouseEvent;
-import java.util.Iterator;
import java.util.List;
import org.argouml.ui.targetmanager.TargetManager;
@@ -69,7 +68,7 @@
// +1 to have 1 pixel overlap with getNameFig()
getStereotypeFig().setHeight(STEREOHEIGHT + 1);
- borderFig = new FigEmptyRect(10, 10, 0, 0);
+ borderFig = new FigEmptyRect(X0, Y0, 0, 0);
borderFig.setLineWidth(1);
borderFig.setLineColor(Color.black);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigEdgeModelElement.java 2008-12-03 11:18:02-0800
@@ -193,10 +193,10 @@
DiagramSettings renderSettings) {
settings = renderSettings;
- nameFig = new FigNameWithAbstract(10, 30, 90, 20, false);
+ nameFig = new FigNameWithAbstract(X0, Y0 + 20, 90, 20, false);
nameFig.setTextFilled(false);
- stereotypeFig = new FigStereotypesGroup(10, 10, 90, 15);
+ stereotypeFig = new FigStereotypesGroup(X0, Y0, 90, 15);
setBetweenNearestPoints(true);
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=16227&r1=16226&r2=16227
==============================================================================
--- 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 2008-12-03 11:18:02-0800
@@ -51,11 +51,10 @@
*/
public abstract class FigEditableCompartment extends FigCompartment {
- /**
- * Logger.
- */
private static final Logger LOG = Logger.getLogger(FigCompartment.class);
+ private static final int MIN_HEIGHT = 21;
+
private FigSeperator compartmentSeperator;
/**
@@ -63,7 +62,7 @@
*
* Two figs are added to this FigGroup:
* The bigPort (i.e. a box that encloses all compartments),
- * and a seperator.
+ * and a separator.
*
* @param x x
* @param y y
@@ -72,7 +71,7 @@
*/
public FigEditableCompartment(int x, int y, int w, int h) {
super(x, y, w, h); // This adds bigPort, i.e. number 1
- compartmentSeperator = new FigSeperator(10, 10, 11);
+ compartmentSeperator = new FigSeperator(X0, Y0, 11);
addFig(compartmentSeperator); // number 2
}
@@ -283,8 +282,8 @@
*/
public Dimension getMinimumSize() {
Dimension d = super.getMinimumSize();
- if (d.height < 21) {
- d.height = 21;
+ if (d.height < MIN_HEIGHT) {
+ d.height = MIN_HEIGHT;
}
return d;
}
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=16227&r1=16226&r2=16227
==============================================================================
--- 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 2008-12-03 11:18:02-0800
@@ -54,7 +54,7 @@
/**
* Text box for discriminator.
*/
- private FigText discriminator = new FigText(10, 30, 90, 20);
+ private FigText discriminator = new FigText(X0, Y0 + 20, 90, 20);
private ArrowHeadTriangle endArrow;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigMessage.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigMessage.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigMessage.java 2008-12-03 11:18:02-0800
@@ -29,7 +29,9 @@
import java.awt.Polygon;
import java.awt.Rectangle;
import java.beans.PropertyChangeEvent;
+import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import java.util.Vector;
import org.argouml.model.Model;
@@ -72,8 +74,8 @@
getNameFig().setReturnAction(FigText.END_EDITING);
getNameFig().setFilled(false);
Dimension nameMin = getNameFig().getMinimumSize();
- getNameFig().setBounds(10, 10, 90, nameMin.height);
- getBigPort().setBounds(10, 10, 90, nameMin.height);
+ getNameFig().setBounds(X0, Y0, 90, nameMin.height);
+ getBigPort().setBounds(X0, Y0, 90, nameMin.height);
figPoly = new FigPoly(Color.black, Color.black);
int[] xpoints = {75, 75, 77, 75, 73, 75};
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=16227&r1=16226&r2=16227
==============================================================================
--- 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 2008-12-03 11:18:02-0800
@@ -133,11 +133,14 @@
Clarifiable,
ArgoFig {
- /**
- * Logger.
- */
+
private static final Logger LOG =
Logger.getLogger(FigNodeModelElement.class);
+
+ /**
+ * Default width for a node fig
+ */
+ protected static final int WIDTH = 60;
private DiElement diElement;
@@ -316,9 +319,9 @@
settings = renderSettings;
// this rectangle marks the whole modelelement figure; everything
// is inside it:
- bigPort = new FigRect(10, 10, 0, 0, Color.cyan, Color.cyan);
+ bigPort = new FigRect(X0, Y0, 0, 0, Color.cyan, Color.cyan);
- nameFig = new FigNameWithAbstractAndBold(10, 10, 90, 21, true);
+ nameFig = new FigNameWithAbstractAndBold(X0, Y0, 90, 21, true);
nameFig.setLineWidth(1);
nameFig.setFilled(true);
nameFig.setText(placeString());
@@ -326,7 +329,7 @@
nameFig.setRightMargin(4); // margin between text and border
nameFig.setLeftMargin(4);
- stereotypeFig = new FigStereotypesGroup(10, 10, 90, 15);
+ stereotypeFig = new FigStereotypesGroup(X0, Y0, 90, 15);
readyToEdit = false;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigActor.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigActor.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigActor.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigActor.java 2008-12-03 11:18:02-0800
@@ -35,6 +35,8 @@
import java.util.List;
import java.util.Vector;
+import org.argouml.model.Model;
+import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.base.Selection;
import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.presentation.Fig;
@@ -42,9 +44,6 @@
import org.tigris.gef.presentation.FigLine;
import org.tigris.gef.presentation.FigRect;
-import org.argouml.model.Model;
-import org.argouml.uml.diagram.ui.FigNodeModelElement;
-
/**
* Class to display graphics for an Actor in a diagram.
*/
@@ -76,14 +75,14 @@
*/
public FigActor() {
// Put this rectangle behind the rest, so it goes first
- FigRect bigPort = new ActorPortFigRect(10, 10, 0, 0, this);
+ FigRect bigPort = new ActorPortFigRect(X0, Y0, 0, 0, this);
FigCircle head =
- new FigCircle(12, 10, 16, 15, Color.black, Color.white);
- FigLine body = new FigLine(20, 25, 20, 40, Color.black);
- FigLine arms = new FigLine(10, 30, 30, 30, Color.black);
- FigLine leftLeg = new FigLine(20, 40, 15, 55, Color.black);
- FigLine rightLeg = new FigLine(20, 40, 25, 55, Color.black);
- getNameFig().setBounds(10, 55, 20, 20);
+ new FigCircle(X0 + 2, Y0, 16, 15, Color.black, Color.white);
+ FigLine body = new FigLine(X0 + 10, Y0 + 15, 20, 40, Color.black);
+ FigLine arms = new FigLine(X0, Y0 + 20, 30, 30, Color.black);
+ FigLine leftLeg = new FigLine(X0 + 10, Y0 + 30, 15, 55, Color.black);
+ FigLine rightLeg = new FigLine(X0 + 10, Y0 + 30, 25, 55, Color.black);
+ getNameFig().setBounds(X0, Y0 + 45, 20, 20);
getNameFig().setTextFilled(false);
getNameFig().setFilled(false);
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=16227&r1=16226&r2=16227
==============================================================================
--- 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 2008-12-03 11:18:02-0800
@@ -85,10 +85,9 @@
// The <<extend>> label.
// It's not a true stereotype, so don't use the stereotype support
//int y = getNameFig().getBounds().height;
- int y = 0;
int h = 20;
- y = y + 30;
- label = new FigText(10, y, 90, h);
+ int y = Y0 + h;
+ label = new FigText(X0, y, 90, h);
y = y + h;
label.setTextColor(Color.black);
label.setTextFilled(false);
@@ -103,7 +102,7 @@
label.calcBounds();
// Set up FigText to hold the condition.
- condition = new FigText(10, y, 90, h);
+ condition = new FigText(X0, y, 90, h);
y = y + h;
condition.setTextColor(Color.black);
condition.setTextFilled(false);
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigInclude.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigInclude.java?view=diff&pathrev=16227&r1=16226&r2=16227
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigInclude.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigInclude.java 2008-12-03 11:18:02-0800
@@ -67,7 +67,7 @@
// The <<include>> label.
// It's not a true stereotype, so don't use the stereotype support
- label = new FigSingleLineText(10, 30, 90, 20, false);
+ label = new FigSingleLineText(X0, Y0 + 20, 90, 20, false);
label.setTextColor(Color.black);
label.setTextFilled(false);
label.setFilled(false);
@@ -103,13 +103,6 @@
setOwner(edge);
}
-
- ///////////////////////////////////////////////////////////////////////////
- //
- // Accessors
- //
- ///////////////////////////////////////////////////////////////////////////
-
/**
* <p>Set a new fig to represent this edge.</p>
*
@@ -118,7 +111,7 @@
*
* @param f The fig to use.
*/
-
+ @Override
public void setFig(Fig f) {
super.setFig(f);
@@ -135,24 +128,17 @@
*
* @return <code>false</code> under all circumstances.
*/
-
+ @Override
protected boolean canEdit(Fig f) {
return false;
}
-
- ///////////////////////////////////////////////////////////////////////////
- //
- // Event handlers
- //
- ///////////////////////////////////////////////////////////////////////////
-
/*
* @see org.tigris.gef.presentation.Fig#paint(java.awt.Graphics)
*/
+ @Override
public void paint(Graphics g) {
endArrow.setLineColor(getLineColor());
super.paint(g);
}
-} /* end class FigInclude */
-
+}
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=979039
To unsubscribe from this discussion, e-mail: [[email protected]].