From 11eb9557a35e17450c0aefb758471f1ff3148336 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Fri, 29 Jun 2012 16:20:11 +0200 Subject: Pull remaining graph GUI components into cristal-gui --- .../c2kernel/lifecycle/CompositeActivityDef.java | 4 +--- .../com/c2kernel/lifecycle/instance/Activity.java | 4 ---- .../lifecycle/instance/CompositeActivity.java | 19 ++++++++--------- .../com/c2kernel/lifecycle/instance/EventList.java | 19 ----------------- .../c2kernel/lifecycle/instance/EventStorage.java | 24 ---------------------- .../com/c2kernel/lifecycle/instance/ParserWF.java | 10 ++++----- .../com/c2kernel/lifecycle/instance/Workflow.java | 3 +-- .../predefined/AddStepsFromDescription.java | 5 ++--- .../instance/predefined/ReplaceDomainWorkflow.java | 5 ++--- 9 files changed, 20 insertions(+), 73 deletions(-) delete mode 100644 src/main/java/com/c2kernel/lifecycle/instance/EventList.java delete mode 100644 src/main/java/com/c2kernel/lifecycle/instance/EventStorage.java (limited to 'src/main/java/com/c2kernel/lifecycle') diff --git a/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java b/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java index df97086..54487f4 100644 --- a/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java +++ b/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java @@ -1,6 +1,4 @@ package com.c2kernel.lifecycle; -import java.awt.Point; - import com.c2kernel.common.InvalidDataException; import com.c2kernel.common.ObjectNotFoundException; import com.c2kernel.graph.model.GraphModel; @@ -83,7 +81,7 @@ public class CompositeActivityDef extends ActivityDef * @param location * @return WfVertexDef */ - public WfVertexDef newChild(String Name, String Type, Point location) + public WfVertexDef newChild(String Name, String Type, GraphPoint location) { changed = true; WfVertexDef child; diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Activity.java b/src/main/java/com/c2kernel/lifecycle/instance/Activity.java index 8a07d15..8d92522 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/Activity.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/Activity.java @@ -45,9 +45,6 @@ public class Activity extends WfVertex public boolean active = false; /** used in verify() */ private boolean loopTested; - //public Vector eventIds; - /** Storage of eventIds thrown by the Activity */ - public EventStorage eventIds; private GTimeStamp mStartDate; private GTimeStamp mActiveDate; private String mType; @@ -58,7 +55,6 @@ public class Activity extends WfVertex setProperties(new WfCastorHashMap()); mErrors = new Vector(0, 1); machine = new StateMachine(this); - eventIds = new EventStorage(); mStartDate = new GTimeStamp(); mActiveDate = new GTimeStamp(); DateUtility.setToNow(mActiveDate); diff --git a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java index 74f71ba..0928c83 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java @@ -1,6 +1,5 @@ package com.c2kernel.lifecycle.instance; -import java.awt.Point; import java.util.ArrayList; import java.util.Vector; @@ -78,7 +77,7 @@ public class CompositeActivity extends Activity * if true, the activity Waiting will be one of the first * launched by the parent activity */ - public void initChild(Activity act, boolean first, Point point) + public void initChild(Activity act, boolean first, GraphPoint point) { this.addChild(act, new GraphPoint(point.x, point.y)); if (first) @@ -96,7 +95,7 @@ public class CompositeActivity extends Activity * @param point * @return WfVertex */ - public WfVertex newExistingChild(Activity child, String Name, Point point) + public WfVertex newExistingChild(Activity child, String Name, GraphPoint point) { child.setName(Name); addChild(child, new GraphPoint(point.x, point.y)); @@ -111,7 +110,7 @@ public class CompositeActivity extends Activity * @param point * @return WfVertex */ - public WfVertex newChild(String Name, String Type, Point point) + public WfVertex newChild(String Name, String Type, GraphPoint point) { WfVertex v = newChild(Type, point); v.setName(Name); @@ -125,7 +124,7 @@ public class CompositeActivity extends Activity * @param point * @return WfVertex */ - public WfVertex newChild(String vertexTypeId, Point point) + public WfVertex newChild(String vertexTypeId, GraphPoint point) { WfVertex wfVertex = null; if (vertexTypeId.equals("Atomic")) @@ -168,7 +167,7 @@ public class CompositeActivity extends Activity * @return CompositeActivity Create an initialize a composite Activity * attached to the current activity */ - public CompositeActivity newCompChild(String id, boolean first, Point point) + public CompositeActivity newCompChild(String id, boolean first, GraphPoint point) { CompositeActivity act = new CompositeActivity(); initChild(act, first, point); @@ -186,7 +185,7 @@ public class CompositeActivity extends Activity * current activity * */ - public Activity newAtomChild(String id, boolean first, Point point) + public Activity newAtomChild(String id, boolean first, GraphPoint point) { Activity act = new Activity(); initChild(act, first, point); @@ -201,7 +200,7 @@ public class CompositeActivity extends Activity * @param point * @return Split */ - public Split newSplitChild(String Type, Point point) + public Split newSplitChild(String Type, GraphPoint point) { Split split; if (Type.equals("Or")) @@ -227,7 +226,7 @@ public class CompositeActivity extends Activity * @param point * @return Join */ - public Join newJoinChild(Point point) + public Join newJoinChild(GraphPoint point) { Join join = new Join(); join.getProperties().put("Type", "Join"); @@ -235,7 +234,7 @@ public class CompositeActivity extends Activity return join; } - public Join newRouteChild(Point point) + public Join newRouteChild(GraphPoint point) { Join join = new Join(); join.getProperties().put("Type", "Route"); diff --git a/src/main/java/com/c2kernel/lifecycle/instance/EventList.java b/src/main/java/com/c2kernel/lifecycle/instance/EventList.java deleted file mode 100644 index be255fb..0000000 --- a/src/main/java/com/c2kernel/lifecycle/instance/EventList.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.c2kernel.lifecycle.instance; - -import java.io.Serializable; - -/** - * @version $Revision: 1.9 $ $Date: 2005/06/08 19:47:59 $ - * @author $Author: abranson $ - */ -public class EventList implements Serializable { - private int[] dummy = new int[0]; - public int transition=-1; - - public int[] getNums() { - return dummy; - } - - public void setNums(int[] nums) { - } -} diff --git a/src/main/java/com/c2kernel/lifecycle/instance/EventStorage.java b/src/main/java/com/c2kernel/lifecycle/instance/EventStorage.java deleted file mode 100644 index 40cffaf..0000000 --- a/src/main/java/com/c2kernel/lifecycle/instance/EventStorage.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.c2kernel.lifecycle.instance; -import java.io.Serializable; -import java.util.Hashtable; - -/** - * @version $Revision: 1.15 $ $Date: 2005/06/08 19:48:00 $ - * @author $Author: abranson $ - */ -public class EventStorage implements Serializable -{ - private Hashtable mLists; - private EventList[] dummy = new EventList[0]; - public Integer lastTransitionStored; - - public EventList[] getLists() - { - return dummy; - } - - public void setLists(EventList[] lists) - { - } - -} diff --git a/src/main/java/com/c2kernel/lifecycle/instance/ParserWF.java b/src/main/java/com/c2kernel/lifecycle/instance/ParserWF.java index 02a0c6d..1e52e6b 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/ParserWF.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/ParserWF.java @@ -1,9 +1,9 @@ package com.c2kernel.lifecycle.instance; -import java.awt.Point; import java.io.IOException; import java.util.Vector; +import com.c2kernel.graph.model.GraphPoint; import com.c2kernel.lookup.AgentPath; import com.c2kernel.utils.CastorHashMap; import com.c2kernel.utils.Logger; @@ -53,7 +53,7 @@ public class ParserWF { if (nexts.elementAt(j)[0].equals(nexts.elementAt(k)[0])) { - int tmp = act.newSplitChild("And", new Point(0, 0)).getID(); + int tmp = act.newSplitChild("And", new GraphPoint(0, 0)).getID(); ((WfVertex) act.search(nexts.elementAt(k)[0])).addNext(act.search(tmp)); ((Split) act.search(tmp)).addNext((WfVertex) act.search(nexts.elementAt(k)[1])); ((Split) act.search(tmp)).addNext((WfVertex) act.search(nexts.elementAt(j)[1])); @@ -73,7 +73,7 @@ public class ParserWF { if (nexts.elementAt(j)[1].equals(nexts.elementAt(k)[1])) { - int tmp = act.newJoinChild(new Point(0, 0)).getID(); + int tmp = act.newJoinChild(new GraphPoint(0, 0)).getID(); ((WfVertex) act.search(nexts.elementAt(j)[0])).addNext(act.search(tmp)); ((WfVertex) act.search(nexts.elementAt(k)[0])).addNext(act.search(tmp)); ((Join) act.search(tmp)).addNext(nexts.elementAt(j)[1]); @@ -122,7 +122,7 @@ public class ParserWF Logger.msg(7, "