More graph gui components. Selection moved from GraphModel to GraphPanel

1 files changed, 7 insertions, 8 deletions

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java b/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java
index d942e03..2bf058f 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java
@@ -1,6 +1,4 @@
 package com.c2kernel.gui.lifecycle.desc;

-import java.awt.Point;

-import com.c2kernel.gui.MainFrame;

 import java.io.Serializable;

 import java.util.HashMap;

 

@@ -10,6 +8,8 @@ import com.c2kernel.graph.model.GraphModelManager;
 import com.c2kernel.graph.model.GraphPoint;

 import com.c2kernel.graph.model.TypeNameAndConstructionInfo;

 import com.c2kernel.graph.model.VertexFactory;

+import com.c2kernel.gui.ImageLoader;

+import com.c2kernel.gui.MainFrame;

 import com.c2kernel.gui.lifecycle.chooser.ActivityChooser;

 import com.c2kernel.gui.lifecycle.chooser.WorkflowDialogue;

 import com.c2kernel.lifecycle.ActivityDef;

@@ -17,12 +17,11 @@ import com.c2kernel.lifecycle.CompositeActivityDef;
 import com.c2kernel.utils.Language;

 import com.c2kernel.utils.LocalObjectLoader;

 import com.c2kernel.utils.Logger;

-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)

+	public void create(GraphModelManager graphModelManager, GraphPoint location, TypeNameAndConstructionInfo typeNameAndConstructionInfo)

 	{

 		String vertexTypeId = null;

 		if (mCompositeActivityDef != null && typeNameAndConstructionInfo.mInfo instanceof String)

@@ -39,7 +38,7 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue
 					new ActivityChooser(

 						Language.translate("Please enter a Type for the new activityDef"),

 						Language.translate("New " + vertexTypeId + " Activity"),

-						Resource.findImage("graph/newvertex_large.png").getImage(),

+						ImageLoader.findImage("graph/newvertex_large.png").getImage(),

 						this,

 						mhm);

 				a.setVisible(true);

@@ -52,7 +51,7 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue
 	public void loadThisWorkflow(String newName, HashMap<?, ?> hashMap)

 	{

 		String vertexTypeId = (String) hashMap.get("P1");

-		Point location = (Point) hashMap.get("P2");

+		GraphPoint location = (GraphPoint) hashMap.get("P2");

 		if (newName == null || newName.equals(""))

 			return;

 		Logger.debug(5, newName);

@@ -69,11 +68,11 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue
 						Language.translate("Please type a Name"),

 						Language.translate("New " + vertexTypeId + " Activity"),

 						JOptionPane.QUESTION_MESSAGE,

-						Resource.findImage("graph/newvertex_large.png"),

+						ImageLoader.findImage("graph/newvertex_large.png"),

 						null,

 						null);

 			act = (ActivityDef) mCompositeActivityDef.search(mCompositeActivityDef.getID() + "/" + newName);

-			mCompositeActivityDef.addExistingActivityDef(unicName, act, new GraphPoint(location.x, location.y));

+			mCompositeActivityDef.addExistingActivityDef(unicName, act, location);

 		}

 		else

 		{