More graph gui components. Selection moved from GraphModel to GraphPanel

1 files changed, 7 insertions, 7 deletions

diff --git a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java
index 5c3b1ed..40d07de 100644
--- a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java
+++ b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java
@@ -14,9 +14,10 @@ import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.entity.proxy.MemberSubscription;

 import com.c2kernel.graph.layout.DefaultGraphLayoutGenerator;

 import com.c2kernel.graph.model.EdgeFactory;

-import com.c2kernel.graph.model.Selection;

 import com.c2kernel.graph.model.VertexFactory;

+import com.c2kernel.gui.ImageLoader;

 import com.c2kernel.gui.MainFrame;

+import com.c2kernel.gui.graph.controller.Selection;

 import com.c2kernel.gui.graph.view.EditorPanel;

 import com.c2kernel.gui.graph.view.VertexPropertyPanel;

 import com.c2kernel.gui.lifecycle.instance.TransitionPanel;

@@ -34,17 +35,16 @@ import com.c2kernel.utils.CastorXMLUtility;
 import com.c2kernel.utils.FileStringUtility;

 import com.c2kernel.utils.Language;

 import com.c2kernel.utils.Logger;

-import com.c2kernel.utils.Resource;

 public class WorkflowPane extends EntityTabPane implements EntityProxyObserver<Workflow>

 {

 	// Only for the purpose of loading and saving

 	protected Workflow mWorkflow = null;

 	boolean init = false;

 	TransitionPanel transPanel;

-	protected JButton mLoadButton = new JButton(Resource.findImage("graph/load.png"));

-	protected JButton mSaveButton = new JButton(Resource.findImage("graph/save.png"));

-	protected JButton mLayoutButton = new JButton(Resource.findImage("graph/autolayout.png"));

-	protected JButton mZoomOutButton = new JButton(Resource.findImage("graph/zoomout.png"));

+	protected JButton mLoadButton = new JButton(ImageLoader.findImage("graph/load.png"));

+	protected JButton mSaveButton = new JButton(ImageLoader.findImage("graph/save.png"));

+	protected JButton mLayoutButton = new JButton(ImageLoader.findImage("graph/autolayout.png"));

+	protected JButton mZoomOutButton = new JButton(ImageLoader.findImage("graph/zoomout.png"));

 	protected JButton[] mOtherToolBarButtons;

 	// Workflow factories

 	protected EdgeFactory mWfEdgeFactory;

@@ -237,7 +237,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver<W
 				(ItemProxy)sourceEntity.getEntity(),

 				"ReplaceDomainWorkflow",

 				new String[] { com.c2kernel.utils.CastorXMLUtility.marshall(cact)});

-            cact.getChildrenGraphModel().setSelection(new Selection(null,null,0,0,0,0));

+            mEditorPanel.mGraphPanel.setSelection(new Selection(null,null,0,0,0,0));

 		}

 		catch (Exception e)

 		{