Author: tfmorris
Date: 2007-07-10 10:56:36-0700
New Revision: 13027
Modified:
trunk/src_new/org/argouml/application/events/ArgoHelpEvent.java
trunk/src_new/org/argouml/ui/SplashScreen.java
trunk/src_new/org/argouml/ui/cmd/ActionNotation.java
trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java
trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java
trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java
Log:
Style cleanups
Modified: trunk/src_new/org/argouml/application/events/ArgoHelpEvent.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/application/events/ArgoHelpEvent.java?view=diff&rev=13027&p1=trunk/src_new/org/argouml/application/events/ArgoHelpEvent.java&p2=trunk/src_new/org/argouml/application/events/ArgoHelpEvent.java&r1=13026&r2=13027
==============================================================================
--- trunk/src_new/org/argouml/application/events/ArgoHelpEvent.java (original)
+++ trunk/src_new/org/argouml/application/events/ArgoHelpEvent.java 2007-07-10 10:56:36-0700
@@ -50,7 +50,10 @@
*
* @return the first id reserved for events.
*/
- public int getEventStartRange() { return ANY_HELP_EVENT; }
+ @Override
+ public int getEventStartRange() {
+ return ANY_HELP_EVENT;
+ }
/**
* @return Returns the helpText.
Modified: trunk/src_new/org/argouml/ui/SplashScreen.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/SplashScreen.java?view=diff&rev=13027&p1=trunk/src_new/org/argouml/ui/SplashScreen.java&p2=trunk/src_new/org/argouml/ui/SplashScreen.java&r1=13026&r2=13027
==============================================================================
--- trunk/src_new/org/argouml/ui/SplashScreen.java (original)
+++ trunk/src_new/org/argouml/ui/SplashScreen.java 2007-07-10 10:56:36-0700
@@ -39,9 +39,6 @@
/**
* The splash screen.
- *
- * TODO: JWindow? I don't want a frame or close widgets.
- *
*/
public class SplashScreen extends JWindow implements IStatusBar {
@@ -95,15 +92,16 @@
/**
* @return the status bar of this dialog
*/
- public StatusBar getStatusBar() { return statusBar; }
-
- ////////////////////////////////////////////////////////////////
- // IStatusBar
+ public StatusBar getStatusBar() {
+ return statusBar;
+ }
/*
* @see org.tigris.gef.ui.IStatusBar#showStatus(java.lang.String)
*/
- public void showStatus(String s) { statusBar.showStatus(s); }
+ public void showStatus(String s) {
+ statusBar.showStatus(s);
+ }
/*
* Override paint so we can set a flag the first time we're called
@@ -111,6 +109,7 @@
* painted.
* @see java.awt.Component#paint(java.awt.Graphics)
*/
+ @Override
public void paint(Graphics g) {
super.paint(g);
if (!paintCalled) {
@@ -135,4 +134,4 @@
return paintCalled;
}
-} /* end class SplashScreen */
+}
Modified: trunk/src_new/org/argouml/ui/cmd/ActionNotation.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/cmd/ActionNotation.java?view=diff&rev=13027&p1=trunk/src_new/org/argouml/ui/cmd/ActionNotation.java&p2=trunk/src_new/org/argouml/ui/cmd/ActionNotation.java&r1=13026&r2=13027
==============================================================================
--- trunk/src_new/org/argouml/ui/cmd/ActionNotation.java (original)
+++ trunk/src_new/org/argouml/ui/cmd/ActionNotation.java 2007-07-10 10:56:36-0700
@@ -89,7 +89,8 @@
if (o instanceof NotationName) {
NotationName nn = (NotationName) o;
if (key.equals(nn.getTitle())) {
- Project p = ProjectManager.getManager().getCurrentProject();
+ Project p = ProjectManager.getManager()
+ .getCurrentProject();
p.getProjectSettings().setNotationLanguage(nn);
break;
}
Modified: trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java?view=diff&rev=13027&p1=trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java&p2=trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java&r1=13026&r2=13027
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ProjectMemberDiagram.java 2007-07-10 10:56:36-0700
@@ -37,14 +37,8 @@
private static final String MEMBER_TYPE = "pgml";
private static final String FILE_EXT = ".pgml";
- ////////////////////////////////////////////////////////////////
- // instance variables
-
private ArgoDiagram diagram;
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* The constructor.
*
@@ -58,9 +52,6 @@
setDiagram(d);
}
- ////////////////////////////////////////////////////////////////
- // accessors
-
/**
* @return the diagram
*/
@@ -78,6 +69,7 @@
/*
* @see org.argouml.kernel.AbstractProjectMember#getZipFileExtension()
*/
+ @Override
public String getZipFileExtension() {
return FILE_EXT;
}
@@ -96,4 +88,4 @@
return diagram.repair();
}
-} /* end class ProjectMemberDiagram */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java?view=diff&rev=13027&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java&r1=13026&r2=13027
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionAddConcurrentRegion.java 2007-07-10 10:56:36-0700
@@ -59,7 +59,7 @@
////////////////////////////////////////////////////////////////
// static variables
- /** logger */
+ /** logger */
private static final Logger LOG =
Logger.getLogger(ActionAddConcurrentRegion.class);
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=13027&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java&r1=13026&r2=13027
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingEdge.java 2007-07-10 10:56:36-0700
@@ -62,9 +62,11 @@
public void actionPerformed(ActionEvent arg0) {
super.actionPerformed(arg0);
// we have an edge (the UML modelelement!)
- if (edge == null) return;
+ if (edge == null) {
+ return;
+ }
// let's test which situation we have. 3 Possibilities:
- // 1. The nodes are allready on the diagram, we can use
+ // 1. The nodes are already on the diagram, we can use
// canAddEdge for this.
// 2. One of the nodes is already on the diagram. The other
// has to be added.
@@ -90,7 +92,9 @@
Object target = TargetManager.getInstance().getModelTarget();
ArgoDiagram dia = ProjectManager.getManager().getCurrentProject().
getActiveDiagram();
- if (dia == null) return false;
+ if (dia == null) {
+ return false;
+ }
MutableGraphModel gm = (MutableGraphModel) dia.getGraphModel();
return gm.canAddEdge(target);
}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java?view=diff&rev=13027&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java&r1=13026&r2=13027
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionAddExistingNode.java 2007-07-10 10:56:36-0700
@@ -64,7 +64,9 @@
Object target = TargetManager.getInstance().getTarget();
ArgoDiagram dia = ProjectManager.getManager().
getCurrentProject().getActiveDiagram();
- if (dia == null) return false;
+ if (dia == null) {
+ return false;
+ }
MutableGraphModel gm = (MutableGraphModel) dia.getGraphModel();
return gm.canAddNode(target);
}
@@ -77,4 +79,4 @@
AddExistingNodeCommand cmd = new AddExistingNodeCommand(object);
cmd.execute();
}
-} /* end class ActionAddExistingNode */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java?view=diff&rev=13027&p1=trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java&r1=13026&r2=13027
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/ActionEdgesDisplay.java 2007-07-10 10:56:36-0700
@@ -51,9 +51,6 @@
*/
public class ActionEdgesDisplay extends UndoableAction {
- ////////////////////////////////////////////////////////////////
- // static variables
-
// compartments
private static UndoableAction showEdges = new ActionEdgesDisplay(true,
Translator.localize("menu.popup.add.all-relations"));
@@ -62,9 +59,6 @@
private boolean show;
- ////////////////////////////////////////////////////////////////
- // constructors
-
/**
* The constructor.
*
@@ -78,16 +72,13 @@
show = showEdge;
}
-
- // //////////////////////////////////////////////////////////////
- // main methods
-
/*
* TODO: Support commentEdges.
* TODO: Support associations to self.
*
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
*/
+ @Override
public void actionPerformed(ActionEvent ae) {
super.actionPerformed(ae);
ArgoDiagram d = ProjectManager.getManager()
@@ -138,6 +129,7 @@
* @return true if the action is enabled
* @see org.tigris.gef.undo.UndoableAction#isEnabled()
*/
+ @Override
public boolean isEnabled() {
return true;
}
@@ -158,7 +150,7 @@
return hideEdges;
}
-} /* end class ActionEdgesDisplay */
+}
Modified: trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java?view=diff&rev=13027&p1=trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java&p2=trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java&r1=13026&r2=13027
==============================================================================
--- trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java (original)
+++ trunk/src_new/org/argouml/uml/diagram/ui/AddExistingNodeCommand.java 2007-07-10 10:56:36-0700
@@ -48,9 +48,6 @@
*/
public class AddExistingNodeCommand implements Command, GraphFactory {
- ////////////////////////////////////////////////////////////////
- // instance variables
-
/**
* The UML object to be added to the diagram.
*/
@@ -92,9 +89,6 @@
count = cnt;
}
- ////////////////////////////////////////////////////////////////
- // constructor
-
/*
* @see org.tigris.gef.base.Command#execute()
*/
@@ -192,4 +186,4 @@
return object;
}
-} /* end class ActionAddExistingNode */
+}
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.