svn commit: r16489 - trunk/src/argouml-app/src/org/argouml/uml/diagram: ui use_case/ui
Tom Morris <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: tfmorris
Date: 2009-01-02 20:51:45-0800
New Revision: 16489
Modified:
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/FigNodeModelElement.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/use_case/ui/FigActor.java
Log:
Add ArgoUML colors to places using GEF defaults
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=16489&r1=16488&r2=16489
==============================================================================
--- 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 20:51:45-0800
@@ -90,6 +90,7 @@
// The outside border of the box around all compartments.
borderFig = new FigEmptyRect(X0, Y0, 0, 0);
+ borderFig.setLineColor(LINE_COLOR);
borderFig.setLineWidth(LINE_WIDTH);
getBigPort().setLineWidth(0);
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=16489&r1=16488&r2=16489
==============================================================================
--- 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 2009-01-02 20:51:45-0800
@@ -201,6 +201,14 @@
// so we can just use the default settings;
// settings = new DiagramSettings(renderSettings);
settings = renderSettings;
+
+ // TODO: It doesn't matter what these get set to because GEF can't
+ // draw anything except 1 pixel wide lines
+ super.setLineColor(LINE_COLOR);
+ super.setLineWidth(LINE_WIDTH);
+ getFig().setLineColor(LINE_COLOR);
+ getFig().setLineWidth(LINE_WIDTH);
+
nameFig = new FigNameWithAbstract(element,
new Rectangle(X0, Y0 + 20, 90, 20),
renderSettings, false);
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=16489&r1=16488&r2=16489
==============================================================================
--- 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 20:51:45-0800
@@ -188,21 +188,24 @@
comp = findCompartmentFig(figs, umlObject);
acounter++;
+ // TODO: Some of these magic numbers probably assume a line
+ // width of 1. Replace with appropriate constants/variables.
+
// If we don't have a fig for this UML object, we'll need to add
// one. We set the bounds, but they will be reset later.
if (comp == null) {
comp = createFigText(umlObject, new Rectangle(
- xpos + 1,
- ypos + 1 + acounter
+ xpos + 1 /*?LINE_WIDTH?*/,
+ ypos + 1 /*?LINE_WIDTH?*/ + acounter
* ROWHEIGHT,
0,
- ROWHEIGHT - 2),
+ ROWHEIGHT - 2 /*? 2*LINE_WIDTH? */),
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 * ROWHEIGHT;
+ b.y = ypos + 1 /*?LINE_WIDTH?*/ + acounter * ROWHEIGHT;
// bounds not relevant here, but I am perfectionist...
comp.setBounds(b);
}
@@ -376,6 +379,8 @@
} else {
fw = fig.getMinimumSize().width;
}
+ // TODO: Some of these magic numbers probably assume a line
+ // width of 1. Replace with appropriate constants/variables.
fig.setBounds(x + 1, yy + 1, fw, fig.getMinimumSize().height);
if (newW < fw + 2) {
newW = fw + 2;
@@ -399,7 +404,8 @@
* @param len
*/
FigSeperator(int x, int y, int len) {
- super(x, y, (x + len) - 1, y);
+ super(x, y, (x + len) - 1, y, LINE_COLOR);
+ setLineWidth(LINE_WIDTH);
}
/*
@@ -427,7 +433,7 @@
setX1(x);
setY1(y);
setX2((x + w) - 1);
- setY2((y + h) - 1);
+ setY2(y);
}
/**
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=16489&r1=16488&r2=16489
==============================================================================
--- 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 20:51:45-0800
@@ -322,6 +322,7 @@
* rendering settings.
*/
private void constructFigs() {
+ // TODO: Why isn't this stuff managed by the nameFig itself?
nameFig.setLineWidth(LINE_WIDTH);
nameFig.setFilled(true);
nameFig.setText(placeString());
@@ -369,10 +370,20 @@
DiagramSettings renderSettings) {
super();
super.setOwner(element);
+
// TODO: We currently don't support per-fig settings for most stuff, so
// we can just use the defaults that we were given.
// settings = new DiagramSettings(renderSettings);
settings = renderSettings;
+
+ // Be careful here since subclasses could have overridden this with
+ // the assumption that it wouldn't be called before the constructors
+ // finished
+ super.setFillColor(FILL_COLOR);
+ super.setLineColor(LINE_COLOR);
+ super.setLineWidth(LINE_WIDTH);
+ super.setTextColor(TEXT_COLOR); // Some subclasses will try to use this
+
/*
* Notation settings are different since, we know that, at a minimum,
* the isShowPath() setting can change because with implement
@@ -387,7 +398,7 @@
nameFig = new FigNameWithAbstractAndBold(element,
new Rectangle(X0, Y0, WIDTH, 21), getSettings(), true);
stereotypeFig = new FigStereotypesGroup(element,
- new Rectangle(X0, Y0, WIDTH, 15), settings);
+ new Rectangle(X0, Y0, WIDTH, STEREOHEIGHT), settings);
constructFigs();
if (element == null) {
throw new IllegalArgumentException("An owner must be supplied");
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java?view=diff&pathrev=16489&r1=16488&r2=16489
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/ui/FigSingleLineText.java 2009-01-02 20:51:45-0800
@@ -87,10 +87,12 @@
}
private void initialize() {
+ setFillColor(FILL_COLOR); // in case someone turns it on
setFilled(false);
setTabAction(FigText.END_EDITING);
setReturnAction(FigText.END_EDITING);
setLineWidth(0);
+ setTextColor(TEXT_COLOR);
}
/**
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=16489&r1=16488&r2=16489
==============================================================================
--- 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 2009-01-02 20:51:45-0800
@@ -95,6 +95,11 @@
FigLine arms = new FigLine(X0, Y0 + 20, 30, 30, fg);
FigLine leftLeg = new FigLine(X0 + 10, Y0 + 30, 15, 55, fg);
FigLine rightLeg = new FigLine(X0 + 10, Y0 + 30, 25, 55, fg);
+ body.setLineWidth(LINE_WIDTH);
+ arms.setLineWidth(LINE_WIDTH);
+ leftLeg.setLineWidth(LINE_WIDTH);
+ rightLeg.setLineWidth(LINE_WIDTH);
+
getNameFig().setBounds(X0, Y0 + 45, 20, 20);
getNameFig().setTextFilled(false);
@@ -156,6 +161,12 @@
@Override
public void setLineWidth(int width) {
// Miss out the text fix, this should have no line
+ for (int i = HEAD_POSN; i < RIGHT_LEG_POSN; i++) {
+ Fig f = getFigAt(i);
+ if (f != null) {
+ f.setLineWidth(width);
+ }
+ }
getFigAt(HEAD_POSN).setLineWidth(width);
getFigAt(BODY_POSN).setLineWidth(width);
getFigAt(ARMS_POSN).setLineWidth(width);
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=1000350
To unsubscribe from this discussion, e-mail: [[email protected]].