Pull remaining graph GUI components into cristal-gui

9 files changed, 20 insertions, 73 deletions

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<String>(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, "<STEP");

                 if (!step[14].equals("done"))

                 {

-                    act = parent.newCompChild(step[0], step[12].startsWith("true"), new Point(0, 0));

+                    act = parent.newCompChild(step[0], step[12].startsWith("true"), new GraphPoint(0, 0));

                 }

                 readStep((CompositeActivity) act);

                 step[14] = "done";

@@ -319,7 +319,7 @@ public class ParserWF
         }

         i += 7;

         if (!step[14].equals("done"))

-            act = parent.newAtomChild(step[0], step[12].startsWith("true"), new Point(0, 0));

+            act = parent.newAtomChild(step[0], step[12].startsWith("true"), new GraphPoint(0, 0));

         Logger.msg(7, "Step Created");

 

         try

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java b/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java
index 1d12ee6..c51d6fe 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java
@@ -1,5 +1,4 @@
 package com.c2kernel.lifecycle.instance;

-import java.awt.Point;

 import java.util.ArrayList;

 

 import com.c2kernel.common.AccessRightsException;

@@ -50,7 +49,7 @@ public class Workflow extends CompositeActivity implements C2KLocalObject
 	public Workflow(CompositeActivity domain) {

 		this();

 		domain.setName("domain");

-		initChild(domain, true, new Point(150, 100));

+		initChild(domain, true, new GraphPoint(150, 100));

 		PredefinedStepContainer act = new PredefinedStepContainer();

 		addChild(act, new GraphPoint(300, 100));

 	}

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
index f70c053..8f88602 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/AddStepsFromDescription.java
@@ -1,11 +1,10 @@
 package com.c2kernel.lifecycle.instance.predefined;

 

 //Java

-import java.awt.Point;

-

 import com.c2kernel.common.AccessRightsException;

 import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.common.InvalidTransitionException;

+import com.c2kernel.graph.model.GraphPoint;

 import com.c2kernel.lifecycle.CompositeActivityDef;

 import com.c2kernel.lifecycle.instance.CompositeActivity;

 import com.c2kernel.lifecycle.instance.Workflow;

@@ -38,7 +37,7 @@ public class AddStepsFromDescription extends PredefinedStep
 			lifeCycle.getChildGraphModel().removeVertex(lifeCycle.search("workflow/domain"));

 			CompositeActivityDef actDef = (CompositeActivityDef) CastorXMLUtility.unmarshall(getDataList(requestData)[0]);

 			CompositeActivity domain = (CompositeActivity)actDef.instantiate();

-			lifeCycle.initChild(domain, true, new Point(150, 100));

+			lifeCycle.initChild(domain, true, new GraphPoint(150, 100));

 			domain.setName("domain");

 			domain.setType(actDef.getName());

 			lifeCycle.run(agent);

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
index ba3e6c6..a249d51 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/predefined/ReplaceDomainWorkflow.java
@@ -1,11 +1,10 @@
 package com.c2kernel.lifecycle.instance.predefined;

 

 //Java

-import java.awt.Point;

-

 import com.c2kernel.common.AccessRightsException;

 import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.common.InvalidTransitionException;

+import com.c2kernel.graph.model.GraphPoint;

 import com.c2kernel.lifecycle.instance.CompositeActivity;

 import com.c2kernel.lifecycle.instance.Workflow;

 import com.c2kernel.lookup.AgentPath;

@@ -36,7 +35,7 @@ public class ReplaceDomainWorkflow extends PredefinedStep
 			Logger.msg(8, "ReplaceDomainWorkflow::request() - data:" + getDataList(requestData)[0]);

 			lifeCycle.getChildGraphModel().removeVertex(lifeCycle.search("workflow/domain"));

 			CompositeActivity domain = (CompositeActivity) CastorXMLUtility.unmarshall(getDataList(requestData)[0]);

-			lifeCycle.initChild(domain, true, new Point(150, 100));

+			lifeCycle.initChild(domain, true, new GraphPoint(150, 100));

 			Gateway.getStorage().put(getItemEntityPath().getSysKey(), lifeCycle, null);

 			Logger.msg(1, "ReplaceDomainWorkflow::request() - DONE.");

 			sendEventStoreOutcome(transitionID, requestData, agent);