1 files changed, 38 insertions, 25 deletions

diff --git a/source/com/c2kernel/gui/tabs/WorkflowPane.java b/source/com/c2kernel/gui/tabs/WorkflowPane.java
index 7b664ba..6bccd08 100755..100644
--- a/source/com/c2kernel/gui/tabs/WorkflowPane.java
+++ b/source/com/c2kernel/gui/tabs/WorkflowPane.java
@@ -9,9 +9,9 @@ import javax.swing.JButton;
 import javax.swing.JFileChooser;

 import javax.swing.JSplitPane;

 

-import com.c2kernel.entity.C2KLocalObject;

 import com.c2kernel.entity.proxy.EntityProxyObserver;

 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;

@@ -30,8 +30,12 @@ import com.c2kernel.lifecycle.instance.gui.view.WfDirectedEdgeRenderer;
 import com.c2kernel.lifecycle.instance.gui.view.WfVertexRenderer;

 import com.c2kernel.persistency.ClusterStorage;

 import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.*;

-public class WorkflowPane extends EntityTabPane implements EntityProxyObserver

+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;

@@ -49,7 +53,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver
 	protected EditorPanel mEditorPanel;

 	// Objects to view/modify the properties of the selected activity

 	protected VertexPropertyPanel mPropertyPanel;

-	protected JSplitPane mSplitPane;	

+	protected JSplitPane mSplitPane;

 

 	// Graph editor panel

 	// Objects to view/modify the properties of the selected activity

@@ -64,26 +68,28 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver
 		mLoadButton.setToolTipText(Language.translate("Load"));

 		mSaveButton.setToolTipText(Language.translate("Save"));

 		mOtherToolBarButtons = new JButton[] { mZoomOutButton, mLayoutButton, mLoadButton, mSaveButton };

-       

+

 	}

-	

+

 	protected void createListeners()

 	{

 		/**

-		 *  

+		 *

 		 */

 		mLoadButton.addActionListener(new ActionListener()

 		{

+			@Override

 			public void actionPerformed(ActionEvent ae)

 			{

 				loadWorkflow();

 			}

 		});

 		/**

-		 *  

+		 *

 		 */

 		mSaveButton.addActionListener(new ActionListener()

 		{

+			@Override

 			public void actionPerformed(ActionEvent ae)

 			{

 				setCursor(new Cursor(Cursor.WAIT_CURSOR));

@@ -92,20 +98,22 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver
 			}

 		});

 		/**

-		 *  

+		 *

 		 */

 		mLayoutButton.addActionListener(new ActionListener()

 		{

+			@Override

 			public void actionPerformed(ActionEvent ae)

 			{

 				DefaultGraphLayoutGenerator.layoutGraph(mEditorPanel.mGraphModelManager.getModel());

 			}

 		});

 		/**

-		 *  

+		 *

 		 */

 		mZoomOutButton.addActionListener(new ActionListener()

 		{

+			@Override

 			public void actionPerformed(ActionEvent ae)

 			{

 				mEditorPanel.mGraphModelManager.zoomOut();

@@ -114,7 +122,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver
 	}

 	/**

 	 * Return a single ref on mEditorPanel

-	 * 

+	 *

 	 * @return EditorPanel

 	 */

 	public EditorPanel getEditorPanel()

@@ -140,16 +148,13 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver
 		}

 		return mSplitPane;

 	}

-	public void add(C2KLocalObject contents)

+	@Override

+	public void add(Workflow contents)

 	{

-		if (contents instanceof Workflow)

-		{

-			mWorkflow = (Workflow) contents;

-			addActivity((CompositeActivity) mWorkflow.search("workflow/domain"));

-		}

-		else if (contents instanceof CompositeActivity)

-			addActivity((CompositeActivity) contents);

+		mWorkflow = contents;

+		addActivity((CompositeActivity) mWorkflow.search("workflow/domain"));

 	}

+	@Override

 	public void remove(String id)

 	{

 	}

@@ -163,6 +168,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver
 		mEditorPanel.enterSelectMode();

 		mWfVertexFactory.setCreationContext(cAct);

 	}

+	@Override

 	public void run()

 	{

         Thread.currentThread().setName("Workflow Pane Builder");

@@ -175,9 +181,10 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver
             mEditorPanel.setEditable(MainFrame.isAdmin);

 			init = true;

 		}

-		sourceEntity.getEntity().subscribe(this, ClusterStorage.LIFECYCLE, true);

+		sourceEntity.getEntity().subscribe(new MemberSubscription<Workflow>(this, ClusterStorage.LIFECYCLE, true));

 		transPanel.setItem((ItemProxy) sourceEntity.getEntity());

 	}

+	@Override

 	public void reload()

 	{

 		Gateway.getStorage().clearCache(sourceEntity.getSysKey(), ClusterStorage.LIFECYCLE);

@@ -235,9 +242,9 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver
 		catch (Exception e)

 		{

 			Logger.error(e);

-		}       

+		}

 	}

-    

+

     public VertexPropertyPanel getPropertyPanel()

     {

         if (mPropertyPanel == null) {

@@ -249,7 +256,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver
         }

         return mPropertyPanel;

     }

-    

+

 	public void setNewPropertyPanel()

 	{

 		String wfPanelClass = Gateway.getProperty("WfPropertyPanel");

@@ -257,7 +264,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver
 		{

 			try

 			{

-				Class panelClass = Class.forName(wfPanelClass);

+				Class<?> panelClass = Class.forName(wfPanelClass);

 				mPropertyPanel = (VertexPropertyPanel) panelClass.newInstance();

 				return;

 			}

@@ -269,5 +276,11 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver
 		}

 		mPropertyPanel = new VertexPropertyPanel();

 	}

-    

+

+	@Override

+	public void control(String control, String msg) {

+		// TODO Auto-generated method stub

+		

+	}

+

 }