svn commit: r16254 - trunk/src/argouml-app/src/org/argouml/uml/diagram: activity/ui sequence/ui state/ui
Tom Morris <[email protected]>
| Newsgroups | gmane.comp.lang.uml.argouml.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: tfmorris
Date: 2008-12-05 08:15:03-0800
New Revision: 16254
Modified:
trunk/src/argouml-app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.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/FigState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigTransition.java
Log:
Minor changes for font updates
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=16254&r1=16253&r2=16254
==============================================================================
--- 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-05 08:15:03-0800
@@ -276,6 +276,7 @@
*/
@Override
public void renderingChanged() {
+ super.renderingChanged();
updateClassifierText();
updateStateText();
updateBounds();
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java?view=diff&pathrev=16254&r1=16253&r2=16254
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java 2008-12-05 08:15:03-0800
@@ -954,9 +954,9 @@
*/
@Override
public void renderingChanged() {
+ super.renderingChanged();
updateBaseNames();
updateClassifierRoleName();
- super.renderingChanged();
}
/**
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=16254&r1=16253&r2=16254
==============================================================================
--- 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-05 08:15:03-0800
@@ -25,6 +25,7 @@
package org.argouml.uml.diagram.state.ui;
import java.awt.Color;
+import java.awt.Font;
import java.awt.Rectangle;
import java.awt.event.MouseEvent;
import java.util.Iterator;
@@ -62,6 +63,7 @@
setBigPort(new FigCircle(X, Y, WIDTH, HEIGHT, Color.cyan, Color.cyan));
head = new FigCircle(X, Y, WIDTH, HEIGHT, Color.black, Color.white);
h = new FigText(X, Y, WIDTH - 10, HEIGHT - 10);
+ h.setFont(getSettings().getFont(Font.PLAIN));
h.setText(getH());
h.setTextColor(Color.black);
h.setFilled(false);
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=16254&r1=16253&r2=16254
==============================================================================
--- 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 2008-12-05 08:15:03-0800
@@ -84,6 +84,7 @@
getInitialY() + 2 + 21 + 4,
getInitialWidth() - 4,
getInitialHeight() - (getInitialY() + 2 + 21 + 4));
+ internal.setFont(getSettings().getFont(Font.PLAIN));
internal.setTextColor(Color.black);
internal.setLineWidth(0);
internal.setFilled(false);
@@ -155,6 +156,7 @@
*/
@Override
public void renderingChanged() {
+ super.renderingChanged();
Object state = getOwner();
if (state == null) {
return;
@@ -163,7 +165,6 @@
internal.setText(notationProviderBody.toString(getOwner(),
getNotationArguments()));
}
- super.renderingChanged();
calcBounds();
setBounds(getBounds());
}
@@ -237,7 +238,7 @@
@Override
protected void updateFont() {
super.updateFont();
- Font f = getProject().getProjectSettings().getFont(Font.PLAIN);
+ Font f = getSettings().getFont(Font.PLAIN);
internal.setFont(f);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java?view=diff&pathrev=16254&r1=16253&r2=16254
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigStubState.java 2008-12-05 08:15:03-0800
@@ -89,6 +89,7 @@
Color.black);
referenceFig = new FigText(0, 0, width, height, true);
+ referenceFig.setFont(getSettings().getFont(Font.PLAIN));
referenceFig.setTextColor(Color.black);
referenceFig.setReturnAction(FigText.END_EDITING);
referenceFig.setTabAction(FigText.END_EDITING);
@@ -333,8 +334,8 @@
*/
@Override
public void renderingChanged() {
- updateReferenceText();
super.renderingChanged();
+ updateReferenceText();
}
/**
@@ -457,7 +458,7 @@
@Override
protected void updateFont() {
super.updateFont();
- Font f = getProject().getProjectSettings().getFont(Font.PLAIN);
+ Font f = getSettings().getFont(Font.PLAIN);
referenceFig.setFont(f);
}
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=16254&r1=16253&r2=16254
==============================================================================
--- 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-05 08:15:03-0800
@@ -235,7 +235,7 @@
@Override
protected void updateFont() {
super.updateFont();
- Font f = getProject().getProjectSettings().getFont(Font.PLAIN);
+ Font f = getSettings().getFont(Font.PLAIN);
bound.setFont(f);
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigTransition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigTransition.java?view=diff&pathrev=16254&r1=16253&r2=16254
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigTransition.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigTransition.java 2008-12-05 08:15:03-0800
@@ -124,8 +124,8 @@
@Override
public void renderingChanged() {
- updateDashed();
super.renderingChanged();
+ updateDashed();
}
/**
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=980164
To unsubscribe from this discussion, e-mail: [[email protected]].