From 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 Mon Sep 17 00:00:00 2001 From: abranson Date: Thu, 4 Aug 2011 00:42:34 +0200 Subject: More code cleanup: Refactored Entity Proxy Subscription to handle generics better Rewrote RemoteMap to use TreeMap instead of the internal array for order. It now sorts its keys by number if they parse, else as strings. Removed a no-longer-in-progress outcome form class --- source/com/c2kernel/lifecycle/gui/model/WfDefGraphPanel.java | 3 ++- source/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java | 3 ++- source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java | 5 ++++- .../com/c2kernel/lifecycle/gui/model/WfVertexDefOutlineCreator.java | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) mode change 100755 => 100644 source/com/c2kernel/lifecycle/gui/model/WfDefGraphPanel.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/gui/model/WfVertexDefOutlineCreator.java (limited to 'source/com/c2kernel/lifecycle/gui/model') diff --git a/source/com/c2kernel/lifecycle/gui/model/WfDefGraphPanel.java b/source/com/c2kernel/lifecycle/gui/model/WfDefGraphPanel.java old mode 100755 new mode 100644 index 973fcbf..e0f4f65 --- a/source/com/c2kernel/lifecycle/gui/model/WfDefGraphPanel.java +++ b/source/com/c2kernel/lifecycle/gui/model/WfDefGraphPanel.java @@ -18,6 +18,7 @@ public class WfDefGraphPanel extends GraphPanel super(d,v); } // Draws the highlight of the specified edge + @Override protected void drawEdgeHighlight(Graphics2D g2d, DirectedEdge edge) { GraphPoint originPoint = edge.getOriginPoint(); @@ -49,7 +50,7 @@ public class WfDefGraphPanel extends GraphPanel int minX = midPoint.x - 10; int minY = midPoint.y - 10; int maxX = midPoint.x + 10; - int maxY = midPoint.y + 10; + int maxY = midPoint.y + 10; g2d.drawLine(minX, minY, maxX, minY); g2d.drawLine(maxX, minY, maxX, maxY); g2d.drawLine(maxX, maxY, minX, maxY); diff --git a/source/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java b/source/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java old mode 100755 new mode 100644 index d6fd41c..6e6727a --- a/source/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java +++ b/source/com/c2kernel/lifecycle/gui/model/WfEdgeDefFactory.java @@ -8,6 +8,7 @@ import com.c2kernel.lifecycle.NextDef; import com.c2kernel.lifecycle.WfVertexDef; public class WfEdgeDefFactory implements EdgeFactory { + @Override public void create( GraphModelManager graphModelManager, Vertex origin, @@ -20,7 +21,7 @@ public class WfEdgeDefFactory implements EdgeFactory graphModelManager.getModel().addEdgeAndCreateId(nextDef, origin, terminus); } } - private boolean validCreation(GraphModelManager graphModelManager, Vertex origin, Vertex terminus) + private static boolean validCreation(GraphModelManager graphModelManager, Vertex origin, Vertex terminus) { DirectedEdge[] connectingEdgesAToB = graphModelManager.getModel().getConnectingEdges(origin.getID(), terminus.getID()); DirectedEdge[] connectingEdgesBToA = graphModelManager.getModel().getConnectingEdges(terminus.getID(), origin.getID()); diff --git a/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java b/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java index 2ef9508..da59efd 100644 --- a/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java +++ b/source/com/c2kernel/lifecycle/gui/model/WfVertexDefFactory.java @@ -20,6 +20,7 @@ import com.c2kernel.utils.Resource; public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue { protected CompositeActivityDef mCompositeActivityDef = null; + @Override public void create(GraphModelManager graphModelManager, Point location, TypeNameAndConstructionInfo typeNameAndConstructionInfo) { String vertexTypeId = null; @@ -46,7 +47,8 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue mCompositeActivityDef.newChild("", vertexTypeId, location); } } - public void loadThisWorkflow(String newName, HashMap hashMap) + @Override + public void loadThisWorkflow(String newName, HashMap hashMap) { String vertexTypeId = (String) hashMap.get("P1"); Point location = (Point) hashMap.get("P2"); @@ -86,6 +88,7 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue mCompositeActivityDef.newChild(newName, vertexTypeId, location); } } + @Override public void setCreationContext(Object newContext) { if (newContext != null && newContext instanceof CompositeActivityDef) diff --git a/source/com/c2kernel/lifecycle/gui/model/WfVertexDefOutlineCreator.java b/source/com/c2kernel/lifecycle/gui/model/WfVertexDefOutlineCreator.java old mode 100755 new mode 100644 index 3727f35..63d3b2f --- a/source/com/c2kernel/lifecycle/gui/model/WfVertexDefOutlineCreator.java +++ b/source/com/c2kernel/lifecycle/gui/model/WfVertexDefOutlineCreator.java @@ -12,7 +12,8 @@ public class WfVertexDefOutlineCreator implements VertexOutlineCreator private final int mSplitJoinWidth = 60; private final int mSplitJoinHeight = 25; - public void setOutline(Vertex vertex) + @Override + public void setOutline(Vertex vertex) { GraphPoint centrePoint = vertex.getCentrePoint(); GraphPoint[] outlinePoints = new GraphPoint[ 4 ]; -- cgit v1.2.3