From 93ba823b147f200f5e5f20d272d1d982509ae021 Mon Sep 17 00:00:00 2001
From: abranson <abranson@PCUWE01.cern.ch>
Date: Fri, 6 Jul 2012 11:01:14 +0200
Subject: CastorXMLUtility is now a static member of gateway. Domain specific
 instances can be used by domain applications, but the maps do not interfere
 with the kernel.

---
 src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java')

diff --git a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java
index 40d07de..30e7887 100644
--- a/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java
+++ b/src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java
@@ -31,7 +31,6 @@ import com.c2kernel.lifecycle.instance.WfVertexOutlineCreator;
 import com.c2kernel.lifecycle.instance.Workflow;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.CastorXMLUtility;
 import com.c2kernel.utils.FileStringUtility;
 import com.c2kernel.utils.Language;
 import com.c2kernel.utils.Logger;
@@ -213,7 +212,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver<W
 				try
 				{
 					String newWf = FileStringUtility.file2String(selectedFile);
-					add((Workflow) CastorXMLUtility.unmarshall(newWf));
+					add((Workflow) Gateway.getMarshaller().unmarshall(newWf));
 				}
 				catch (Exception e)
 				{
@@ -224,10 +223,6 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver<W
 			default :
 				}
 	}
-	protected String marshall() throws Exception
-	{
-		return com.c2kernel.utils.CastorXMLUtility.marshall(mWorkflow.getWf());
-	}
 	protected void saveWorkflow()
 	{
 		try
@@ -236,7 +231,7 @@ public class WorkflowPane extends EntityTabPane implements EntityProxyObserver<W
             MainFrame.userAgent.execute(
 				(ItemProxy)sourceEntity.getEntity(),
 				"ReplaceDomainWorkflow",
-				new String[] { com.c2kernel.utils.CastorXMLUtility.marshall(cact)});
+				new String[] { Gateway.getMarshaller().marshall(cact)});
             mEditorPanel.mGraphPanel.setSelection(new Selection(null,null,0,0,0,0));
 		}
 		catch (Exception e)
-- 
cgit v1.2.3