Author: tfmorris
Date: 2008-04-25 16:23:19-0700
New Revision: 14472
Modified:
trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java
trunk/src/argouml-app/src/org/argouml/ui/AbstractArgoJPanel.java
trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java
trunk/src/argouml-app/src/org/argouml/uml/TMResults.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java
trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java
trunk/src/argouml-app/tests/org/argouml/cognitive/TestToDoItemList.java
Log:
Style cleanup
Modified: trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java?view=diff&rev=14472&p1=trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java&p2=trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java&r1=14471&r2=14472
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java (original)
+++ trunk/src/argouml-app/src/org/argouml/persistence/PGMLStackParser.java 2008-04-25 16:23:19-0700
@@ -35,10 +35,6 @@
import java.util.StringTokenizer;
import org.apache.log4j.Logger;
-import org.argouml.gefext.ArgoFigCircle;
-import org.argouml.gefext.ArgoFigPoly;
-import org.argouml.gefext.ArgoFigRRect;
-import org.argouml.gefext.ArgoFigRect;
import org.argouml.uml.diagram.AttributesCompartmentContainer;
import org.argouml.uml.diagram.ExtensionsCompartmentContainer;
import org.argouml.uml.diagram.OperationsCompartmentContainer;
@@ -48,27 +44,17 @@
import org.argouml.uml.diagram.activity.ui.FigPool;
import org.argouml.uml.diagram.deployment.ui.FigMNodeInstance;
import org.argouml.uml.diagram.deployment.ui.FigNodeInstance;
-import org.argouml.uml.diagram.ui.ArgoFigText;
import org.argouml.uml.diagram.ui.FigEdgeModelElement;
import org.argouml.uml.diagram.ui.FigEdgePort;
import org.tigris.gef.base.Diagram;
import org.tigris.gef.persistence.pgml.Container;
import org.tigris.gef.persistence.pgml.FigEdgeHandler;
import org.tigris.gef.persistence.pgml.FigGroupHandler;
-import org.tigris.gef.persistence.pgml.FigLineHandler;
-import org.tigris.gef.persistence.pgml.FigPolyHandler;
-import org.tigris.gef.persistence.pgml.FigTextHandler;
import org.tigris.gef.persistence.pgml.HandlerStack;
import org.tigris.gef.presentation.Fig;
-import org.tigris.gef.presentation.FigCircle;
import org.tigris.gef.presentation.FigEdge;
import org.tigris.gef.presentation.FigGroup;
-import org.tigris.gef.presentation.FigLine;
import org.tigris.gef.presentation.FigNode;
-import org.tigris.gef.presentation.FigPoly;
-import org.tigris.gef.presentation.FigRRect;
-import org.tigris.gef.presentation.FigText;
-import org.tigris.gef.util.ColorFactory;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
Modified: trunk/src/argouml-app/src/org/argouml/ui/AbstractArgoJPanel.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/AbstractArgoJPanel.java?view=diff&rev=14472&p1=trunk/src/argouml-app/src/org/argouml/ui/AbstractArgoJPanel.java&p2=trunk/src/argouml-app/src/org/argouml/ui/AbstractArgoJPanel.java&r1=14471&r2=14472
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/AbstractArgoJPanel.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/AbstractArgoJPanel.java 2008-04-25 16:23:19-0700
@@ -36,8 +36,8 @@
* after 0.28 is released using the current numbering scheme).
*/
@Deprecated
-public abstract class AbstractArgoJPanel
-extends org.argouml.application.api.AbstractArgoJPanel {
+public abstract class AbstractArgoJPanel extends
+ org.argouml.application.api.AbstractArgoJPanel {
/**
* The constructor.
*
Modified: trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java?view=diff&rev=14472&p1=trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java&p2=trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java&r1=14471&r2=14472
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java (original)
+++ trunk/src/argouml-app/src/org/argouml/ui/explorer/ExplorerPopup.java 2008-04-25 16:23:19-0700
@@ -86,7 +86,7 @@
private JMenu createDiagrams =
new JMenu(menuLocalize("menu.popup.create-diagram"));
- private final Logger LOG =
+ private static final Logger LOG =
Logger.getLogger(ExplorerPopup.class);
/**
@@ -381,9 +381,10 @@
}
}
if (classifierRolesOnly) {
- menuItems.add(new OrderedMenuItem(new ActionCreateAssociationRole(
- Model.getMetaTypes().getAssociationRole(),
- targets)));
+ menuItems.add(new OrderedMenuItem(
+ new ActionCreateAssociationRole(
+ Model.getMetaTypes().getAssociationRole(),
+ targets)));
} else if (!classifierRoleFound) {
boolean classifiersOnly = true;
for (Iterator it = targets.iterator();
@@ -449,8 +450,7 @@
MODEL_ELEMENT_MENUITEMS[iter],
target,
(String)
- MODEL_ELEMENT_MENUITEMS[iter + 1]
- )));
+ MODEL_ELEMENT_MENUITEMS[iter + 1])));
}
}
}
@@ -638,7 +638,7 @@
}
public int compareTo(Object o) {
- JMenuItem other = (JMenuItem)o;
+ JMenuItem other = (JMenuItem) o;
return toString().compareTo(other.toString());
}
}
@@ -659,7 +659,7 @@
}
public int compareTo(Object o) {
- JMenuItem other = (JMenuItem)o;
+ JMenuItem other = (JMenuItem) o;
return toString().compareTo(other.toString());
}
}
@@ -677,10 +677,7 @@
private Object metaType;
private Object source;
private Object dest;
-
- private final Logger LOG =
- Logger.getLogger(ActionCreateModelElement.class);
-
+
public ActionCreateModelElement(
Object theMetaType,
Object theSource,
@@ -724,10 +721,7 @@
private Object metaType;
private List classifiers;
-
- private final Logger LOG =
- Logger.getLogger(ActionCreateModelElement.class);
-
+
public ActionCreateAssociation(
Object theMetaType,
List classifiersList) {
@@ -774,9 +768,6 @@
private Object metaType;
private List classifierRoles;
- private final Logger LOG =
- Logger.getLogger(ActionCreateModelElement.class);
-
public ActionCreateAssociationRole(
Object theMetaType,
List classifierRolesList) {
Modified: trunk/src/argouml-app/src/org/argouml/uml/TMResults.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/TMResults.java?view=diff&rev=14472&p1=trunk/src/argouml-app/src/org/argouml/uml/TMResults.java&p2=trunk/src/argouml-app/src/org/argouml/uml/TMResults.java&r1=14471&r2=14472
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/TMResults.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/TMResults.java 2008-04-25 16:23:19-0700
@@ -161,7 +161,7 @@
if (Model.getFacade().isAModelElement(rowObj)) {
Diagram d = null;
if (diagrams != null) {
- d = (Diagram) diagrams.get(row);
+ d = diagrams.get(row);
}
switch (col) {
case 0 : // the name of this type of ModelElement
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java?view=diff&rev=14472&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java&r1=14471&r2=14472
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/sequence/ui/FigHead.java 2008-04-25 16:23:19-0700
@@ -26,7 +26,6 @@
import java.awt.Color;
import java.awt.Dimension;
-import java.util.Iterator;
import java.util.List;
import org.argouml.uml.diagram.ui.ArgoFigGroup;
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java?view=diff&rev=14472&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java&r1=14471&r2=14472
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/state/ui/FigHistoryState.java 2008-04-25 16:23:19-0700
@@ -213,7 +213,7 @@
* @see java.awt.event.MouseListener#mouseClicked(java.awt.event.MouseEvent)
*/
@Override
- public void mouseClicked(MouseEvent me) {
+ public void mouseClicked(MouseEvent me) {
// ignored
}
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java?view=diff&rev=14472&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java&r1=14471&r2=14472
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigComment.java 2008-04-25 16:23:19-0700
@@ -708,7 +708,7 @@
* @see org.tigris.gef.presentation.Fig#getClosestPoint(java.awt.Point)
*/
@Override
- public Point getClosestPoint(Point anotherPt) {
+ public Point getClosestPoint(Point anotherPt) {
Rectangle r = getBounds();
int[] xs = {
r.x, r.x + r.width - dogear, r.x + r.width,
Modified: trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java?view=diff&rev=14472&p1=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java&p2=trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java&r1=14471&r2=14472
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java (original)
+++ trunk/src/argouml-app/src/org/argouml/uml/diagram/static_structure/ui/FigSignal.java 2008-04-25 16:23:19-0700
@@ -30,7 +30,6 @@
import java.beans.PropertyChangeEvent;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Iterator;
import java.util.Vector;
import org.argouml.model.AssociationChangeEvent;
Modified: trunk/src/argouml-app/tests/org/argouml/cognitive/TestToDoItemList.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/tests/org/argouml/cognitive/TestToDoItemList.java?view=diff&rev=14472&p1=trunk/src/argouml-app/tests/org/argouml/cognitive/TestToDoItemList.java&p2=trunk/src/argouml-app/tests/org/argouml/cognitive/TestToDoItemList.java&r1=14471&r2=14472
==============================================================================
--- trunk/src/argouml-app/tests/org/argouml/cognitive/TestToDoItemList.java (original)
+++ trunk/src/argouml-app/tests/org/argouml/cognitive/TestToDoItemList.java 2008-04-25 16:23:19-0700
@@ -27,8 +27,6 @@
import junit.framework.TestCase;
import org.argouml.model.InitializeModel;
-import org.argouml.cognitive.ToDoItem;
-import org.argouml.cognitive.ToDoList;
/**
* Testing the creation of a ToDoItemList.
@@ -40,8 +38,8 @@
*
* @param name the name of the test.
*/
- public TestToDoItemList(String arg0) {
- super(arg0);
+ public TestToDoItemList(String name) {
+ super(name);
}
/*
@@ -69,7 +67,8 @@
String moreInfo = "http://argouml.tigris.org/test";
Critic critic = new Critic();
critic.setHeadline(headline);
- ToDoItem item = new ToDoItem(critic, headline, priority, description, moreInfo);
+ ToDoItem item = new ToDoItem(critic, headline, priority, description,
+ moreInfo);
// initialize the ToDoList
ToDoList list = new ToDoList();
@@ -79,17 +78,19 @@
// redundantly add item again which should be ignored
list.addElement(item);
-
+
// size should be 1 since addition of second item would have been ignored
- assertTrue("ToDoList.size() is incorrect", list.size() == 1);
-
+ assertTrue("ToDoList.size() is incorrect", list.size() == 1);
+
// retrieve item
- assertTrue("ToDoItem.get(0) did not return correct item", list.size() > 0 && list.get(0) == item);
-
+ assertTrue("ToDoItem.get(0) did not return correct item",
+ list.size() > 0 && list.get(0) == item);
+
// remove item
- assertTrue("ToDoItem.removeElement(item) failed to remove item", list.removeElement(item));
-
+ assertTrue("ToDoItem.removeElement(item) failed to remove item", list
+ .removeElement(item));
+
// size should be 0 since item was removed
- assertTrue("ToDoList.size() is incorrect", list.size() == 0);
+ assertTrue("ToDoList.size() is incorrect", list.size() == 0);
}
}
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.