svn commit: r13733 - trunk/src_new/org/argouml: ui uml/diagram/activity/ui uml/diagram/collaboration/ui uml/diagram/deployment/ui uml/diagram/sequence/ui uml/diagram/state/ui uml/diagram/static_structure/ui uml/diagram/use_case/ui
[email protected] 6 Nov 2007 18:40:20 -0000
Newsgroups
gmane.comp.lang.uml.argouml.cvs
Message-ID
<[email protected] >
Author: tfmorris
Date: 2007-11-06 10:40:20-0800
New Revision: 13733
Modified:
trunk/src_new/org/argouml/ui/StylePanelFig.java
trunk/src_new/org/argouml/ui/StylePanelFigText.java
trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java
trunk/src_new/org/argouml/uml/diagram/activity/ui/FigObjectFlowState.java
trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java
trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPool.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/FigMNode.java
trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java
trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigObject.java
trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java
trunk/src_new/org/argouml/uml/diagram/state/ui/FigCompositeState.java
trunk/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java
trunk/src_new/org/argouml/uml/diagram/state/ui/FigSimpleState.java
trunk/src_new/org/argouml/uml/diagram/state/ui/FigStubState.java
trunk/src_new/org/argouml/uml/diagram/state/ui/FigSubmachineState.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigComment.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigPackage.java
trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
Log:
Remove uses of deprecated method Fig.getFilled()
Modified: trunk/src_new/org/argouml/ui/StylePanelFig.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/StylePanelFig.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/ui/StylePanelFig.java&p2=trunk/src_new/org/argouml/ui/StylePanelFig.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/ui/StylePanelFig.java (original)
+++ trunk/src_new/org/argouml/ui/StylePanelFig.java 2007-11-06 10:40:20-0800
@@ -247,7 +247,7 @@
// Change the fill colour
- if (target.getFilled()) {
+ if (target.isFilled()) {
Color c = target.getFillColor();
fillField.setSelectedItem(c);
if (c != null && !fillField.getSelectedItem().equals(c)) {
Modified: trunk/src_new/org/argouml/ui/StylePanelFigText.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/StylePanelFigText.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/ui/StylePanelFigText.java&p2=trunk/src_new/org/argouml/ui/StylePanelFigText.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/ui/StylePanelFigText.java (original)
+++ trunk/src_new/org/argouml/ui/StylePanelFigText.java 2007-11-06 10:40:20-0800
@@ -177,7 +177,7 @@
textColorField.setSelectedItem(c);
}
- if (ft.getFilled()) {
+ if (ft.isFilled()) {
Color fc = ft.getFillColor();
getFillField().setSelectedItem(fc);
if (fc != null && !getFillField().getSelectedItem().equals(fc)) {
Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/FigActionState.java 2007-11-06 10:40:20-0800
@@ -96,7 +96,7 @@
addFig(getStereotypeFig());
addFig(getNameFig());
- //setBlinkPorts(false); //make port invisble unless mouse enters
+ //setBlinkPorts(false); //make port invisible unless mouse enters
Rectangle r = getBounds();
setBounds(r.x, r.y, r.width, r.height);
}
@@ -115,6 +115,7 @@
/*
* @see org.argouml.uml.diagram.state.ui.FigStateVertex#initNotationProviders(java.lang.Object)
*/
+ @Override
protected void initNotationProviders(Object own) {
if (notationProvider != null) {
notationProvider.cleanListener(this, own);
@@ -133,6 +134,7 @@
*
* @return the type of the notation provider
*/
+ @Override
protected int getNotationProviderType() {
return NotationProviderFactory2.TYPE_ACTIONSTATE;
}
@@ -140,6 +142,7 @@
/*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigActionState figClone = (FigActionState) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -153,6 +156,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getMinimumSize()
*/
+ @Override
public Dimension getMinimumSize() {
Dimension stereoDim = getStereotypeFig().getMinimumSize();
Dimension nameDim = getNameFig().getMinimumSize();
@@ -170,6 +174,7 @@
*
* Override setBounds to keep shapes looking right.
*/
+ @Override
protected void setStandardBounds(int x, int y, int w, int h) {
if (getNameFig() == null) {
return;
@@ -195,6 +200,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
cover.setLineColor(col);
}
@@ -202,6 +208,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
+ @Override
public Color getLineColor() {
return cover.getLineColor();
}
@@ -209,6 +216,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
cover.setFillColor(col);
}
@@ -216,6 +224,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return cover.getFillColor();
}
@@ -223,6 +232,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
cover.setFilled(f);
}
@@ -230,13 +240,20 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
- return cover.getFilled();
+ return cover.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return cover.isFilled();
}
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
cover.setLineWidth(w);
}
@@ -244,6 +261,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return cover.getLineWidth();
}
@@ -251,6 +269,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#modelChanged(java.beans.PropertyChangeEvent)
*/
+ @Override
protected void modelChanged(PropertyChangeEvent mee) {
super.modelChanged(mee);
if (mee instanceof AddAssociationEvent
@@ -264,6 +283,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#removeFromDiagramImpl()
*/
+ @Override
public void removeFromDiagramImpl() {
notationProvider.cleanListener(this, getOwner());
super.removeFromDiagramImpl();
@@ -272,6 +292,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateNameText()
*/
+ @Override
protected void updateNameText() {
if (notationProvider != null) {
getNameFig().setText(notationProvider.toString(getOwner(), null));
@@ -281,6 +302,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateStereotypeText()
*/
+ @Override
protected void updateStereotypeText() {
getStereotypeFig().setOwner(getOwner());
}
@@ -288,6 +310,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEdited(org.tigris.gef.presentation.FigText)
*/
+ @Override
protected void textEdited(FigText ft) throws PropertyVetoException {
notationProvider.parse(getOwner(), ft.getText());
ft.setText(notationProvider.toString(getOwner(), null));
@@ -296,6 +319,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());
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=13733&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=13732&r2=13733
==============================================================================
--- 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-06 10:40:20-0800
@@ -136,6 +136,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#initNotationProviders(java.lang.Object)
*/
+ @Override
protected void initNotationProviders(Object own) {
super.initNotationProviders(own);
if (Model.getFacade().isAModelElement(own)) {
@@ -153,6 +154,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#modelChanged(java.beans.PropertyChangeEvent)
*/
+ @Override
protected void modelChanged(PropertyChangeEvent mee) {
super.modelChanged(mee);
renderingChanged();
@@ -162,6 +164,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();
@@ -193,6 +196,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
*/
+ @Override
public String placeString() {
return "new ObjectFlowState";
}
@@ -200,6 +204,7 @@
/*
* @see java.lang.Object#clone()
*/
+ @Override
public Object clone() {
FigObjectFlowState figClone = (FigObjectFlowState) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -213,6 +218,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#setEnclosingFig(org.tigris.gef.presentation.Fig)
*/
+ @Override
public void setEnclosingFig(Fig encloser) {
LayerPerspective layer = (LayerPerspective) getLayer();
// If the layer is null, then most likely we are being deleted.
@@ -225,6 +231,7 @@
* The space between the 2 text figs is: PADDING.
* @see org.tigris.gef.presentation.Fig#getMinimumSize()
*/
+ @Override
public Dimension getMinimumSize() {
Dimension tempDim = getNameFig().getMinimumSize();
int w = tempDim.width + PADDING * 2;
@@ -246,6 +253,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;
Rectangle oldBounds = getBounds();
@@ -274,6 +282,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#renderingChanged()
*/
+ @Override
public void renderingChanged() {
updateClassifierText();
updateStateText();
@@ -308,26 +317,39 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
- public void setLineColor(Color col) { cover.setLineColor(col); }
+ @Override
+ public void setLineColor(Color col) {
+ cover.setLineColor(col);
+ }
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
- public Color getLineColor() { return cover.getLineColor(); }
+ @Override
+ public Color getLineColor() {
+ return cover.getLineColor();
+ }
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
- public void setFillColor(Color col) { cover.setFillColor(col); }
+ @Override
+ public void setFillColor(Color col) {
+ cover.setFillColor(col);
+ }
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
- public Color getFillColor() { return cover.getFillColor(); }
+ @Override
+ public Color getFillColor() {
+ return cover.getFillColor();
+ }
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
cover.setFilled(f);
}
@@ -335,13 +357,20 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
- return cover.getFilled();
+ return cover.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return cover.isFilled();
}
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
cover.setLineWidth(w);
}
@@ -349,6 +378,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
+ @Override
public int getLineWidth() {
return cover.getLineWidth();
}
@@ -356,6 +386,7 @@
/*
* @see java.awt.event.KeyListener#keyPressed(java.awt.event.KeyEvent)
*/
+ @Override
public void keyTyped(KeyEvent ke) {
if (!isReadyToEdit()) {
if (Model.getFacade().isAModelElement(getOwner())) {
@@ -376,6 +407,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()) {
notationProviderType.parse(getOwner(), ft.getText());
@@ -389,6 +421,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEditStarted(org.tigris.gef.presentation.FigText)
*/
+ @Override
protected void textEditStarted(FigText ft) {
if (ft == getNameFig()) {
showHelp(notationProviderType.getParsingHelp());
@@ -401,6 +434,7 @@
/*
* @see org.tigris.gef.presentation.Fig#makeSelection()
*/
+ @Override
public Selection makeSelection() {
return new SelectionActionState(this);
}
Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPartition.java 2007-11-06 10:40:20-0800
@@ -155,6 +155,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
getBigPort().setFilled(f);
getNameFig().setFilled(f);
@@ -164,13 +165,20 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
- return getBigPort().getFilled();
+ return getBigPort().isFilled();
}
-
+
+ @Override
+ public boolean isFilled() {
+ return getBigPort().isFilled();
+ }
+
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
rightLine.setLineWidth(w);
leftLine.setLineWidth(w);
Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPool.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPool.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPool.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPool.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPool.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPool.java 2007-11-06 10:40:20-0800
@@ -126,7 +126,12 @@
*/
@Override
public boolean getFilled() {
- return getBigPort().getFilled();
+ return getBigPort().isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return getBigPort().isFilled();
}
/*
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=13733&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=13732&r2=13733
==============================================================================
--- 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-06 10:40:20-0800
@@ -235,8 +235,14 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
- return cover.getFilled();
+ return cover.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return cover.isFilled();
}
/*
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=13733&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=13732&r2=13733
==============================================================================
--- 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-06 10:40:20-0800
@@ -274,7 +274,12 @@
*/
@Override
public boolean getFilled() {
- return cover.getFilled();
+ return cover.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return cover.isFilled();
}
/*
Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigMNode.java 2007-11-06 10:40:20-0800
@@ -189,8 +189,14 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
- return cover.getFilled();
+ return cover.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return cover.isFilled();
}
/*
Modified: trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java&p2=trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/deployment/ui/FigNodeInstance.java 2007-11-06 10:40:20-0800
@@ -162,8 +162,14 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
- return cover.getFilled();
+ return cover.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return cover.isFilled();
}
/*
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=13733&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=13732&r2=13733
==============================================================================
--- 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-06 10:40:20-0800
@@ -46,8 +46,6 @@
public class FigObject extends FigNodeModelElement {
private FigRect cover;
- private Object resident =
- Model.getCoreFactory().createElementResidence();
/**
* Main constructor.
@@ -108,42 +106,63 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
- public void setLineColor(Color col) { cover.setLineColor(col); }
+ public void setLineColor(Color col) {
+ cover.setLineColor(col);
+ }
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
- public Color getLineColor() { return cover.getLineColor(); }
+ public Color getLineColor() {
+ return cover.getLineColor();
+ }
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
- public void setFillColor(Color col) { cover.setFillColor(col); }
+ public void setFillColor(Color col) {
+ cover.setFillColor(col);
+ }
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
- public Color getFillColor() { return cover.getFillColor(); }
+ public Color getFillColor() {
+ return cover.getFillColor();
+ }
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
- public void setFilled(boolean f) { cover.setFilled(f); }
+ public void setFilled(boolean f) {
+ cover.setFilled(f);
+ }
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
- public boolean getFilled() { return cover.getFilled(); }
+ public boolean getFilled() {
+ return cover.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return cover.isFilled();
+ }
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
- public void setLineWidth(int w) { cover.setLineWidth(w); }
+ public void setLineWidth(int w) {
+ cover.setLineWidth(w);
+ }
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
- public int getLineWidth() { return cover.getLineWidth(); }
+ public int getLineWidth() {
+ return cover.getLineWidth();
+ }
/*
* @see org.tigris.gef.presentation.Fig#makeSelection()
Modified: trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java&p2=trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java 2007-11-06 10:40:20-0800
@@ -729,8 +729,9 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean filled) {
- if (headFig.getFilled() != filled) {
+ if (headFig.isFilled() != filled) {
headFig.setFilled(filled);
damage();
}
@@ -739,6 +740,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return headFig.getFillColor();
}
@@ -746,10 +748,17 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
- return headFig.getFilled();
+ return headFig.isFilled();
}
+ @Override
+ public boolean isFilled() {
+ return headFig.isFilled();
+ }
+
+
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/FigCompositeState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/FigCompositeState.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/FigCompositeState.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/FigCompositeState.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/FigCompositeState.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/FigCompositeState.java 2007-11-06 10:40:20-0800
@@ -308,7 +308,12 @@
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
public boolean getFilled() {
- return cover.getFilled();
+ return cover.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return cover.isFilled();
}
/*
Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/FigConcurrentRegion.java 2007-11-06 10:40:20-0800
@@ -408,8 +408,14 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
- return cover.getFilled();
+ return cover.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return cover.isFilled();
}
/*
Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/FigSimpleState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/FigSimpleState.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/FigSimpleState.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/FigSimpleState.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/FigSimpleState.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/FigSimpleState.java 2007-11-06 10:40:20-0800
@@ -196,7 +196,12 @@
*/
@Override
public boolean getFilled() {
- return cover.getFilled();
+ return cover.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return cover.isFilled();
}
/*
Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/FigStubState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/FigStubState.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/FigStubState.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/FigStubState.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/FigStubState.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/FigStubState.java 2007-11-06 10:40:20-0800
@@ -195,8 +195,14 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
- return referenceFig.getFilled();
+ return referenceFig.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return referenceFig.isFilled();
}
/*
Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/FigSubmachineState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/FigSubmachineState.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/FigSubmachineState.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/FigSubmachineState.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/FigSubmachineState.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/FigSubmachineState.java 2007-11-06 10:40:20-0800
@@ -291,6 +291,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
cover.setFilled(f);
getBigPort().setFilled(f);
@@ -299,8 +300,14 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
- return cover.getFilled();
+ return cover.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return cover.isFilled();
}
/*
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigComment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigComment.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigComment.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigComment.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigComment.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigComment.java 2007-11-06 10:40:20-0800
@@ -411,6 +411,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
bodyTextFig.setFilled(false); // The text is always opaque.
outlineFig.setFilled(f);
@@ -420,8 +421,14 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
- return outlineFig.getFilled();
+ return outlineFig.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return outlineFig.isFilled();
}
/*
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=13733&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=13732&r2=13733
==============================================================================
--- 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-06 10:40:20-0800
@@ -292,8 +292,14 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
- return body.getFilled();
+ return body.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return body.isFilled();
}
/*
Modified: trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java?view=diff&rev=13733&p1=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java&p2=trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java&r1=13732&r2=13733
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/use_case/ui/FigUseCase.java 2007-11-06 10:40:20-0800
@@ -817,7 +817,12 @@
*/
@Override
public boolean getFilled() {
- return cover.getFilled();
+ return cover.isFilled();
+ }
+
+ @Override
+ public boolean isFilled() {
+ return cover.isFilled();
}
/**