From 11eb9557a35e17450c0aefb758471f1ff3148336 Mon Sep 17 00:00:00 2001
From: Andrew Branson <andrew.branson@cern.ch>
Date: Fri, 29 Jun 2012 16:20:11 +0200
Subject: Pull remaining graph GUI components into cristal-gui

---
 .../lifecycle/instance/CompositeActivity.java         | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

(limited to 'src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java')

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");
-- 
cgit v1.2.3