Author: bobtarling
Date: 2011-04-17 11:10:26-0700
New Revision: 19252
Modified:
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAcceptEventPoly.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityEdge.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseEdge.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigGravityPoly.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/StereotypeDisplayer.java
trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java
Log:
Code style tidy up
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDiagram.java 2011-04-17 11:10:26-0700
@@ -1,6 +1,6 @@
/* $Id: $
*****************************************************************************
- * Copyright (c) 2010 Contributors - see below
+ * Copyright (c) 2010-2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -13,7 +13,6 @@
package org.argouml.activity2.diagram;
-import java.beans.PropertyVetoException;
import java.io.IOException;
import java.io.InputStream;
import java.util.ArrayList;
@@ -36,12 +35,10 @@
import org.argouml.uml.diagram.ui.ActionSetMode;
import org.argouml.uml.diagram.ui.RadioAction;
import org.argouml.uml.diagram.ui.UMLDiagram;
-import org.tigris.gef.base.Diagram;
import org.tigris.gef.base.LayerPerspective;
import org.tigris.gef.base.LayerPerspectiveMutable;
import org.tigris.gef.base.ModeCreatePolyEdge;
import org.tigris.gef.graph.MutableGraphModel;
-import org.tigris.gef.presentation.FigNode;
import org.w3c.dom.DOMException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/BaseDisplayState.java 2011-04-17 11:10:26-0700
@@ -1,6 +1,6 @@
/* $Id: $
*****************************************************************************
- * Copyright (c) 2010 Contributors - see below
+ * Copyright (c) 2010-2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -19,7 +19,6 @@
import org.argouml.notation2.NotationType;
import org.argouml.uml.diagram.DiagramSettings;
-import org.argouml.uml.diagram.ui.FigStereotypesGroup;
abstract class BaseDisplayState implements StereotypeDisplayer, NameDisplayer {
@@ -49,7 +48,10 @@
}
abstract Dimension getMinimumSize();
- abstract DiagramElement createBigPort(Rectangle rect, Color lineColor, Color fillColor);
+ abstract DiagramElement createBigPort(
+ final Rectangle rect,
+ final Color lineColor,
+ final Color fillColor);
DiagramElement getPort() {
return bigPort;
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/ConcavePentagonDisplayState.java 2011-04-17 11:10:26-0700
@@ -1,6 +1,6 @@
/* $Id: $
*****************************************************************************
- * Copyright (c) 2010 Contributors - see below
+ * Copyright (c) 2010-2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -21,7 +21,8 @@
import org.argouml.uml.diagram.DiagramSettings;
import org.tigris.gef.presentation.FigPoly;
-public class ConcavePentagonDisplayState extends BaseDisplayState implements StereotypeDisplayer, NameDisplayer {
+public class ConcavePentagonDisplayState extends BaseDisplayState
+ implements StereotypeDisplayer, NameDisplayer {
private static final int PADDING = 8;
@@ -44,7 +45,10 @@
return new Dimension(w, h);
}
- protected DiagramElement createBigPort(Rectangle rect, Color lineColor, Color fillColor) {
+ protected DiagramElement createBigPort(
+ final Rectangle rect,
+ final Color lineColor,
+ final Color fillColor) {
final Poly poly = new Poly();
final int[] xs = new int[6];
final int[] ys = new int[6];
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAcceptEventPoly.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAcceptEventPoly.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAcceptEventPoly.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigAcceptEventPoly.java 2011-04-17 11:10:26-0700
@@ -1,6 +1,6 @@
/* $Id: $
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -18,9 +18,6 @@
import java.awt.Polygon;
import java.util.List;
-import org.tigris.gef.base.Geometry;
-import org.tigris.gef.presentation.FigPoly;
-
/**
* A FigPoly to which edges gravitate to the perimeter instead of the points
* @author Bob Tarling
@@ -54,12 +51,16 @@
*/
@Override
public Point getClosestPoint(Point anotherPt) {
- if (anotherPt.x < getX() && anotherPt.y >= getY() && anotherPt.y < getY() + getHeight()) {
+ if (anotherPt.x < getX()
+ && anotherPt.y >= getY()
+ && anotherPt.y < getY() + getHeight()) {
+ final int x;
if (anotherPt.y < getY() + getHeight() / 2) {
- return new Point(getX() + (anotherPt.y - getY()), anotherPt.y);
+ x = getX() + (anotherPt.y - getY());
} else {
- return new Point(getX() + ((getY() + getHeight()) - anotherPt.y), anotherPt.y);
+ x = getX() + ((getY() + getHeight()) - anotherPt.y);
}
+ return new Point(x, anotherPt.y);
} else {
return super.getClosestPoint(anotherPt);
}
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityEdge.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityEdge.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigActivityEdge.java 2011-04-17 11:10:26-0700
@@ -1,6 +1,6 @@
/* $Id: $
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -14,7 +14,6 @@
package org.argouml.activity2.diagram;
import org.argouml.uml.diagram.DiagramSettings;
-import org.argouml.uml.diagram.ui.PathItemPlacement;
import org.tigris.gef.presentation.ArrowHeadGreater;
class FigActivityEdge extends FigBaseEdge {
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseEdge.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseEdge.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseEdge.java 2011-04-17 11:10:26-0700
@@ -1,6 +1,6 @@
/* $Id: $
*****************************************************************************
- * Copyright (c) 2010 Contributors - see below
+ * Copyright (c) 2010-2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigBaseNode.java 2011-04-17 11:10:26-0700
@@ -1,6 +1,6 @@
/* $Id: $
*****************************************************************************
- * Copyright (c) 2010 Contributors - see below
+ * Copyright (c) 2010-2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigGravityPoly.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigGravityPoly.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigGravityPoly.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/FigGravityPoly.java 2011-04-17 11:10:26-0700
@@ -1,6 +1,6 @@
/* $Id: $
*****************************************************************************
- * Copyright (c) 2009 Contributors - see below
+ * Copyright (c) 2009-2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -38,7 +38,8 @@
@Override
public Point getClosestPoint(Point anotherPt) {
- return Geometry.ptClosestTo(getXs(), getYs(), getYs().length, anotherPt);
+ return Geometry.ptClosestTo(
+ getXs(), getYs(), getYs().length, anotherPt);
}
public List getGravityPoints() {
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/PentagonDisplayState.java 2011-04-17 11:10:26-0700
@@ -1,6 +1,6 @@
/* $Id: $
*****************************************************************************
- * Copyright (c) 2010 Contributors - see below
+ * Copyright (c) 2010-2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -20,7 +20,8 @@
import org.argouml.uml.diagram.DiagramSettings;
import org.tigris.gef.presentation.FigPoly;
-public class PentagonDisplayState extends BaseDisplayState implements StereotypeDisplayer, NameDisplayer {
+public class PentagonDisplayState extends BaseDisplayState
+ implements StereotypeDisplayer, NameDisplayer {
private static final int PADDING = 8;
@@ -43,7 +44,10 @@
return new Dimension(w, h);
}
- protected DiagramElement createBigPort(Rectangle rect, Color lineColor, Color fillColor) {
+ protected DiagramElement createBigPort(
+ final Rectangle rect,
+ final Color lineColor,
+ final Color fillColor) {
final Poly poly = new Poly();
final int[] xs = new int[6];
final int[] ys = new int[6];
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RRectDisplayState.java 2011-04-17 11:10:26-0700
@@ -19,7 +19,6 @@
import org.argouml.uml.diagram.DiagramSettings;
import org.tigris.gef.presentation.FigRRect;
-import org.tigris.gef.presentation.FigRect;
/**
* The state for displaying a node as a rounded rectangle
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/RectDisplayState.java 2011-04-17 11:10:26-0700
@@ -1,6 +1,6 @@
/* $Id: $
*****************************************************************************
- * Copyright (c) 2010 Contributors - see below
+ * Copyright (c) 2010-2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -17,10 +17,10 @@
import java.awt.Rectangle;
import org.argouml.uml.diagram.DiagramSettings;
-import org.tigris.gef.presentation.FigPoly;
import org.tigris.gef.presentation.FigRect;
-public class RectDisplayState extends BaseDisplayState implements StereotypeDisplayer, NameDisplayer {
+public class RectDisplayState extends BaseDisplayState
+ implements StereotypeDisplayer, NameDisplayer {
private static final int PADDING = 8;
@@ -47,7 +47,10 @@
- DiagramElement createBigPort(Rectangle rect, Color lineColor, Color fillColor) {
+ DiagramElement createBigPort(
+ final Rectangle rect,
+ final Color lineColor,
+ final Color fillColor) {
return new Rect(
rect.x, rect.y, rect.width, rect.height, lineColor, fillColor);
}
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/StereotypeDisplayer.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/StereotypeDisplayer.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/StereotypeDisplayer.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/StereotypeDisplayer.java 2011-04-17 11:10:26-0700
@@ -1,6 +1,6 @@
/* $Id: $
*****************************************************************************
- * Copyright (c) 2010 Contributors - see below
+ * Copyright (c) 2010-2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Modified: trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java?view=diff&pathrev=19252&r1=19251&r2=19252
==============================================================================
--- trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java (original)
+++ trunk/src/argouml-core-diagrams-activity2/src/org/argouml/activity2/diagram/UMLActivityDiagram.java 2011-04-17 11:10:26-0700
@@ -1,6 +1,6 @@
/* $Id: $
*****************************************************************************
- * Copyright (c) 2010 Contributors - see below
+ * Copyright (c) 2010-2011 Contributors - see below
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -48,13 +48,6 @@
}
@Override
- public void initialize(Object owner) {
- super.initialize(owner);
- ActivityDiagramGraphModel gm =
- (ActivityDiagramGraphModel) getGraphModel();
- }
-
- @Override
public String getLabelName() {
return Translator.localize("label.activity-diagram");
}
@@ -85,15 +78,16 @@
figNode = new FigBaseNode(modelElement, bounds, settings);
final String style;
if (Model.getFacade().isAObjectNode(modelElement)) {
- style="rect";
+ style = "rect";
} else if (Model.getFacade().isASendSignalAction(modelElement)) {
- style="pentagon";
+ style = "pentagon";
} else if (Model.getFacade().isAAcceptEventAction(modelElement)) {
- style="concave-pentagon";
+ style = "concave-pentagon";
} else {
- style="rrect";
+ style = "rrect";
}
- DiagramElementBuilder.buildDiagramElement((FigBaseNode) figNode, style, modelElement, settings);
+ DiagramElementBuilder.buildDiagramElement(
+ (FigBaseNode) figNode, style, modelElement, settings);
}
return figNode;
------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=2720812
To unsubscribe from this discussion, e-mail: [[email protected]].
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.