svn commit: r14248 - trunk/src/app/src/org/argouml/uml/diagram: activity/ui collaboration/ui deployment/ui state/ui static_structure/ui ui use_case/ui
[email protected] 28 Mar 2008 06:36:07 -0000
Newsgroups
gmane.comp.lang.uml.argouml.cvs
Message-ID
<[email protected] >
Author: tfmorris
Date: 2008-03-27 23:36:07-0700
New Revision: 14248
Modified:
trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java
trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java
trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPool.java
trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java
trunk/src/app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java
trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java
trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigCompositeState.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigForkState.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJunctionState.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSimpleState.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigStubState.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java
trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java
trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java
trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java
trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
trunk/src/app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java
trunk/src/app/src/org/argouml/uml/diagram/ui/FigMessage.java
trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java
trunk/src/app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
Log:
Remove deprecated getFilled methods
Modified: trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigActionState.java 2008-03-27 23:36:07-0700
@@ -237,14 +237,6 @@
cover.setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return cover.isFilled();
- }
-
@Override
public boolean isFilled() {
return cover.isFilled();
Modified: trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java 2008-03-27 23:36:07-0700
@@ -342,14 +342,6 @@
cover.setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return cover.isFilled();
- }
-
@Override
public boolean isFilled() {
return cover.isFilled();
Modified: trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java&p2=trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPartition.java 2008-03-27 23:36:07-0700
@@ -161,14 +161,6 @@
getNameFig().setFilled(f);
super.setFilled(f);
}
-
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return getBigPort().isFilled();
- }
@Override
public boolean isFilled() {
Modified: trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPool.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPool.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPool.java&p2=trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPool.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPool.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigPool.java 2008-03-27 23:36:07-0700
@@ -110,14 +110,6 @@
getBigPort().setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return getBigPort().isFilled();
- }
-
@Override
public boolean isFilled() {
return getBigPort().isFilled();
Modified: trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java 2008-03-27 23:36:07-0700
@@ -221,14 +221,6 @@
cover.setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return cover.isFilled();
- }
-
@Override
public boolean isFilled() {
return cover.isFilled();
Modified: trunk/src/app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java&p2=trunk/src/app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java 2008-03-27 23:36:07-0700
@@ -260,13 +260,6 @@
cover.setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return cover.isFilled();
- }
@Override
public boolean isFilled() {
Modified: trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java&p2=trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/AbstractFigNode.java 2008-03-27 23:36:07-0700
@@ -111,11 +111,6 @@
cover.setLineWidth(w);
}
- @Override
- @Deprecated
- public boolean getFilled() {
- return cover.isFilled();
- }
@Override
public boolean isFilled() {
@@ -146,29 +141,28 @@
}
@Override
- protected void setStandardBounds(int x, int y, int w,
- int h) {
- if (getNameFig() == null) {
- return;
- }
- Rectangle oldBounds = getBounds();
- getBigPort().setBounds(x, y, w, h);
- cover.setBounds(x, y + DEPTH, w - DEPTH, h - DEPTH);
-
- Dimension stereoDim = getStereotypeFig().getMinimumSize();
- Dimension nameDim = getNameFig().getMinimumSize();
- getNameFig().setBounds(
- x + 4, y + DEPTH + stereoDim.height + 1,
- w - DEPTH - 8, nameDim.height);
- getStereotypeFig().setBounds(x + 1, y + DEPTH + 1,
- w - DEPTH - 2, stereoDim.height);
- _x = x;
- _y = y;
- _w = w;
- _h = h;
- firePropChange("bounds", oldBounds, getBounds());
- updateEdges();
- }
+ protected void setStandardBounds(int x, int y, int w, int h) {
+ if (getNameFig() == null) {
+ return;
+ }
+ Rectangle oldBounds = getBounds();
+ getBigPort().setBounds(x, y, w, h);
+ cover.setBounds(x, y + DEPTH, w - DEPTH, h - DEPTH);
+
+ Dimension stereoDim = getStereotypeFig().getMinimumSize();
+ Dimension nameDim = getNameFig().getMinimumSize();
+ getNameFig().setBounds(
+ x + 4, y + DEPTH + stereoDim.height + 1,
+ w - DEPTH - 8, nameDim.height);
+ getStereotypeFig().setBounds(x + 1, y + DEPTH + 1,
+ w - DEPTH - 2, stereoDim.height);
+ _x = x;
+ _y = y;
+ _w = w;
+ _h = h;
+ firePropChange("bounds", oldBounds, getBounds());
+ updateEdges();
+ }
@Override
protected void updateStereotypeText() {
Modified: trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java&p2=trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/deployment/ui/FigObject.java 2008-03-27 23:36:07-0700
@@ -140,13 +140,6 @@
cover.setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return cover.isFilled();
- }
@Override
public boolean isFilled() {
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigBranchState.java 2008-03-27 23:36:07-0700
@@ -156,10 +156,7 @@
// ignored - fixed rendering
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- public boolean getFilled() {
+ public boolean isFilled() {
return true;
}
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigCompositeState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigCompositeState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigCompositeState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigCompositeState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigCompositeState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigCompositeState.java 2008-03-27 23:36:07-0700
@@ -298,12 +298,6 @@
getBigPort().setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- public boolean getFilled() {
- return cover.isFilled();
- }
@Override
public boolean isFilled() {
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java 2008-03-27 23:36:07-0700
@@ -406,13 +406,6 @@
getBigPort().setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return cover.isFilled();
- }
@Override
public boolean isFilled() {
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigFinalState.java 2008-03-27 23:36:07-0700
@@ -170,11 +170,9 @@
// ignored - rendering is fixed
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
+
@Override
- public boolean getFilled() {
+ public boolean isFilled() {
return true;
}
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigForkState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigForkState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigForkState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigForkState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigForkState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigForkState.java 2008-03-27 23:36:07-0700
@@ -39,21 +39,13 @@
*/
public class FigForkState extends FigStateVertex {
- ////////////////////////////////////////////////////////////////
- // constants
-
private static final int X = 10;
private static final int Y = 10;
private static final int WIDTH = 80;
private static final int HEIGHT = 7;
- ////////////////////////////////////////////////////////////////
- // instance variables
-
private FigRect head;
- ////////////////////////////////////////////////////////////////
- // constructors
/**
* The main constructor.
@@ -83,6 +75,7 @@
/*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigForkState figClone = (FigForkState) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -91,12 +84,10 @@
return figClone;
}
- ////////////////////////////////////////////////////////////////
- // Fig accessors
-
/*
* @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
*/
+ @Override
protected void setStandardBounds(int x, int y, int w, int h) {
Rectangle oldBounds = getBounds();
if (w > h) {
@@ -115,6 +106,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
head.setLineColor(col);
}
@@ -122,6 +114,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
+ @Override
public Color getLineColor() {
return head.getLineColor();
}
@@ -129,6 +122,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
head.setFillColor(col);
}
@@ -136,6 +130,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return head.getFillColor();
}
@@ -143,19 +138,20 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
+ // noop - fixed rendering
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- public boolean getFilled() {
+ @Override
+ public boolean isFilled() {
return true;
}
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
head.setLineWidth(w);
}
@@ -163,16 +159,15 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return head.getLineWidth();
}
-
- ////////////////////////////////////////////////////////////////
- // Event handlers
-
+
/*
* @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
*/
+ @Override
public void mouseClicked(MouseEvent me) {
// ignored
}
@@ -182,4 +177,4 @@
*/
static final long serialVersionUID = 6702818473439087473L;
-} /* end class FigForkState */
+}
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java 2008-03-27 23:36:07-0700
@@ -42,25 +42,17 @@
*/
public abstract class FigHistoryState 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
-
/**
* The main label on this icon.
*/
private FigText h;
private FigCircle head;
- ////////////////////////////////////////////////////////////////
- // constructors
/**
* Main constructor.
@@ -115,6 +107,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
*/
+ @Override
public String placeString() {
return "H";
}
@@ -133,6 +126,7 @@
/*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigHistoryState figClone = (FigHistoryState) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -142,13 +136,12 @@
return figClone;
}
- ////////////////////////////////////////////////////////////////
- // Fig accessors
/**
* History states are fixed size.
* @return false
*/
+ @Override
public boolean isResizable() {
return false;
}
@@ -156,6 +149,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
head.setLineColor(col);
}
@@ -163,6 +157,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
+ @Override
public Color getLineColor() {
return head.getLineColor();
}
@@ -170,6 +165,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
head.setFillColor(col);
}
@@ -177,6 +173,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return head.getFillColor();
}
@@ -185,20 +182,20 @@
* Ignored - figure has fixed rendering
* @param f ignored
*/
+ @Override
public void setFilled(boolean f) {
// ignored
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- public boolean getFilled() {
+ @Override
+ public boolean isFilled() {
return true;
}
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
head.setLineWidth(w);
}
@@ -206,17 +203,17 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return head.getLineWidth();
}
- ////////////////////////////////////////////////////////////////
- // Event handlers
/*
* @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
*/
- public void mouseClicked(MouseEvent me) {
+ @Override
+ public void mouseClicked(MouseEvent me) {
// ignored
}
@@ -225,4 +222,4 @@
*/
static final long serialVersionUID = 6572261327347541373L;
-} /* end class FigHistoryState */
+}
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigInitialState.java 2008-03-27 23:36:07-0700
@@ -168,11 +168,9 @@
// ignored - rendering is fixed
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
+
@Override
- public boolean getFilled() {
+ public boolean isFilled() {
return true;
}
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJoinState.java 2008-03-27 23:36:07-0700
@@ -39,21 +39,13 @@
*/
public class FigJoinState extends FigStateVertex {
- ////////////////////////////////////////////////////////////////
- // constants
-
private static final int X = 10;
private static final int Y = 10;
private static final int WIDTH = 80;
private static final int HEIGHT = 7;
- ////////////////////////////////////////////////////////////////
- // instance variables
-
private FigRect head;
- ////////////////////////////////////////////////////////////////
- // constructors
/**
* The main constructor.
@@ -66,7 +58,7 @@
addFig(getBigPort());
addFig(head);
- setBlinkPorts(false); //make port invisble unless mouse enters
+ setBlinkPorts(false); //make port invisible unless mouse enters
}
/**
@@ -83,6 +75,7 @@
/*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigJoinState figClone = (FigJoinState) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -91,12 +84,10 @@
return figClone;
}
- ////////////////////////////////////////////////////////////////
- // Fig accessors
-
/*
* @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
*/
+ @Override
protected void setStandardBounds(int x, int y, int w, int h) {
Rectangle oldBounds = getBounds();
if (w > h) {
@@ -115,6 +106,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
head.setLineColor(col);
}
@@ -122,6 +114,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
+ @Override
public Color getLineColor() {
return head.getLineColor();
}
@@ -129,6 +122,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
head.setFillColor(col);
}
@@ -136,6 +130,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return head.getFillColor();
}
@@ -144,20 +139,21 @@
* Ignored - figure has fixed rendering
* @param f ignored
*/
+ @Override
public void setFilled(boolean f) {
// ignored
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- public boolean getFilled() {
+
+ @Override
+ public boolean isFilled() {
return true;
}
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
head.setLineWidth(w);
}
@@ -165,16 +161,15 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return head.getLineWidth();
}
- ////////////////////////////////////////////////////////////////
- // Event handlers
-
/*
* @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
*/
+ @Override
public void mouseClicked(MouseEvent me) {
// ignored
}
@@ -184,4 +179,4 @@
*/
static final long serialVersionUID = 2075803883819230367L;
-} /* end class FigJoinState */
+}
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJunctionState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJunctionState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJunctionState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJunctionState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJunctionState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigJunctionState.java 2008-03-27 23:36:07-0700
@@ -62,7 +62,7 @@
addFig(getBigPort());
addFig(head);
- setBlinkPorts(false); //make port invisble unless mouse enters
+ setBlinkPorts(false); //make port invisible unless mouse enters
}
/**
@@ -79,6 +79,7 @@
/*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigJunctionState figClone = (FigJunctionState) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -87,18 +88,20 @@
return figClone;
}
- ////////////////////////////////////////////////////////////////
- // Fig accesors
/**
* Initial states are fixed size.
* @return false
*/
- public boolean isResizable() { return false; }
+ @Override
+ public boolean isResizable() {
+ return false;
+ }
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
head.setLineColor(col);
}
@@ -106,6 +109,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
+ @Override
public Color getLineColor() {
return head.getLineColor();
}
@@ -113,6 +117,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
head.setFillColor(col);
}
@@ -120,6 +125,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return head.getFillColor();
}
@@ -127,19 +133,19 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- public boolean getFilled() {
+ @Override
+ public boolean isFilled() {
return true;
}
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
head.setLineWidth(w);
}
@@ -147,21 +153,21 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return head.getLineWidth();
}
- ////////////////////////////////////////////////////////////////
- // Event handlers
-
/*
* @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
*/
+ @Override
public void mouseClicked(MouseEvent me) { }
/*
* @see org.tigris.gef.presentation.Fig#getClosestPoint(java.awt.Point)
*/
+ @Override
public Point getClosestPoint(Point anotherPt) {
Rectangle r = getBounds();
int[] xs = {r.x + r.width / 2,
@@ -203,11 +209,9 @@
updateEdges();
firePropChange("bounds", oldBounds, getBounds());
}
-
-
-
+
/**
* The UID.
*/
private static final long serialVersionUID = -5845934640541945686L;
-} /* end class FigJunctionState */
+}
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSimpleState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSimpleState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSimpleState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSimpleState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSimpleState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSimpleState.java 2008-03-27 23:36:07-0700
@@ -191,13 +191,6 @@
getBigPort().setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return cover.isFilled();
- }
@Override
public boolean isFilled() {
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigStubState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigStubState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigStubState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigStubState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigStubState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigStubState.java 2008-03-27 23:36:07-0700
@@ -192,14 +192,6 @@
referenceFig.setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return referenceFig.isFilled();
- }
-
@Override
public boolean isFilled() {
return referenceFig.isFilled();
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSubmachineState.java 2008-03-27 23:36:07-0700
@@ -46,9 +46,6 @@
public class FigSubmachineState extends FigState {
- ////////////////////////////////////////////////////////////////
- // instance variables
-
private FigRect cover;
private FigLine divider;
private FigLine divider2;
@@ -57,8 +54,6 @@
private FigLine circle1tocircle2;
private FigText include;
- ////////////////////////////////////////////////////////////////
- // constructors
/**
* The constructor.
@@ -141,6 +136,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
*/
+ @Override
public void setOwner(Object node) {
super.setOwner(node);
updateInclude();
@@ -149,6 +145,7 @@
/*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigSubmachineState figClone = (FigSubmachineState) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -162,12 +159,10 @@
return figClone;
}
- ////////////////////////////////////////////////////////////////
- // accessors
-
/*
* @see org.tigris.gef.presentation.Fig#getMinimumSize()
*/
+ @Override
public Dimension getMinimumSize() {
Dimension nameDim = getNameFig().getMinimumSize();
Dimension internalDim = getInternal().getMinimumSize();
@@ -188,6 +183,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getUseTrapRect()
*/
+ @Override
public boolean getUseTrapRect() {
return true;
}
@@ -197,6 +193,7 @@
*
* @see org.tigris.gef.presentation.Fig#setBoundsImpl(int, int, int, int)
*/
+ @Override
protected void setStandardBounds(int x, int y, int w, int h) {
if (getNameFig() == null) {
return;
@@ -252,12 +249,10 @@
firePropChange("bounds", oldBounds, getBounds());
}
- ////////////////////////////////////////////////////////////////
- // fig accessors
-
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
cover.setLineColor(col);
divider.setLineColor(col);
@@ -270,6 +265,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
+ @Override
public Color getLineColor() {
return cover.getLineColor();
}
@@ -277,6 +273,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
cover.setFillColor(col);
}
@@ -284,6 +281,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return cover.getFillColor();
}
@@ -297,13 +295,6 @@
getBigPort().setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return cover.isFilled();
- }
@Override
public boolean isFilled() {
@@ -313,6 +304,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
cover.setLineWidth(w);
divider.setLineWidth(w);
@@ -322,6 +314,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return cover.getLineWidth();
}
@@ -364,6 +357,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateListeners(java.lang.Object)
*/
+ @Override
protected void updateListeners(Object oldOwner, Object newOwner) {
super.updateListeners(oldOwner, newOwner);
if (newOwner != null) {
@@ -427,4 +421,4 @@
return 0;
}
-} /* end class FigSubmachineState */
+}
Modified: trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java&p2=trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/state/ui/FigSynchState.java 2008-03-27 23:36:07-0700
@@ -46,22 +46,14 @@
*/
public class FigSynchState extends FigStateVertex {
- ////////////////////////////////////////////////////////////////
- // constants
-
private static final int X = 10;
private static final int Y = 10;
private static final int WIDTH = 25;
private static final int HEIGHT = 25;
- ////////////////////////////////////////////////////////////////
- // instance variables
-
private FigText bound;
private FigCircle head;
- ////////////////////////////////////////////////////////////////
- // constructors
/**
* The constructor.
@@ -125,6 +117,7 @@
/*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigSynchState figClone = (FigSynchState) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -134,14 +127,13 @@
return figClone;
}
- ////////////////////////////////////////////////////////////////
- // Fig accessors
/**
* Synch states are fixed size.
*
* @return false
*/
+ @Override
public boolean isResizable() {
return false;
}
@@ -149,6 +141,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
head.setLineColor(col);
}
@@ -156,6 +149,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
+ @Override
public Color getLineColor() {
return head.getLineColor();
}
@@ -163,6 +157,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
head.setFillColor(col);
}
@@ -170,6 +165,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return head.getFillColor();
}
@@ -177,20 +173,20 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
// ignored
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- public boolean getFilled() {
+ @Override
+ public boolean isFilled() {
return true;
}
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
head.setLineWidth(w);
}
@@ -198,16 +194,15 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return head.getLineWidth();
}
- ////////////////////////////////////////////////////////////////
- // event processing
-
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#modelChanged(java.beans.PropertyChangeEvent)
*/
+ @Override
protected void modelChanged(PropertyChangeEvent mee) {
super.modelChanged(mee);
if (mee.getPropertyName().equals("bound")) {
@@ -230,6 +225,7 @@
/*
* @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
*/
+ @Override
public void mouseClicked(MouseEvent me) {
}
@@ -243,4 +239,4 @@
bound.setFont(f);
}
-} /* end class FigSynchState */
+}
Modified: trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java&p2=trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java 2008-03-27 23:36:07-0700
@@ -90,9 +90,6 @@
private boolean readyToEdit = true;
- ////////////////////////////////////////////////////////////////
- // instance variables
-
// The figure that holds the text of the note.
private FigText bodyTextFig;
@@ -110,9 +107,6 @@
*/
private boolean newlyCreated;
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* The main constructor used for file loading.
*/
@@ -188,9 +182,11 @@
*
* @return The default text for this figure.
*/
+ @Override
public String placeString() {
String placeString = retrieveBody();
if (placeString == null) {
+ // TODO: I18N
placeString = "new note";
}
return placeString;
@@ -201,6 +197,7 @@
*
* @return The cloned figure.
*/
+ @Override
public Object clone() {
FigComment figClone = (FigComment) super.clone();
Iterator thisIter = this.getFigs().iterator();
@@ -246,6 +243,7 @@
*
* {@inheritDoc}
*/
+ @Override
public void mouseClicked(MouseEvent me) {
if (!readyToEdit) {
if (Model.getFacade().isAModelElement(getOwner())) {
@@ -275,6 +273,7 @@
/*
* @see java.beans.VetoableChangeListener#vetoableChange(java.beans.PropertyChangeEvent)
*/
+ @Override
public void vetoableChange(PropertyChangeEvent pce) {
Object src = pce.getSource();
if (src == getOwner()) {
@@ -290,6 +289,7 @@
/*
* @see org.argouml.kernel.DelayedVChangeListener#delayedVetoableChange(java.beans.PropertyChangeEvent)
*/
+ @Override
public void delayedVetoableChange(PropertyChangeEvent pce) {
// update any text, colors, fonts, etc.
renderingChanged();
@@ -300,6 +300,7 @@
/*
* @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent pve) {
Object src = pve.getSource();
String pName = pve.getPropertyName();
@@ -322,6 +323,7 @@
/*
* @see java.awt.event.KeyListener#keyPressed(java.awt.event.KeyEvent)
*/
+ @Override
public void keyPressed(KeyEvent ke) {
// Not used, do nothing.
}
@@ -329,6 +331,7 @@
/*
* @see java.awt.event.KeyListener#keyReleased(java.awt.event.KeyEvent)
*/
+ @Override
public void keyReleased(KeyEvent ke) {
// Not used, do nothing.
}
@@ -336,6 +339,7 @@
/*
* @see java.awt.event.KeyListener#keyTyped(java.awt.event.KeyEvent)
*/
+ @Override
public void keyTyped(KeyEvent ke) {
if (Character.isISOControl(ke.getKeyChar())) {
return;
@@ -373,6 +377,7 @@
/*
* @see org.tigris.gef.presentation.Fig#makeSelection()
*/
+ @Override
public Selection makeSelection() {
return new SelectionComment(this);
}
@@ -380,6 +385,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
// The text element has no border, so the line color doesn't matter.
outlineFig.setLineColor(col);
@@ -389,6 +395,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
+ @Override
public Color getLineColor() {
return outlineFig.getLineColor();
}
@@ -396,6 +403,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
outlineFig.setFillColor(col);
urCorner.setFillColor(col);
@@ -404,6 +412,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return outlineFig.getFillColor();
}
@@ -418,14 +427,6 @@
urCorner.setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return outlineFig.isFilled();
- }
-
@Override
public boolean isFilled() {
return outlineFig.isFilled();
@@ -434,6 +435,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
bodyTextFig.setLineWidth(0); // Make a seamless integration of the text
// in the note figure.
@@ -444,6 +446,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return outlineFig.getLineWidth();
}
@@ -454,6 +457,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEdited(org.tigris.gef.presentation.FigText)
*/
+ @Override
protected void textEdited(FigText ft) {
if (ft == bodyTextFig) {
storeBody(ft.getText());
@@ -463,6 +467,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEditStarted(org.tigris.gef.presentation.FigText)
*/
+ @Override
protected void textEditStarted(FigText ft) {
showHelp("parsing.help.comment");
}
@@ -470,6 +475,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setEnclosingFig(org.tigris.gef.presentation.Fig)
*/
+ @Override
public void setEnclosingFig(Fig encloser) {
super.setEnclosingFig(encloser);
}
@@ -502,6 +508,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getUseTrapRect()
*/
+ @Override
public boolean getUseTrapRect() {
return true;
}
@@ -510,6 +517,7 @@
* Always returns null as the FigComment does not display its name.
* @return null
*/
+ @Override
public Rectangle getNameBounds() {
return null;
}
@@ -519,6 +527,7 @@
*
* @return The minimum size for the note figure.
*/
+ @Override
public Dimension getMinimumSize() {
// Get the size of the text field.
@@ -544,6 +553,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
*/
+ @Override
protected void setStandardBounds(int px, int py, int w, int h) {
if (bodyTextFig == null) {
return;
@@ -588,6 +598,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateBounds()
*/
+ @Override
protected void updateBounds() {
Rectangle bbox = getBounds();
Dimension minSize = getMinimumSize();
@@ -602,6 +613,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#modelChanged(java.beans.PropertyChangeEvent)
*/
+ @Override
protected final void modelChanged(PropertyChangeEvent mee) {
super.modelChanged(mee);
@@ -641,6 +653,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateStereotypeText()
*/
+ @Override
protected void updateStereotypeText() {
Object me = getOwner();
@@ -694,7 +707,8 @@
/*
* @see org.tigris.gef.presentation.Fig#getClosestPoint(java.awt.Point)
*/
- public Point getClosestPoint(Point anotherPt) {
+ @Override
+ public Point getClosestPoint(Point anotherPt) {
Rectangle r = getBounds();
int[] xs = {
r.x, r.x + r.width - dogear, r.x + r.width,
@@ -717,4 +731,4 @@
* The UID.
*/
private static final long serialVersionUID = 7242542877839921267L;
-} /* end class FigComment */
+}
Modified: trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java&p2=trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigEdgeNote.java 2008-03-27 23:36:07-0700
@@ -238,9 +238,10 @@
*/
public void postLoad() {
super.postLoad();
- CommentEdge o = (CommentEdge) getOwner();
- o.setDestination(getDestFigNode().getOwner());
- o.setSource(getSourceFigNode().getOwner());
+ // TODO: Why is a Fig modifying the underlying model?!?!
+// CommentEdge o = (CommentEdge) getOwner();
+// o.setDestination(getDestFigNode().getOwner());
+// o.setSource(getSourceFigNode().getOwner());
}
/**
Modified: trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&p2=trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/static_structure/ui/FigPackage.java 2008-03-27 23:36:07-0700
@@ -274,14 +274,7 @@
body.setFilled(f);
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- @Override
- public boolean getFilled() {
- return body.isFilled();
- }
-
+
@Override
public boolean isFilled() {
return body.isFilled();
Modified: trunk/src/app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java&p2=trunk/src/app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/ui/CompartmentFigText.java 2008-03-27 23:36:07-0700
@@ -191,11 +191,10 @@
}
/**
- * Override for correct graphical behaviour.<p>
- *
* @return Current fill status—always <code>true</code>.
*/
- public boolean getFilled() {
+ @Override
+ public boolean isFilled() {
return false;
}
Modified: trunk/src/app/src/org/argouml/uml/diagram/ui/FigMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/ui/FigMessage.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/ui/FigMessage.java&p2=trunk/src/app/src/org/argouml/uml/diagram/ui/FigMessage.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/ui/FigMessage.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/ui/FigMessage.java 2008-03-27 23:36:07-0700
@@ -185,11 +185,9 @@
public void setFilled(boolean f) {
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
+
@Override
- public boolean getFilled() {
+ public boolean isFilled() {
return true;
}
Modified: trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java&p2=trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/ui/FigNodeAssociation.java 2008-03-27 23:36:07-0700
@@ -217,10 +217,7 @@
public void setFilled(boolean f) {
}
- /*
- * @see org.tigris.gef.presentation.Fig#getFilled()
- */
- public boolean getFilled() {
+ public boolean isFilled() {
return true;
}
Modified: trunk/src/app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java?view=diff&rev=14248&p1=trunk/src/app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java&p2=trunk/src/app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java&r1=14247&r2=14248
==============================================================================
--- trunk/src/app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java (original)
+++ trunk/src/app/src/org/argouml/uml/diagram/use_case/ui/FigUseCase.java 2008-03-27 23:36:07-0700
@@ -808,11 +808,6 @@
* <code>false</code> if not.
*/
@Override
- public boolean getFilled() {
- return cover.isFilled();
- }
-
- @Override
public boolean isFilled() {
return cover.isFilled();
}