Author: tfmorris
Date: 2007-05-26 14:28:01-0700
New Revision: 12672
Modified:
trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java
trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java
trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java
trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java
trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java
trunk/src_new/org/argouml/persistence/XmlInputStream.java
trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java
trunk/src_new/org/argouml/uml/diagram/activity/ui/ActionCreatePartition.java
trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPool.java
trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java
trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java
trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java
trunk/src_new/org/argouml/uml/diagram/state/ui/FigSimpleState.java
trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java
trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java
trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java
trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java
trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationEnd.java
trunk/src_new/org/argouml/uml/diagram/ui/FigEdgePort.java
trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java
trunk/src_new/org/argouml/uml/diagram/ui/FigGraphEdge.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/ui/FigTextGroup.java
trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java
trunk/src_new/org/argouml/uml/diagram/ui/StylePanelFigMessage.java
trunk/src_new/org/argouml/uml/reveng/ConfigPanelExtension.java
trunk/src_new/org/argouml/uml/reveng/FileImportUtils.java
trunk/src_new/org/argouml/uml/reveng/Import.java
trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java
trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java
trunk/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java
trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java
trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java
trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java
Log:
Cleanup unused imports and other minor compiler warnings
Modified: trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java&p2=trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java (original)
+++ trunk/src_new/org/argouml/cognitive/critics/ui/CriticBrowserDialog.java 2007-05-26 14:28:01-0700
@@ -27,7 +27,6 @@
import java.awt.BorderLayout;
import java.awt.Dimension;
import java.awt.FlowLayout;
-import java.awt.Frame;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
Modified: trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java&p2=trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java (original)
+++ trunk/src_new/org/argouml/notation/providers/java/ModelElementNameNotationJava.java 2007-05-26 14:28:01-0700
@@ -97,7 +97,7 @@
token = st.nextToken();
if (" ".equals(token)) {
- ; /* skip spaces */
+ /* skip spaces */
} else if ("abstract".equals(token)) {
abstrac = true;
} else if ("final".equals(token)) {
Modified: trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/AssociationRoleNotationUml.java 2007-05-26 14:28:01-0700
@@ -102,7 +102,7 @@
while (st.hasMoreTokens()) {
token = st.nextToken();
if (" ".equals(token) || "\t".equals(token)) {
- /* Do nothing. */;
+ /* Do nothing. */
} else if ("/".equals(token)) {
hasSlash = true;
hasColon = false;
Modified: trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/ClassifierRoleNotationUml.java 2007-05-26 14:28:01-0700
@@ -130,7 +130,7 @@
while (st.hasMoreTokens()) {
token = st.nextToken();
if (" ".equals(token) || "\t".equals(token)) {
- /* Do nothing. */;
+ /* Do nothing. */
} else if ("/".equals(token)) {
hasSlash = true;
hasColon = false;
Modified: trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/MessageNotationUml.java 2007-05-26 14:28:01-0700
@@ -1001,7 +1001,7 @@
}
if (compareMsgNumbers(mname, gname)) {
- ;// Do nothing
+ // Do nothing
} else if (isMsgNumberStartOf(gname, mname)) {
String msg = "parsing.error.message.subtree-rooted-self";
throw new ParseException(Translator.localize(msg), 0);
Modified: trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/NotationUtilityUml.java 2007-05-26 14:28:01-0700
@@ -1178,7 +1178,7 @@
} else if (kind == Model.getDirectionKind().getInOutParameter()) {
s.append("inout");
} else if (kind == Model.getDirectionKind().getReturnParameter()) {
- ;// return nothing
+ // return nothing
} else if (kind == Model.getDirectionKind().getOutParameter()) {
s.append("out");
}
Modified: trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java&p2=trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java (original)
+++ trunk/src_new/org/argouml/notation/providers/uml/TransitionNotationUml.java 2007-05-26 14:28:01-0700
@@ -286,7 +286,7 @@
} else {
// case 3 and 4
if (evt == null) {
- /* case 3 */;
+ /* case 3 */
} else {
// case 4
delete(evt); // erase it
@@ -357,7 +357,7 @@
}
} else {
if (g == null) {
- /* case 3 */;
+ /* case 3 */
} else {
// case 4
delete(g); // erase it
@@ -411,7 +411,7 @@
}
} else { // case 3 & 4
if (effect == null) {
- ;// case 3
+ // case 3
} else {
// case 4
delete(effect); // erase it
@@ -577,7 +577,7 @@
} else if (kind == Model.getDirectionKind().getInOutParameter()) {
s.append("inout");
} else if (kind == Model.getDirectionKind().getReturnParameter()) {
- ;// return nothing
+ // return nothing
} else if (kind == Model.getDirectionKind().getOutParameter()) {
s.append("out");
}
Modified: trunk/src_new/org/argouml/persistence/XmlInputStream.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/persistence/XmlInputStream.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/persistence/XmlInputStream.java&p2=trunk/src_new/org/argouml/persistence/XmlInputStream.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/persistence/XmlInputStream.java (original)
+++ trunk/src_new/org/argouml/persistence/XmlInputStream.java 2007-05-26 14:28:01-0700
@@ -267,7 +267,7 @@
// back to that child tag.
mark(1000);
while (realRead() != '<') {
- /* do nothing */ ;
+ /* do nothing */
}
tagName = "";
char ch = (char) realRead();
Modified: trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java&p2=trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/DiagramFactory.java 2007-05-26 14:28:01-0700
@@ -29,7 +29,6 @@
import java.util.Map;
import java.util.Vector;
-import org.argouml.kernel.Project;
import org.argouml.model.ActivityDiagram;
import org.argouml.model.ClassDiagram;
import org.argouml.model.CollaborationDiagram;
Modified: trunk/src_new/org/argouml/uml/diagram/activity/ui/ActionCreatePartition.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/activity/ui/ActionCreatePartition.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/activity/ui/ActionCreatePartition.java&p2=trunk/src_new/org/argouml/uml/diagram/activity/ui/ActionCreatePartition.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/ActionCreatePartition.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/ActionCreatePartition.java 2007-05-26 14:28:01-0700
@@ -27,7 +27,6 @@
import org.argouml.model.Model;
import org.argouml.ui.CmdCreateNode;
import org.tigris.gef.base.Mode;
-import org.tigris.gef.base.ModePlace;
public class ActionCreatePartition extends CmdCreateNode {
@@ -39,6 +38,7 @@
"button.new-partition");
}
+ @Override
protected Mode createMode(String instructions) {
return new ModePlacePackage(this, instructions);
}
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=12672&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=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPool.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/activity/ui/FigPool.java 2007-05-26 14:28:01-0700
@@ -32,7 +32,6 @@
import org.argouml.model.Model;
import org.argouml.uml.diagram.ui.FigEmptyRect;
import org.argouml.uml.diagram.ui.FigNodeModelElement;
-import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigRect;
@@ -68,9 +67,11 @@
// setOwner(node);
// }
+
/*
- * @see java.lang.Object#clone()
+ * @see org.argouml.uml.diagram.ui.FigNodeModelElement#clone()
*/
+ @Override
public Object clone() {
FigPool figClone = (FigPool) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -81,6 +82,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#addEnclosedFig(org.tigris.gef.presentation.Fig)
*/
+ @Override
public void addEnclosedFig(Fig figState) {
super.addEnclosedFig(figState);
Iterator it = getLayer().getContentsNoEdges().iterator();
@@ -97,6 +99,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
getBigPort().setFillColor(col);
getNameFig().setFillColor(col);
@@ -105,6 +108,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return getBigPort().getFillColor();
}
@@ -112,6 +116,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
getBigPort().setFilled(f);
}
@@ -119,6 +124,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
return getBigPort().getFilled();
}
@@ -126,6 +132,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getMinimumSize()
*/
+ @Override
public Dimension getMinimumSize() {
Dimension nameDim = getNameFig().getMinimumSize();
int w = nameDim.width;
@@ -145,6 +152,7 @@
*
* @see org.tigris.gef.presentation.Fig#getUseTrapRect()
*/
+ @Override
public boolean getUseTrapRect() {
return true;
}
@@ -152,6 +160,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setBoundsImpl(int, int, int, int)
*/
+ @Override
protected void setBoundsImpl(int x, int y, int w, int h) {
Rectangle oldBounds = getBounds();
@@ -166,6 +175,7 @@
* one of its swimlanes is dragged or resized.
* @return false at all times
*/
+ @Override
public boolean isSelectable() {
return false;
}
Modified: trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/collaboration/ui/UMLCollaborationDiagram.java 2007-05-26 14:28:01-0700
@@ -35,7 +35,6 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.ui.ActionSetMode;
-import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.collaboration.CollabDiagramGraphModel;
import org.argouml.uml.diagram.ui.ActionAddAssociationRole;
import org.argouml.uml.diagram.ui.ActionAddMessage;
@@ -172,8 +171,7 @@
/**
* Get the actions from which to create a toolbar or equivalent
* graphic triggers.
- *
- * @see org.argouml.uml.diagram.ui.UMLDiagram#getUmlActions()
+ * {@inheritDoc}
*/
protected Object[] getUmlActions() {
Object[] actions = {
@@ -399,6 +397,7 @@
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getDependentElement()
*/
+ @Override
public Object getDependentElement() {
return getNamespace(); /* The collaboration. */
}
@@ -429,4 +428,4 @@
* The UID.
*/
private static final long serialVersionUID = 8081715986963837750L;
-} /* end class UMLCollaborationDiagram */
+}
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=12672&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=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/sequence/ui/FigClassifierRole.java 2007-05-26 14:28:01-0700
@@ -467,7 +467,7 @@
.matchingCallerList(caller,
callerIndex);
--backNodeIndex) {
- ;
+ // skip
}
if (callerIndex == 0) {
callers = null;
Modified: trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java&p2=trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/sequence/ui/SequenceDiagramRenderer.java 2007-05-26 14:28:01-0700
@@ -32,7 +32,6 @@
import org.argouml.uml.diagram.static_structure.ui.CommentEdge;
import org.argouml.uml.diagram.static_structure.ui.FigComment;
import org.argouml.uml.diagram.static_structure.ui.FigEdgeNote;
-import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.tigris.gef.base.Layer;
import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.presentation.FigEdge;
@@ -97,6 +96,7 @@
* org.tigris.gef.graph.GraphModel, org.tigris.gef.base.Layer,
* java.lang.Object, java.util.Map)
*/
+ @Override
public FigEdge getFigEdgeFor(Object edge, Map styleAttributes) {
if (edge == null) {
throw new IllegalArgumentException("A model edge must be supplied");
@@ -120,5 +120,5 @@
}
-} /* end class SequenceDiagramRenderer */
+}
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=12672&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=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/FigSimpleState.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/FigSimpleState.java 2007-05-26 14:28:01-0700
@@ -42,21 +42,9 @@
*/
public class FigSimpleState extends FigState {
- ////////////////////////////////////////////////////////////////
- // constants
-
- private static final int MARGIN = 2;
-
- ////////////////////////////////////////////////////////////////
- // instance variables
-
private FigRect cover;
private FigLine divider;
-
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* The main constructor
*/
@@ -97,9 +85,8 @@
setOwner(node);
}
- /*
- * @see java.lang.Object#clone()
- */
+
+ @Override
public Object clone() {
FigSimpleState figClone = (FigSimpleState) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -111,12 +98,10 @@
return figClone;
}
- ////////////////////////////////////////////////////////////////
- // accessors
-
/*
* @see org.tigris.gef.presentation.Fig#getMinimumSize()
*/
+ @Override
public Dimension getMinimumSize() {
Dimension nameDim = getNameFig().getMinimumSize();
Dimension internalDim = getInternal().getMinimumSize();
@@ -131,9 +116,9 @@
/**
* Override setBounds to keep shapes looking right.
- *
- * @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
+ * {@inheritDoc}
*/
+ @Override
protected void setBoundsImpl(int x, int y, int w, int h) {
if (getNameFig() == null) {
return;
@@ -164,35 +149,43 @@
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);
+ cover.setLineColor(col);
+ divider.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);
getBigPort().setFilled(f);
@@ -201,28 +194,32 @@
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
- public boolean getFilled() { return cover.getFilled(); }
+ @Override
+ public boolean getFilled() {
+ return cover.getFilled();
+ }
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
+ @Override
public void setLineWidth(int w) {
- cover.setLineWidth(w);
- divider.setLineWidth(w);
+ cover.setLineWidth(w);
+ divider.setLineWidth(w);
}
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
- public int getLineWidth() { return cover.getLineWidth(); }
-
-
- ////////////////////////////////////////////////////////////////
- // event processing
+ @Override
+ public int getLineWidth() {
+ return cover.getLineWidth();
+ }
/*
* @see org.argouml.uml.diagram.state.ui.FigState#getInitialHeight()
*/
+ @Override
protected int getInitialHeight() {
return 40;
}
@@ -230,6 +227,7 @@
/*
* @see org.argouml.uml.diagram.state.ui.FigState#getInitialWidth()
*/
+ @Override
protected int getInitialWidth() {
return 70;
}
@@ -237,6 +235,7 @@
/*
* @see org.argouml.uml.diagram.state.ui.FigState#getInitialX()
*/
+ @Override
protected int getInitialX() {
return 0;
}
@@ -244,8 +243,9 @@
/*
* @see org.argouml.uml.diagram.state.ui.FigState#getInitialY()
*/
+ @Override
protected int getInitialY() {
return 0;
}
-} /* end class FigSimpleState */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/FigState.java 2007-05-26 14:28:01-0700
@@ -106,6 +106,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
*/
+ @Override
public void setOwner(Object newOwner) {
super.setOwner(newOwner);
renderingChanged();
@@ -114,6 +115,7 @@
/*
* @see org.argouml.uml.diagram.state.ui.FigStateVertex#initNotationProviders(java.lang.Object)
*/
+ @Override
protected void initNotationProviders(Object own) {
if (notationProviderBody != null) {
notationProviderBody.cleanListener(this, own);
@@ -142,6 +144,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#removeFromDiagramImpl()
*/
+ @Override
public void removeFromDiagramImpl() {
notationProviderBody.cleanListener(this, getOwner());
super.removeFromDiagramImpl();
@@ -150,6 +153,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#renderingChanged()
*/
+ @Override
public void renderingChanged() {
Object state = getOwner();
if (state == null) {
@@ -200,6 +204,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEditStarted(org.tigris.gef.presentation.FigText)
*/
+ @Override
protected void textEditStarted(FigText ft) {
super.textEditStarted(ft);
if (ft == internal) {
@@ -210,6 +215,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEdited(org.tigris.gef.presentation.FigText)
*/
+ @Override
public void textEdited(FigText ft) throws PropertyVetoException {
super.textEdited(ft);
if (ft == getInternal()) {
Modified: trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/state/ui/UMLStateDiagram.java 2007-05-26 14:28:01-0700
@@ -34,11 +34,10 @@
import org.argouml.kernel.ProjectManager;
import org.argouml.model.DeleteInstanceEvent;
import org.argouml.model.Model;
-import org.argouml.ui.CmdCreateNode;
import org.argouml.ui.ActionSetMode;
+import org.argouml.ui.CmdCreateNode;
import org.argouml.uml.diagram.UMLMutableGraphSupport;
import org.argouml.uml.diagram.state.StateDiagramGraphModel;
-import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
import org.argouml.uml.diagram.ui.RadioAction;
import org.argouml.uml.diagram.ui.UMLDiagram;
import org.argouml.uml.ui.behavior.common_behavior.ActionNewActionSequence;
@@ -203,11 +202,11 @@
}
/**
- * The owner of a statechart diagram is the statemachine
- * it's showing.
+ * Get the owner of a statechart diagram.
* @return the statemachine which owns the diagram
* @see org.argouml.uml.diagram.ui.UMLDiagram#getOwner()
*/
+ @Override
public Object getOwner() {
if (!(getGraphModel() instanceof StateDiagramGraphModel)) {
throw new IllegalStateException(
@@ -226,6 +225,7 @@
* @param o the statemachine
* @see org.tigris.gef.base.Diagram#initialize(Object)
*/
+ @Override
public void initialize(Object o) {
if (Model.getFacade().isAStateMachine(o)) {
Object machine = o;
@@ -296,6 +296,7 @@
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#propertyChange(java.beans.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent evt) {
if ((evt.getSource() == theStateMachine)
&& (evt instanceof DeleteInstanceEvent)
@@ -702,6 +703,7 @@
/*
* @see org.argouml.uml.diagram.ui.UMLDiagram#getDependentElement()
*/
+ @Override
public Object getDependentElement() {
return getStateMachine(); /* The StateMachine. */
}
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigClassifierBox.java 2007-05-26 14:28:01-0700
@@ -40,7 +40,6 @@
import org.argouml.model.Model;
import org.argouml.model.RemoveAssociationEvent;
import org.argouml.ui.ArgoJMenu;
-import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ui.ActionAddNote;
import org.argouml.uml.diagram.ui.ActionCompartmentDisplay;
import org.argouml.uml.diagram.ui.ActionEdgesDisplay;
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigEnumeration.java 2007-05-26 14:28:01-0700
@@ -38,7 +38,6 @@
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
import org.argouml.ui.ArgoJMenu;
-import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ui.CompartmentFigText;
import org.argouml.uml.diagram.ui.EnumLiteralsCompartmentContainer;
import org.argouml.uml.diagram.ui.FigEnumLiteralsCompartment;
@@ -103,14 +102,12 @@
/*
* @see org.argouml.uml.diagram.static_structure.ui.FigDataType#makeSelection()
*/
+ @Override
public Selection makeSelection() {
return new SelectionEnumeration(this);
}
- /*
- * @see java.lang.Object#clone()
- * TODO: Is this actually needed? - tfm
- */
+ @Override
public Object clone() {
FigEnumeration clone = (FigEnumeration) super.clone();
clone.literalsCompartment =
@@ -121,6 +118,7 @@
/*
* @see org.argouml.uml.diagram.static_structure.ui.FigClassifierBox#buildAddMenu()
*/
+ @Override
protected ArgoJMenu buildAddMenu() {
ArgoJMenu addMenu = super.buildAddMenu();
@@ -145,6 +143,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#renderingChanged()
*/
+ @Override
public void renderingChanged() {
if (getOwner() != null) {
updateEnumLiterals();
@@ -155,6 +154,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#updateListeners(java.lang.Object)
*/
+ @Override
protected void updateListeners(Object oldOwner, Object newOwner) {
if (oldOwner != null) {
removeAllElementListeners();
@@ -199,6 +199,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#textEdited(org.tigris.gef.presentation.FigText)
*/
+ @Override
protected void textEdited(FigText ft) throws PropertyVetoException {
super.textEdited(ft);
Object cls = /*(Classifier)*/ getOwner();
@@ -218,6 +219,7 @@
/*
* @see org.argouml.uml.diagram.static_structure.ui.FigDataType#getMinimumSize()
*/
+ @Override
public Dimension getMinimumSize() {
// Start with the minimum for our parent
Dimension aSize = super.getMinimumSize();
@@ -234,6 +236,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setBoundsImpl(int, int, int, int)
*/
+ @Override
protected void setBoundsImpl(final int x, final int y, final int w,
final int h) {
@@ -299,8 +302,6 @@
firePropChange("bounds", oldBounds, getBounds());
}
-
-
/**
* @return the Fig for the EnumerationLiterals compartment
*/
@@ -360,5 +361,4 @@
return literalsCompartment.getBounds();
}
-
}
Modified: trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java&p2=trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/static_structure/ui/FigFeature.java 2007-05-26 14:28:01-0700
@@ -24,17 +24,14 @@
package org.argouml.uml.diagram.static_structure.ui;
-import java.awt.Color;
import java.awt.Rectangle;
import java.beans.PropertyChangeEvent;
import org.argouml.model.Model;
import org.argouml.notation.providers.NotationProvider;
import org.argouml.uml.diagram.ui.CompartmentFigText;
-import org.argouml.uml.diagram.ui.FigNodeModelElement;
import org.tigris.gef.base.Selection;
import org.tigris.gef.presentation.Fig;
-import org.tigris.gef.presentation.FigText;
import org.tigris.gef.presentation.Handle;
/**
@@ -52,6 +49,8 @@
*/
public abstract class FigFeature extends CompartmentFigText {
+ private static final String EVENT_NAME = "ownerScope";
+
private static class SelectionFeature extends Selection {
/**
* Constructor for SelectionFeature.
@@ -101,31 +100,34 @@
/*
* @see org.argouml.uml.diagram.ui.FigSingleLineText#setOwner(java.lang.Object)
*/
+ @Override
public void setOwner(Object owner) {
super.setOwner(owner);
if (owner != null) {
updateOwnerScope(Model.getScopeKind().getClassifier().equals(
Model.getFacade().getOwnerScope(owner)));
- Model.getPump().addModelEventListener(this, owner, "ownerScope");
+ Model.getPump().addModelEventListener(this, owner, EVENT_NAME);
}
}
/*
* @see org.argouml.uml.diagram.ui.FigSingleLineText#removeFromDiagram()
*/
+ @Override
public void removeFromDiagram() {
Model.getPump().removeModelEventListener(this, getOwner(),
- "ownerScope");
+ EVENT_NAME);
super.removeFromDiagram();
}
/*
* @see org.argouml.uml.diagram.ui.FigSingleLineText#propertyChange(java.beans.PropertyChangeEvent)
*/
+ @Override
public void propertyChange(PropertyChangeEvent pce) {
super.propertyChange(pce);
- if ("ownerScope".equals(pce.getPropertyName())) {
+ if (EVENT_NAME.equals(pce.getPropertyName())) {
updateOwnerScope(Model.getScopeKind().getClassifier().equals(
pce.getNewValue()));
}
@@ -134,6 +136,7 @@
/*
* @see org.tigris.gef.presentation.Fig#makeSelection()
*/
+ @Override
public Selection makeSelection() {
return new SelectionFeature(this);
}
@@ -141,6 +144,7 @@
/*
* @see org.tigris.gef.presentation.FigText#setTextFilled(boolean)
*/
+ @Override
public void setTextFilled(boolean filled) {
super.setTextFilled(false);
}
@@ -148,6 +152,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean filled) {
super.setFilled(false);
}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java 2007-05-26 14:28:01-0700
@@ -31,9 +31,7 @@
import org.argouml.model.Model;
import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ArgoDiagram;
-import org.tigris.gef.base.Editor;
import org.tigris.gef.base.Globals;
-import org.tigris.gef.base.Layer;
import org.tigris.gef.graph.MutableGraphModel;
import org.tigris.gef.undo.UndoableAction;
@@ -60,6 +58,7 @@
/*
* @see java.awt.event.ActionListener#actionPerformed(ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent arg0) {
super.actionPerformed(arg0);
// we have an edge (the UML modelelement!)
@@ -86,6 +85,7 @@
/*
* @see javax.swing.Action#isEnabled()
*/
+ @Override
public boolean isEnabled() {
Object target = TargetManager.getInstance().getModelTarget();
ArgoDiagram dia = ProjectManager.getManager().getCurrentProject().
Modified: trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/DnDJGraph.java 2007-05-26 14:28:01-0700
@@ -43,7 +43,6 @@
import org.argouml.ui.targetmanager.TargetManager;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.base.Editor;
-import org.tigris.gef.base.Layer;
import org.tigris.gef.graph.ConnectionConstrainer;
import org.tigris.gef.graph.GraphModel;
import org.tigris.gef.graph.MutableGraphModel;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationEnd.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationEnd.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationEnd.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationEnd.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationEnd.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigAssociationEnd.java 2007-05-26 14:28:01-0700
@@ -39,7 +39,6 @@
import org.argouml.model.Model;
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.notation.providers.uml.NotationUtilityUml;
-import org.argouml.ui.ProjectBrowser;
import org.tigris.gef.base.Layer;
import org.tigris.gef.base.PathConvPercentPlusConst;
import org.tigris.gef.presentation.FigText;
@@ -122,6 +121,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigEdgeModelElement#getNotationProviderType()
*/
+ @Override
protected int getNotationProviderType() {
return NotationProviderFactory2.TYPE_ASSOCIATION_END_NAME;
}
@@ -129,6 +129,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigEdgeModelElement#updateListeners(java.lang.Object)
*/
+ @Override
public void updateListeners(Object oldOwner, Object newOwner) {
if (oldOwner == newOwner) {
LOG.warn("Listeners being added and removed from the same owner");
@@ -169,6 +170,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigEdgeModelElement#textEdited(org.tigris.gef.presentation.FigText)
*/
+ @Override
protected void textEdited(FigText ft) {
if (getOwner() == null) {
return;
@@ -200,6 +202,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigEdgeModelElement#textEditStarted(org.tigris.gef.presentation.FigText)
*/
+ @Override
protected void textEditStarted(FigText ft) {
if (ft == srcMult) {
showHelp("parsing.help.fig-association-source-multiplicity");
@@ -226,6 +229,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigEdgeModelElement#modelChanged(java.beans.PropertyChangeEvent)
*/
+ @Override
protected void modelChanged(PropertyChangeEvent e) {
super.modelChanged(e);
if (e instanceof AttributeChangeEvent
@@ -237,6 +241,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigEdgeModelElement#renderingChanged()
*/
+ @Override
protected void renderingChanged() {
updateEnd(srcMult, srcOrdering);
srcMult.calcBounds();
@@ -247,6 +252,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigEdgeModelElement#updateStereotypeText()
*/
+ @Override
protected void updateStereotypeText() {
/* There is none... */
}
@@ -254,9 +260,10 @@
/*
* @see org.argouml.uml.diagram.ui.FigEdgeModelElement#paintClarifiers(java.awt.Graphics)
*/
+ @Override
public void paintClarifiers(Graphics g) {
indicateBounds(getNameFig(), g);
indicateBounds(srcMult, g);
super.paintClarifiers(g);
}
-} /* end class FigAssociationEnd */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigEdgePort.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigEdgePort.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgePort.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigEdgePort.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigEdgePort.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigEdgePort.java 2007-05-26 14:28:01-0700
@@ -30,7 +30,6 @@
import org.tigris.gef.presentation.Fig;
import org.tigris.gef.presentation.FigCircle;
import org.tigris.gef.presentation.FigEdge;
-import org.tigris.gef.presentation.FigGroup;
/**
* This node cannot be dragged and manipulated in the same way as other
@@ -62,6 +61,7 @@
/*
* @see org.tigris.gef.presentation.Fig#hit(java.awt.Rectangle)
*/
+ @Override
public boolean hit(Rectangle r) {
return false;
}
@@ -69,11 +69,13 @@
/*
* @see org.tigris.gef.presentation.Fig#setOwner(java.lang.Object)
*/
+ @Override
public void setOwner(Object own) {
bigPort.setOwner(own);
super.setOwner(own);
}
+ @Override
public Object getOwner() {
if (super.getOwner() != null) {
return super.getOwner();
@@ -93,6 +95,7 @@
* @see org.tigris.gef.presentation.Fig#classNameAndBounds()
*/
// USED BY PGML.tee
+ @Override
public String classNameAndBounds() {
return getClass().getName()
+ "[" + getX() + ", " + getY() + ", "
@@ -102,6 +105,7 @@
/*
* @see org.tigris.gef.presentation.FigNode#hitPort(int, int)
*/
+ @Override
public Object hitPort(int x, int y) {
return null;
}
@@ -109,6 +113,7 @@
/*
* @see org.tigris.gef.presentation.FigGroup#hitFig(java.awt.Rectangle)
*/
+ @Override
public Fig hitFig(Rectangle r) {
return null;
}
@@ -116,6 +121,7 @@
/*
* @see org.tigris.gef.presentation.Fig#isSelectable()
*/
+ @Override
public boolean isSelectable() {
return false;
}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigGeneralization.java 2007-05-26 14:28:01-0700
@@ -28,7 +28,6 @@
import java.awt.Graphics;
import java.beans.PropertyChangeEvent;
-import org.apache.log4j.Logger;
import org.argouml.kernel.ProjectManager;
import org.argouml.model.AttributeChangeEvent;
import org.argouml.model.Model;
@@ -50,11 +49,6 @@
*/
private static final long serialVersionUID = 3983170503390943894L;
- /*
- * The Logger.
- */
- private static final Logger LOG = Logger.getLogger(FigGeneralization.class);
-
/**
* Text box for discriminator.
*/
@@ -104,12 +98,10 @@
*/
protected boolean canEdit(Fig f) { return false; }
- ////////////////////////////////////////////////////////////////
- // event handlers
-
/*
* @see org.argouml.uml.diagram.ui.FigEdgeModelElement#modelChanged(java.beans.PropertyChangeEvent)
*/
+ @Override
protected void modelChanged(PropertyChangeEvent e) {
// Name & stereotypes get updated by superclass
super.modelChanged(e);
@@ -123,6 +115,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigEdgeModelElement#updateListeners(java.lang.Object, java.lang.Object)
*/
+ @Override
protected void updateListeners(Object oldOwner, Object newOwner) {
if (oldOwner != null) {
removeElementListener(oldOwner);
@@ -153,6 +146,7 @@
/*
* @see org.tigris.gef.presentation.Fig#paint(java.awt.Graphics)
*/
+ @Override
public void paint(Graphics g) {
endArrow.setLineColor(getLineColor());
super.paint(g);
@@ -161,6 +155,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setOwner(Object)
*/
+ @Override
public void setOwner(Object own) {
super.setOwner(own);
if (Model.getFacade().isAGeneralization(own)) {
@@ -187,4 +182,4 @@
+ own.getClass().getName());
}
}
-} /* end class FigGeneralization */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigGraphEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigGraphEdge.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigGraphEdge.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigGraphEdge.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigGraphEdge.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigGraphEdge.java 2007-05-26 14:28:01-0700
@@ -24,7 +24,6 @@
package org.argouml.uml.diagram.ui;
-import org.apache.log4j.Logger;
import org.tigris.gef.presentation.FigEdgePoly;
/**
@@ -33,9 +32,6 @@
public abstract class FigGraphEdge
extends FigEdgePoly {
- private static final Logger LOG =
- Logger.getLogger(FigGraphEdge.class);
-
/**
* Returns a {@link SelectionRerouteEdge} object that manages selection
* and rerouting of the edge.
@@ -46,4 +42,4 @@
// return new SelectionRerouteEdge(this);
// }
-} /* end class FigEdgeModelElement */
+}
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=12672&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigMessage.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigMessage.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigMessage.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigMessage.java 2007-05-26 14:28:01-0700
@@ -29,12 +29,10 @@
import java.awt.Polygon;
import java.awt.Rectangle;
import java.beans.PropertyChangeEvent;
-import java.util.Collection;
import java.util.Iterator;
import java.util.Vector;
import org.argouml.model.Model;
-import org.argouml.notation.Notation;
import org.argouml.notation.NotationProviderFactory2;
import org.argouml.uml.diagram.collaboration.ui.FigAssociationRole;
import org.tigris.gef.base.Layer;
@@ -84,7 +82,6 @@
figPoly.setPolygon(polygon);
figPoly.setBounds(100, 10, 5, 18);
- arrowDirections.setSize(4);
arrowDirections.setElementAt("North", NORTH);
arrowDirections.setElementAt("South", SOUTH);
arrowDirections.setElementAt("East", EAST);
@@ -116,6 +113,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#getNotationProviderType()
*/
+ @Override
protected int getNotationProviderType() {
return NotationProviderFactory2.TYPE_MESSAGE;
}
@@ -124,6 +122,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) {
removeElementListener(oldOwner);
@@ -136,11 +135,14 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#placeString()
*/
- public String placeString() { return "new Message"; }
+ @Override
+ public String placeString() {
+ // TODO: I18N
+ return "new Message";
+ }
- /*
- * @see java.lang.Object#clone()
- */
+
+ @Override
public Object clone() {
FigMessage figClone = (FigMessage) super.clone();
Iterator it = figClone.getFigs().iterator();
@@ -153,6 +155,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineColor(java.awt.Color)
*/
+ @Override
public void setLineColor(Color col) {
figPoly.setLineColor(col);
getNameFig().setLineColor(col);
@@ -161,6 +164,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getLineColor()
*/
+ @Override
public Color getLineColor() {
return figPoly.getLineColor();
}
@@ -168,6 +172,7 @@
/*
* @see org.tigris.gef.presentation.Fig#setFillColor(java.awt.Color)
*/
+ @Override
public void setFillColor(Color col) {
//figPoly.setFillColor(col);
getNameFig().setFillColor(col);
@@ -176,6 +181,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getFillColor()
*/
+ @Override
public Color getFillColor() {
return getNameFig().getFillColor();
}
@@ -183,12 +189,14 @@
/*
* @see org.tigris.gef.presentation.Fig#setFilled(boolean)
*/
+ @Override
public void setFilled(boolean f) {
}
/*
* @see org.tigris.gef.presentation.Fig#getFilled()
*/
+ @Override
public boolean getFilled() {
return true;
}
@@ -196,12 +204,18 @@
/*
* @see org.tigris.gef.presentation.Fig#setLineWidth(int)
*/
- public void setLineWidth(int w) { figPoly.setLineWidth(w); }
+ @Override
+ public void setLineWidth(int w) {
+ figPoly.setLineWidth(w);
+ }
/*
* @see org.tigris.gef.presentation.Fig#getLineWidth()
*/
- public int getLineWidth() { return figPoly.getLineWidth(); }
+ @Override
+ public int getLineWidth() {
+ return figPoly.getLineWidth();
+ }
/**
* @param direction for the arrow
@@ -259,6 +273,7 @@
/*
* @see org.tigris.gef.presentation.Fig#getMinimumSize()
*/
+ @Override
public Dimension getMinimumSize() {
Dimension nameMin = getNameFig().getMinimumSize();
Dimension figPolyMin = figPoly.getSize();
@@ -272,6 +287,7 @@
* Override setBounds to keep shapes looking right.
* @see org.tigris.gef.presentation.Fig#setBounds(int, int, int, int)
*/
+ @Override
protected void setBoundsImpl(int x, int y, int w, int h) {
if (getNameFig() == null) {
return;
@@ -304,7 +320,8 @@
*
* @author Decki,Endi,Yayan, Politechnic of Bandung. Computer Departement
* method for changing text of Message
- */
+ */
+ @Override
protected void modelChanged(PropertyChangeEvent mee) {
super.modelChanged(mee);
@@ -407,7 +424,7 @@
*
* @author Decki,Endi,Yayan, Politechnic of Bandung. Computer Departement
* method for changing text of Message
- * @param newOwner
+ * @param newOwner model element which should now be listened to
*/
protected void updateListeners(Object newOwner) {
// Our superclass no longer has this method, so perhaps this whole
@@ -505,6 +522,7 @@
/*
* @see org.argouml.uml.diagram.ui.FigNodeModelElement#renderingChanged()
*/
+ @Override
public void renderingChanged() {
super.renderingChanged();
updateArrow();
@@ -516,4 +534,4 @@
public static Vector getArrowDirections() {
return arrowDirections;
}
-} /* end class FigMessage */
+}
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=12672&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigNodeModelElement.java 2007-05-26 14:28:01-0700
@@ -336,14 +336,17 @@
super.finalize();
}
- /*
- * After the base clone method has been called determine which child
- * figs of the clone represent the name, stereotype and port. <p>
- *
+ /**
+ * Clone this figure. After the base clone method has been called determine
+ * which child figs of the clone represent the name, stereotype and port.
+ * <p>
+ *
* The clone function is used by Copy/Paste operations.
- *
+ *
* @see java.lang.Object#clone()
+ * @return the cloned figure
*/
+ @Override
public Object clone() {
FigNodeModelElement clone = (FigNodeModelElement) super.clone();
Iterator thisIter = this.getFigs().iterator();
Modified: trunk/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/FigTextGroup.java 2007-05-26 14:28:01-0700
@@ -41,14 +41,14 @@
*/
public class FigTextGroup extends FigGroup implements MouseListener {
- private static final int ROWHEIGHT = 17;
private boolean supressCalcBounds = false;
/**
* Adds a FigText to the list with figs. Makes sure that the
* figtexts do not overlap.
- * @see org.tigris.gef.presentation.FigGroup#addFig(Fig)
+ * {@inheritDoc}
*/
+ @Override
public void addFig(Fig f) {
super.addFig(f);
updateFigTexts();
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ModeCreateGraphEdge.java 2007-05-26 14:28:01-0700
@@ -31,7 +31,6 @@
import org.apache.log4j.Logger;
import org.argouml.model.Model;
-import org.argouml.uml.diagram.static_structure.ClassDiagramGraphModel;
import org.argouml.uml.diagram.static_structure.ui.FigEdgeNote;
import org.tigris.gef.base.Layer;
import org.tigris.gef.base.ModeCreatePolyEdge;
@@ -59,6 +58,7 @@
/*
* @see java.awt.event.MouseListener#mousePressed(java.awt.event.MouseEvent)
*/
+ @Override
public void mousePressed(MouseEvent me) {
int x = me.getX(), y = me.getY();
Fig underMouse = editor.hit(x, y);
@@ -118,6 +118,7 @@
/*
* @see org.tigris.gef.base.ModeCreatePolyEdge#mouseReleased(java.awt.event.MouseEvent)
*/
+ @Override
public void mouseReleased(MouseEvent me) {
if (me.isConsumed()) {
return;
Modified: trunk/src_new/org/argouml/uml/diagram/ui/StylePanelFigMessage.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/StylePanelFigMessage.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/diagram/ui/StylePanelFigMessage.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/StylePanelFigMessage.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/StylePanelFigMessage.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/StylePanelFigMessage.java 2007-05-26 14:28:01-0700
@@ -39,7 +39,7 @@
*/
public class StylePanelFigMessage extends StylePanelFigNodeModelElement {
-
+ // TODO: I18N
private JLabel arrowLabel = new JLabel("Arrow: ");
private JComboBox arrowField = new JComboBox(Converter
@@ -65,12 +65,11 @@
remove(getFillLabel());
}
- ////////////////////////////////////////////////////////////////
- // accessors
/*
* @see org.argouml.ui.TabTarget#refresh()
*/
+ @Override
public void refresh() {
super.refresh();
int direction = ((FigMessage) getPanelTarget()).getArrow();
@@ -89,12 +88,10 @@
getPanelTarget().endTrans();
}
- ////////////////////////////////////////////////////////////////
- // event handling
-
/*
* @see java.awt.event.ItemListener#itemStateChanged(java.awt.event.ItemEvent)
*/
+ @Override
public void itemStateChanged(ItemEvent e) {
Object src = e.getSource();
if (src == arrowField)
@@ -103,5 +100,5 @@
super.itemStateChanged(e);
}
-} /* end class StylePanelFigMessage */
+}
Modified: trunk/src_new/org/argouml/uml/reveng/ConfigPanelExtension.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/reveng/ConfigPanelExtension.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/reveng/ConfigPanelExtension.java&p2=trunk/src_new/org/argouml/uml/reveng/ConfigPanelExtension.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/ConfigPanelExtension.java (original)
+++ trunk/src_new/org/argouml/uml/reveng/ConfigPanelExtension.java 2007-05-26 14:28:01-0700
@@ -27,16 +27,14 @@
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Insets;
-import java.util.StringTokenizer;
import javax.swing.ButtonGroup;
import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
-import javax.swing.JTextField;
import javax.swing.JRadioButton;
+import javax.swing.JTextField;
-import org.argouml.application.api.Argo;
import org.argouml.configuration.Configuration;
import org.argouml.configuration.ConfigurationKey;
import org.argouml.i18n.Translator;
@@ -52,7 +50,8 @@
* 1: associations
*/
public static final ConfigurationKey KEY_IMPORT_EXTENDED_MODEL_ATTR =
- Configuration.makeKey("import", "extended", "java", "model", "attributes");
+ Configuration
+ .makeKey("import", "extended", "java", "model", "attributes");
/**
* Key for RE extended settings: model arrays as:
@@ -67,28 +66,32 @@
* if to model them as associations with multiplicity *.
*/
public static final ConfigurationKey KEY_IMPORT_EXTENDED_COLLECTIONS_FLAG =
- Configuration.makeKey("import", "extended", "java", "collections", "flag");
+ Configuration
+ .makeKey("import", "extended", "java", "collections", "flag");
/**
* Key for RE extended settings: list of collections, that will be modelled
* as associations with multiplicity *.
*/
public static final ConfigurationKey KEY_IMPORT_EXTENDED_COLLECTIONS_LIST =
- Configuration.makeKey("import", "extended", "java", "collections", "list");
+ Configuration
+ .makeKey("import", "extended", "java", "collections", "list");
/**
* Key for RE extended settings: flag for modelling of listed collections,
* if to model them as ordered associations with multiplicity *.
*/
public static final ConfigurationKey KEY_IMPORT_EXTENDED_ORDEREDCOLLS_FLAG =
- Configuration.makeKey("import", "extended", "java", "orderedcolls", "flag");
+ Configuration
+ .makeKey("import", "extended", "java", "orderedcolls", "flag");
/**
* Key for RE extended settings: list of collections, that will be modelled
* as ordered associations with multiplicity *.
*/
public static final ConfigurationKey KEY_IMPORT_EXTENDED_ORDEREDCOLLS_LIST =
- Configuration.makeKey("import", "extended", "java", "orderedcolls", "list");
+ Configuration
+ .makeKey("import", "extended", "java", "orderedcolls", "list");
private JPanel configPanel;
@@ -162,7 +165,8 @@
datatype.setSelected(true);
}
- String s = Configuration.getString(KEY_IMPORT_EXTENDED_COLLECTIONS_FLAG);
+ String s = Configuration
+ .getString(KEY_IMPORT_EXTENDED_COLLECTIONS_FLAG);
boolean flag = ("true".equals(s));
modelcollections =
new JCheckBox(Translator.localize(
@@ -221,7 +225,8 @@
gbc.weightx = 1.0;
gbc.weighty = 0.0;
gbc.anchor = GridBagConstraints.NORTHWEST;
- gbc.fill = fill ? GridBagConstraints.HORIZONTAL : GridBagConstraints.NONE;
+ gbc.fill = fill ? GridBagConstraints.HORIZONTAL
+ : GridBagConstraints.NONE;
gbc.insets =
new Insets(
topInset ? 5 : 0,
Modified: trunk/src_new/org/argouml/uml/reveng/FileImportUtils.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/reveng/FileImportUtils.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/reveng/FileImportUtils.java&p2=trunk/src_new/org/argouml/uml/reveng/FileImportUtils.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/FileImportUtils.java (original)
+++ trunk/src_new/org/argouml/uml/reveng/FileImportUtils.java 2007-05-26 14:28:01-0700
@@ -91,7 +91,7 @@
if (recurse) {
if (doneDirectories.indexOf(curFile) >= 0
|| toDoDirectories.indexOf(curFile) >= 0) {
- ; // This one is already seen or to be seen.
+ // This one is already seen or to be seen.
} else {
toDoDirectories.add(curFile);
}
Modified: trunk/src_new/org/argouml/uml/reveng/Import.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/reveng/Import.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/reveng/Import.java&p2=trunk/src_new/org/argouml/uml/reveng/Import.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/reveng/Import.java (original)
+++ trunk/src_new/org/argouml/uml/reveng/Import.java 2007-05-26 14:28:01-0700
@@ -1091,7 +1091,7 @@
}
} else if (e1.getActionCommand().equals(
JFileChooser.CANCEL_SELECTION)) {
- ; // TODO: What shall we do here?
+ // TODO: What shall we do here?
}
// bring the import classpath dialog to the front
importClasspathDialog.setVisible(true);
Modified: trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java&p2=trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/ui/ActionSequenceDiagram.java 2007-05-26 14:28:01-0700
@@ -24,7 +24,6 @@
package org.argouml.uml.ui;
-import org.argouml.kernel.ProjectManager;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.sequence.ui.UMLSequenceDiagram;
import org.argouml.uml.diagram.ui.UMLDiagram;
@@ -51,4 +50,4 @@
null);
}
-} /* end class ActionSequenceDiagram */
+}
Modified: trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java&p2=trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java (original)
+++ trunk/src_new/org/argouml/uml/ui/ActionSetSourcePath.java 2007-05-26 14:28:01-0700
@@ -31,7 +31,6 @@
import javax.swing.JFileChooser;
import org.argouml.i18n.Translator;
-import org.argouml.model.Facade;
import org.argouml.model.Model;
import org.argouml.ui.ArgoFrame;
import org.argouml.ui.targetmanager.TargetManager;
@@ -44,9 +43,6 @@
*/
public class ActionSetSourcePath extends UndoableAction {
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* The constructor.
*/
@@ -57,12 +53,11 @@
Translator.localize("action.set-source-path"));
}
- ////////////////////////////////////////////////////////////////
- // main methods
/*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent e) {
super.actionPerformed(e);
File f = getNewDirectory();
@@ -154,4 +149,4 @@
* The UID.
*/
private static final long serialVersionUID = -6455209886706784094L;
-} /* end class ActionSetSourcePath */
+}
Modified: trunk/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java&p2=trunk/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/ui/ActionUseCaseDiagram.java 2007-05-26 14:28:01-0700
@@ -25,7 +25,6 @@
package org.argouml.uml.ui;
import org.apache.log4j.Logger;
-import org.argouml.kernel.ProjectManager;
import org.argouml.model.Model;
import org.argouml.uml.diagram.DiagramFactory;
import org.argouml.uml.diagram.ui.UMLDiagram;
@@ -73,4 +72,4 @@
return validNamespace;
}
-} /* end class ActionUseCaseDiagram */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/collaborations/PropPanelAssociationRole.java 2007-05-26 14:28:01-0700
@@ -29,7 +29,6 @@
import javax.swing.JScrollPane;
import org.argouml.i18n.Translator;
-import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.diagram.ui.ActionAddMessage;
import org.argouml.uml.ui.ActionNavigateContainerElement;
import org.argouml.uml.ui.UMLComboBox2;
@@ -40,7 +39,6 @@
/**
* The properties panel for an AssociationRole.
- *
*/
public class PropPanelAssociationRole extends PropPanelAssociation {
@@ -53,6 +51,7 @@
* Construct a property panel for an AssociationRole.
*/
public PropPanelAssociationRole() {
+ // TODO: I18N
super("Association Role", ConfigLoader.getTabPropsOrientation());
addField(Translator.localize("label.name"),
@@ -88,4 +87,4 @@
addAction(getDeleteAction());
}
-} /* end class PropPanelAssociationRole */
+}
Modified: trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java&p2=trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java (original)
+++ trunk/src_new/org/argouml/uml/ui/behavior/use_cases/PropPanelUseCase.java 2007-05-26 14:28:01-0700
@@ -29,7 +29,6 @@
import javax.swing.JScrollPane;
import org.argouml.i18n.Translator;
-import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.ui.ActionNavigateNamespace;
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.UMLMutableLinkedList;
@@ -54,6 +53,7 @@
* Construct a property panel for a UseCase.
*/
public PropPanelUseCase() {
+ // TODO: I18N
super("UseCase",
lookupIcon("UseCase"),
ConfigLoader.getTabPropsOrientation());
@@ -120,4 +120,4 @@
* The UID.
*/
private static final long serialVersionUID = 8352300400553000518L;
-} /* end class PropPanelUseCase */
+}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationClass.java 2007-05-26 14:28:01-0700
@@ -28,7 +28,6 @@
import javax.swing.JScrollPane;
import org.argouml.i18n.Translator;
-import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.ui.ActionNavigateNamespace;
import org.argouml.uml.ui.UMLLinkedList;
import org.argouml.uml.ui.foundation.extension_mechanisms.ActionNewStereotype;
@@ -124,6 +123,7 @@
*
* @return JScrollPane
*/
+ @Override
public JScrollPane getOperationScroll() {
if (operationScroll == null) {
JList list = new UMLLinkedList(operationListModel);
@@ -137,6 +137,7 @@
*
* @return JScrollPane
*/
+ @Override
public JScrollPane getAttributeScroll() {
if (attributeScroll == null) {
JList list = new UMLLinkedList(attributeListModel);
@@ -145,4 +146,4 @@
return attributeScroll;
}
-} /* end class PropPanelAssociationClass */
+}
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAssociationEnd.java 2007-05-26 14:28:01-0700
@@ -30,7 +30,6 @@
import javax.swing.JScrollPane;
import org.argouml.i18n.Translator;
-import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.ui.ActionNavigateAssociation;
import org.argouml.uml.ui.ActionNavigateOppositeAssocEnd;
import org.argouml.uml.ui.UMLComboBox2;
@@ -119,7 +118,8 @@
/**
* Constructs the proppanel including initializing all scrollpanes, panels
* etc. but excluding placing them on the proppanel itself.
- *
+ * @param name name/title of the property panel
+ * @param orientation orientation of the panel
* @see org.argouml.uml.ui.PropPanel#PropPanel(String, Orientation)
*/
protected PropPanelAssociationEnd(String name, Orientation orientation) {
@@ -235,4 +235,4 @@
}
return multiplicityComboBox;
}
-} /* end class PropPanelAssociationEnd */
+}
\ No newline at end of file
Modified: trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java?view=diff&rev=12672&p1=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java&p2=trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java&r1=12671&r2=12672
==============================================================================
--- trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java (original)
+++ trunk/src_new/org/argouml/uml/ui/foundation/core/PropPanelAttribute.java 2007-05-26 14:28:01-0700
@@ -31,7 +31,6 @@
import org.argouml.i18n.Translator;
import org.argouml.model.Model;
-import org.argouml.ui.targetmanager.TargetManager;
import org.argouml.uml.ui.ActionNavigateContainerElement;
import org.argouml.uml.ui.ActionNavigateUpNextDown;
import org.argouml.uml.ui.ActionNavigateUpPreviousDown;
@@ -139,7 +138,8 @@
* @param container the container of UML user interface components
* @param propertyName the name of the property
*/
- public UMLInitialValueExpressionModel(UMLUserInterfaceContainer container,
+ public UMLInitialValueExpressionModel(
+ UMLUserInterfaceContainer container,
String propertyName) {
super(container, propertyName);
}
@@ -177,5 +177,5 @@
}
-} /* end class PropPanelAttribute */
+}
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.