More graph gui components. Selection moved from GraphModel to GraphPanel

2 files changed, 9 insertions, 9 deletions

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java b/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java
index 1314f2f..b1406c5 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/instance/TransitionPanel.java
@@ -110,7 +110,7 @@ public class TransitionPanel extends SelectedVertexPanel implements ActionListen
         states.setEnabled(true);

         active.setSelected(mCurrentAct.active);

         active.setEnabled(true);

-        Logger.msg("Retrieving possible transitions for activity "+mCurrentAct.getName());

+        Logger.msg(1, "Retrieving possible transitions for activity "+mCurrentAct.getName());

         int[] transitions = mCurrentAct.getMachine().possibleTransition();

         if (transitions.length == 0) {

             status.setText("None");

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java b/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java
index fa6b427..8a02d6a 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java
@@ -1,26 +1,26 @@
 package com.c2kernel.gui.lifecycle.instance;

-import java.awt.Point;

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

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

 import java.io.Serializable;

 import java.util.HashMap;

 

 import javax.swing.JOptionPane;

 

 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.lifecycle.chooser.ActivityChooser;

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

 import com.c2kernel.lifecycle.ActivityDef;

 import com.c2kernel.lifecycle.instance.Activity;

 import com.c2kernel.lifecycle.instance.CompositeActivity;

 import com.c2kernel.utils.Language;

 import com.c2kernel.utils.LocalObjectLoader;

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

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

 	{

 		String vertexTypeId = null;

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

@@ -36,7 +36,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue
 					new ActivityChooser(

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

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

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

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

 						this,

 						mhm);

 				a.setVisible(true);

@@ -55,7 +55,7 @@ public class WfVertexFactory 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)

 			return;

 

@@ -69,7 +69,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue
 					Language.translate("Activity name not unique. Please give another."),

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

 					JOptionPane.QUESTION_MESSAGE,

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

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

 					null,

 					null);

 			if (newName.equals(""))