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 --- .../com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java | 5 +++-- .../com/c2kernel/lifecycle/instance/gui/model/WfGraphPanel.java | 3 ++- .../c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java | 9 ++++++--- .../lifecycle/instance/gui/model/WfVertexOutlineCreator.java | 3 ++- 4 files changed, 13 insertions(+), 7 deletions(-) mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/model/WfGraphPanel.java mode change 100755 => 100644 source/com/c2kernel/lifecycle/instance/gui/model/WfVertexOutlineCreator.java (limited to 'source/com/c2kernel/lifecycle/instance/gui/model') diff --git a/source/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java old mode 100755 new mode 100644 index f79d312..e96ef37 --- a/source/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java +++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfEdgeFactory.java @@ -9,7 +9,8 @@ import com.c2kernel.lifecycle.instance.WfVertex; public class WfEdgeFactory implements EdgeFactory { - public void create + @Override + public void create ( GraphModelManager graphModelManager, Vertex origin, @@ -22,7 +23,7 @@ public class WfEdgeFactory implements EdgeFactory } - 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/instance/gui/model/WfGraphPanel.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfGraphPanel.java old mode 100755 new mode 100644 index 752e1fa..16c8e16 --- a/source/com/c2kernel/lifecycle/instance/gui/model/WfGraphPanel.java +++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfGraphPanel.java @@ -18,6 +18,7 @@ public class WfGraphPanel 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 WfGraphPanel 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/instance/gui/model/WfVertexFactory.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java index d363dc6..0b6c9e4 100644 --- a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java +++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexFactory.java @@ -19,6 +19,7 @@ import com.c2kernel.utils.Resource; public class WfVertexFactory implements VertexFactory, WorkflowDialogue { protected CompositeActivity mRootAct = null; + @Override public void create(GraphModelManager graphModelManager, Point location, TypeNameAndConstructionInfo typeNameAndConstructionInfo) { String vertexTypeId = null; @@ -44,12 +45,14 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue mRootAct.newChild(vertexTypeId, location); } } + @Override public void setCreationContext(Object newContext) { if (newContext != null && newContext instanceof CompositeActivity) mRootAct = (CompositeActivity) newContext; } - 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"); @@ -69,7 +72,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue Resource.getImageResource("graph/newvertex_large.png"), null, null); - if (newName == null || newName.equals("")) + if (newName.equals("")) return; } Activity act = null; @@ -80,7 +83,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue } catch (Exception e) { - } + } if (act == null) mRootAct.newChild(unicName, vertexTypeId, location); else diff --git a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexOutlineCreator.java b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexOutlineCreator.java old mode 100755 new mode 100644 index dd4b8af..e8cb303 --- a/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexOutlineCreator.java +++ b/source/com/c2kernel/lifecycle/instance/gui/model/WfVertexOutlineCreator.java @@ -14,7 +14,8 @@ public class WfVertexOutlineCreator implements VertexOutlineCreator,Serializable 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