Author: tfmorris
Date: 2007-11-09 16:25:52-0800
New Revision: 13744
Modified:
trunk/src_new/org/argouml/uml/diagram/activity/ui/FigCallState.java
trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
trunk/src_new/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java
trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java
trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java
trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java
trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java
trunk/src_new/org/argouml/uml/diagram/ui/FigMessage.java
trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java
Log:
Remove placeString() implementations which return same result as super implementation.
Add some Java 5 annotations.
Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/FigCallState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/FigCallState.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigCallState.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigCallState.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/FigCallState.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/FigCallState.java 2007-11-09 16:25:52-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -44,9 +44,6 @@
*/
public class FigCallState extends FigActionState {
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* Main Constructor FigCallState (called from file loading)
*/
@@ -68,20 +65,15 @@
/*
* @see org.argouml.uml.diagram.activity.ui.FigActionState#getNotationProviderType()
*/
+ @Override
protected int getNotationProviderType() {
return NotationProviderFactory2.TYPE_CALLSTATE;
}
/*
- * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
- */
- public String placeString() {
- return "new CallState";
- }
-
- /*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigCallState figClone = (FigCallState) super.clone();
return figClone;
@@ -90,8 +82,9 @@
/*
* @see org.argouml.uml.diagram.state.ui.FigStateVertex#makeSelection()
*/
+ @Override
public Selection makeSelection() {
return new SelectionCallState(this);
}
-} /* end class FigCallState */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java 2007-11-09 16:25:52-0800
@@ -88,8 +88,6 @@
private FigRect cover;
private FigText state; // the state name
- ////////////////////////////////////////////////////////////////
- // constructors
/**
* Main Constructor FigObjectFlowState (called from file loading).
@@ -193,13 +191,6 @@
}
}
- /*
- * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
- */
- @Override
- public String placeString() {
- return "new ObjectFlowState";
- }
/*
* @see java.lang.Object#clone()
@@ -311,9 +302,6 @@
}
}
- ////////////////////////////////////////////////////////////////
- // Fig accessors
-
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
@@ -439,4 +427,4 @@
return new SelectionActionState(this);
}
-} /* end class FigObjectFlowState */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/FigSubactivityState.java 2007-11-09 16:25:52-0800
@@ -1,5 +1,5 @@
// $Id$
-// Copyright (c) 1996-2006 The Regents of the University of California. All
+// Copyright (c) 1996-2007 The Regents of the University of California. All
// Rights Reserved. Permission to use, copy, modify, and distribute this
// software and its documentation without fee, and without a written
// agreement is hereby granted, provided that the above copyright notice
@@ -46,8 +46,6 @@
* @author MVW
*/
public class FigSubactivityState extends FigStateVertex {
- ////////////////////////////////////////////////////////////////
- // constants
private static final int PADDING = 8;
@@ -61,8 +59,6 @@
private static final int SW = 9;
private static final int SH = 5;
- ////////////////////////////////////////////////////////////////
- // instance variables
private FigRRect cover;
//private FigGroup icon;
@@ -71,9 +67,6 @@
private FigRRect s2;
private FigLine s3;
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* Main Constructor (called from file loading).
*/
@@ -139,15 +132,9 @@
}
/*
- * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
- */
- public String placeString() {
- return "new SubactivityState";
- }
-
- /*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigSubactivityState figClone = (FigSubactivityState) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -157,12 +144,11 @@
return figClone;
}
- ////////////////////////////////////////////////////////////////
- // Fig accessors
/*
* @see org.tigris.gef.presentation.Fig#getMinimumSize()
*/
+ @Override
public Dimension getMinimumSize() {
Dimension nameDim = getNameFig().getMinimumSize();
int w = nameDim.width + PADDING * 2;
@@ -175,6 +161,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;
@@ -200,6 +187,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
cover.setLineColor(col);
}
@@ -228,6 +216,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
cover.setFilled(f);
}
@@ -248,6 +237,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
cover.setLineWidth(w);
}
@@ -255,6 +245,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return cover.getLineWidth();
}
@@ -262,6 +253,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#modelChanged(java.beans.PropertyChangeEvent)
*/
+ @Override
protected void modelChanged(PropertyChangeEvent mee) {
// Let our superclass sort itself out first
super.modelChanged(mee);
@@ -275,6 +267,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateListeners(java.lang.Object)
*/
+ @Override
protected void updateListeners(Object oldOwner, Object newOwner) {
if (oldOwner != null) {
removeAllElementListeners();
@@ -293,6 +286,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateNameText()
*/
+ @Override
protected void updateNameText() {
String s = "";
if (getOwner() != null) {
@@ -307,4 +301,4 @@
getNameFig().setText(s);
}
-} /* end class FigSubactivityState */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java&p2=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/collaboration/ui/FigClassifierRole.java 2007-11-09 16:25:52-0800
@@ -148,6 +148,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#initNotationProviders(java.lang.Object)
*/
+ @Override
protected void initNotationProviders(Object own) {
super.initNotationProviders(own);
if (Model.getFacade().isAClassifierRole(own)) {
@@ -157,17 +158,6 @@
}
}
- /**
- * Return the default name to use for this classifier role.<p>
- *
- * Seems to be immediately overwritten by the empty string, but may be
- * useful in defining the default name size?<p>
- *
- * @return The string to use ("new Classifier Role" in this case).
- */
- public String placeString() {
- return "new Classifier Role";
- }
/**
* Version of the clone to ensure all sub-figs are copied.<p>
@@ -177,7 +167,7 @@
*
* @return A new copy of the the current fig.
*/
-
+ @Override
public Object clone() {
FigClassifierRole figClone = (FigClassifierRole) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -199,6 +189,7 @@
* Similarly if there is text, we must make sure it is marked
* displayed.<p>
*/
+ @Override
protected void updateStereotypeText() {
Rectangle rect = getBounds();
@@ -460,4 +451,4 @@
return new SelectionClassifierRole(this);
}
-} /* end class FigClassifierRole */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponent.java 2007-11-09 16:25:52-0800
@@ -103,16 +103,11 @@
updateBounds();
}
- /*
- * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
- */
- public String placeString() {
- return "new Component";
- }
/*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigComponent figClone = (FigComponent) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -129,6 +124,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#modelChanged(java.beans.PropertyChangeEvent)
*/
+ @Override
protected void modelChanged(PropertyChangeEvent mee) {
super.modelChanged(mee);
if (mee instanceof AssociationChangeEvent
@@ -142,6 +138,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateListeners(java.lang.Object)
*/
+ @Override
protected void updateListeners(Object oldOwner, Object newOwner) {
if (oldOwner != null) {
removeAllElementListeners();
@@ -166,6 +163,7 @@
*
* @see org.tigris.gef.ui.PopupGenerator#getPopUpActions(java.awt.event.MouseEvent)
*/
+ @Override
public Vector getPopUpActions(MouseEvent me) {
Vector popUpActions = super.getPopUpActions(me);
// Modifiers ...
@@ -185,6 +183,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color c) {
cover.setLineColor(c);
getStereotypeFig().setFilled(false);
@@ -198,6 +197,7 @@
/*
* @see org.tigris.gef.presentation.Fig#makeSelection()
*/
+ @Override
public Selection makeSelection() {
return new SelectionComponent(this);
}
@@ -205,6 +205,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getMinimumSize()
*/
+ @Override
public Dimension getMinimumSize() {
Dimension stereoDim = getStereotypeFig().getMinimumSize();
Dimension nameDim = getNameFig().getMinimumSize();
@@ -218,6 +219,7 @@
/*
* @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();
@@ -253,6 +255,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setEnclosingFig(org.tigris.gef.presentation.Fig)
*/
+ @Override
public void setEnclosingFig(Fig encloser) {
Object comp = getOwner();
@@ -296,7 +299,10 @@
/**
* TODO: This is not used anywhere. Can we remove it?
* @param figures ?
+ * @deprecated for 0.25.4 by tfmorris. Unused in ArgoUML. Not clear it was ever
+ * intended to be part of the public API.
*/
+ @Deprecated
public void setNode(Vector figures) {
int size = figures.size();
if (figures != null && (size > 0)) {
@@ -313,6 +319,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getUseTrapRect()
*/
+ @Override
public boolean getUseTrapRect() {
return true;
}
@@ -320,6 +327,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateStereotypeText()
*/
+ @Override
protected void updateStereotypeText() {
getStereotypeFig().setOwner(getOwner());
}
@@ -327,6 +335,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEditStarted(org.tigris.gef.presentation.FigText)
*/
+ @Override
protected void textEditStarted(FigText ft) {
if (ft == getNameFig()) {
showHelp("parsing.help.fig-component");
@@ -339,21 +348,19 @@
* Get the rectangle on whose corners the dragging handles are to
* be drawn. Used by Selection Resize.
*/
+ @Override
public Rectangle getHandleBox() {
-
Rectangle r = getBounds();
return new Rectangle(r.x + BX, r.y, r.width - BX,
r.height);
-
}
/*
* @see org.tigris.gef.presentation.Fig#setHandleBox(int, int, int, int)
*/
+ @Override
public void setHandleBox(int x, int y, int w, int h) {
-
setBounds(x - BX, y, w + BX, h);
-
}
/**
@@ -361,4 +368,4 @@
*/
static final long serialVersionUID = 1647392857462847651L;
-} /* end class FigComponent */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigComponentInstance.java 2007-11-09 16:25:52-0800
@@ -113,6 +113,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#initNotationProviders(java.lang.Object)
*/
+ @Override
protected void initNotationProviders(Object own) {
super.initNotationProviders(own);
if (Model.getFacade().isAComponentInstance(own)) {
@@ -122,16 +123,11 @@
}
}
- /*
- * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
- */
- public String placeString() {
- return "new ComponentInstance";
- }
/*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigComponentInstance figClone = (FigComponentInstance) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -148,6 +144,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#modelChanged(java.beans.PropertyChangeEvent)
*/
+ @Override
protected void modelChanged(PropertyChangeEvent mee) {
super.modelChanged(mee);
if (mee instanceof AssociationChangeEvent
@@ -161,6 +158,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateListeners(java.lang.Object, java.lang.Object)
*/
+ @Override
protected void updateListeners(Object oldOwner, Object newOwner) {
if (oldOwner != null) {
removeAllElementListeners();
@@ -186,6 +184,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color c) {
cover.setLineColor(c);
getStereotypeFig().setFilled(false);
@@ -199,6 +198,7 @@
/*
* @see org.tigris.gef.presentation.Fig#makeSelection()
*/
+ @Override
public Selection makeSelection() {
return new SelectionComponentInstance(this);
}
@@ -206,6 +206,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getMinimumSize()
*/
+ @Override
public Dimension getMinimumSize() {
Dimension stereoDim = getStereotypeFig().getMinimumSize();
Dimension nameDim = getNameFig().getMinimumSize();
@@ -219,6 +220,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
*/
+ @Override
protected void setStandardBounds(int x, int y, int w, int h) {
if (getNameFig() == null) {
return;
@@ -257,6 +259,7 @@
/*
* @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
*/
+ @Override
public void mouseClicked(MouseEvent me) {
super.mouseClicked(me);
setLineColor(Color.black);
@@ -265,6 +268,7 @@
/*
* @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
*/
+ @Override
public void mousePressed(MouseEvent me) {
super.mousePressed(me);
Editor ce = Globals.curEditor();
@@ -277,6 +281,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setEnclosingFig(org.tigris.gef.presentation.Fig)
*/
+ @Override
public void setEnclosingFig(Fig encloser) {
if (getOwner() != null) {
@@ -335,6 +340,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getUseTrapRect()
*/
+ @Override
public boolean getUseTrapRect() {
return true;
}
@@ -342,6 +348,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEdited(org.tigris.gef.presentation.FigText)
*/
+ @Override
protected void textEdited(FigText ft) throws PropertyVetoException {
if (ft == getNameFig()) {
notationProvider.parse(getOwner(), ft.getText());
@@ -352,6 +359,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEditStarted(org.tigris.gef.presentation.FigText)
*/
+ @Override
protected void textEditStarted(FigText ft) {
if (ft == getNameFig()) {
showHelp(notationProvider.getParsingHelp());
@@ -361,6 +369,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateStereotypeText()
*/
+ @Override
protected void updateStereotypeText() {
getStereotypeFig().setOwner(getOwner());
}
@@ -368,6 +377,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateNameText()
*/
+ @Override
protected void updateNameText() {
if (isReadyToEdit()) {
getNameFig().setText(notationProvider.toString(getOwner(), null));
@@ -378,25 +388,20 @@
/*
* @see org.tigris.gef.presentation.Fig#getHandleBox()
- *
- * Get the rectangle on whose corners the dragging handles are to
- * be drawn. Used by Selection Resize.
*/
+ @Override
public Rectangle getHandleBox() {
-
Rectangle r = getBounds();
return new Rectangle(r.x + BX, r.y, r.width - BX,
r.height);
-
}
/*
* @see org.tigris.gef.presentation.Fig#setHandleBox(int, int, int, int)
*/
+ @Override
public void setHandleBox(int x, int y, int w, int h) {
-
setBounds(x - BX, y, w + BX, h);
-
}
/**
@@ -404,4 +409,4 @@
*/
static final long serialVersionUID = 1647392857462847651L;
-} /* end class FigComponentInstance */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java 2007-11-09 16:25:52-0800
@@ -82,18 +82,15 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#getNotationProviderType()
*/
+ @Override
protected int getNotationProviderType() {
return NotationProviderFactory2.TYPE_OBJECT;
}
/*
- * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
- */
- public String placeString() { return "new Object"; }
-
- /*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigObject figClone = (FigObject) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -106,6 +103,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
cover.setLineColor(col);
}
@@ -113,6 +111,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
+ @Override
public Color getLineColor() {
return cover.getLineColor();
}
@@ -120,6 +119,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
cover.setFillColor(col);
}
@@ -127,6 +127,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return cover.getFillColor();
}
@@ -134,6 +135,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
cover.setFilled(f);
}
@@ -141,6 +143,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
return cover.isFilled();
}
@@ -153,6 +156,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
cover.setLineWidth(w);
}
@@ -160,6 +164,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return cover.getLineWidth();
}
@@ -167,6 +172,7 @@
/*
* @see org.tigris.gef.presentation.Fig#makeSelection()
*/
+ @Override
public Selection makeSelection() {
return new SelectionObject(this);
}
@@ -174,6 +180,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getMinimumSize()
*/
+ @Override
public Dimension getMinimumSize() {
Dimension nameMin = getNameFig().getMinimumSize();
@@ -189,6 +196,7 @@
*
* @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
*/
+ @Override
protected void setStandardBounds(int x, int y, int w, int h) {
if (getNameFig() == null) {
return;
@@ -213,6 +221,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setEnclosingFig(org.tigris.gef.presentation.Fig)
*/
+ @Override
public void setEnclosingFig(Fig encloser) {
assert Model.getFacade().isAObject(getOwner());
@@ -245,4 +254,4 @@
}
}
-} /* end class FigObject */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigModel.java 2007-11-09 16:25:52-0800
@@ -22,7 +22,6 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
package org.argouml.uml.diagram.static_structure.ui;
import java.awt.Color;
@@ -85,12 +84,5 @@
super.setStandardBounds(x, y, w, h);
}
- /*
- * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
- */
- @Override
- public String placeString() {
- return "new Model";
- }
}
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java 2007-11-09 16:25:52-0800
@@ -81,9 +81,6 @@
*/
private static final Logger LOG = Logger.getLogger(FigPackage.class);
- ////////////////////////////////////////////////////////////////
- // constants
-
private static final int MIN_HEIGHT = 21;
private int width = 140;
@@ -97,9 +94,6 @@
*/
private int tabHeight = 20;
- ////////////////////////////////////////////////////////////////
- // instance variables
-
private FigText body;
/**
@@ -209,13 +203,6 @@
}
}
- /*
- * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
- */
- @Override
- public String placeString() {
- return "new Package";
- }
/*
* @see java.lang.Object#clone()
@@ -236,8 +223,6 @@
return figClone;
}
- ////////////////////////////////////////////////////////////////
- // Fig accessors
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
@@ -370,8 +355,6 @@
+ "visibilityVisible=" + isVisibilityVisible();
}
- ////////////////////////////////////////////////////////////////
- // accessor methods
/*
* @see org.tigris.gef.presentation.Fig#getUseTrapRect()
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigSubsystem.java 2007-11-09 16:25:52-0800
@@ -22,7 +22,6 @@
// CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE, SUPPORT,
// UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
-
package org.argouml.uml.diagram.static_structure.ui;
import java.awt.Color;
@@ -86,12 +85,5 @@
super.setStandardBounds(x, y, w, h);
}
- /*
- * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
- */
- @Override
- public String placeString() {
- return "new Subsystem";
- }
}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigMessage.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigMessage.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigMessage.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigMessage.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigMessage.java 2007-11-09 16:25:52-0800
@@ -133,15 +133,6 @@
}
}
- /*
- * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
- */
- @Override
- public String placeString() {
- // TODO: I18N
- return "new Message";
- }
-
@Override
public Object clone() {
@@ -432,7 +423,7 @@
// thing should be removed? - tfm
// super.updateListeners(newOwner);
- // Do nothing until code is reviewed
+ // TODO: Do nothing until code is reviewed
if (true) {
return;
}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2007-11-09 16:25:52-0800
@@ -434,6 +434,7 @@
String placeString = Model.getFacade().getName(getOwner());
if (placeString == null) {
placeString =
+ // TODO: I18N
"new " + Model.getFacade().getUMLClassName(getOwner());
}
return placeString;
@@ -441,9 +442,6 @@
return "";
}
- ////////////////////////////////////////////////////////////////
- // accessors
-
/**
* @param id UID
*/
Modified: trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java?view=diff&rev=13744&p1=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java&r1=13743&r2=13744
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigActor.java 2007-11-09 16:25:52-0800
@@ -62,7 +62,7 @@
protected static final int MIN_VERT_PADDING = 4;
//These are the positions of child figs inside this fig
- //They mst be added in the constructor in this order.
+ //They must be added in the constructor in this order.
//For now the name must not be last as this would force
//zero width lines (until GEF is fixed)
private static final int HEAD_POSN = 2;
@@ -121,6 +121,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int width) {
// Miss out the text fix, this should have no line
getFigAt(HEAD_POSN).setLineWidth(width);
@@ -133,20 +134,12 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean filled) {
// Only the head should be filled (not the text)
getFigAt(HEAD_POSN).setFilled(filled);
}
- /*
- * @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
- */
- public String placeString() {
- return "new Actor";
- }
-
- ////////////////////////////////////////////////////////////////
- // Fig accessors
/*
* @see org.tigris.gef.presentation.Fig#makeSelection()
@@ -268,9 +261,9 @@
* @see org.tigris.gef.presentation.Fig#getGravityPoints()
*/
@Override
- public List getGravityPoints() {
+ public List<Point> getGravityPoints() {
final int maxPoints = 20;
- List ret = new ArrayList();
+ List<Point> ret = new ArrayList<Point>();
int cx = getFigAt(HEAD_POSN).getCenter().x;
int cy = getFigAt(HEAD_POSN).getCenter().y;
int radiusx = Math.round(getFigAt(HEAD_POSN).getWidth() / 2) + 1;
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.