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/ViewpointPane.java           | 4 ++--
 src/main/java/com/c2kernel/gui/tabs/WorkflowPane.java            | 9 ++-------
 .../c2kernel/gui/tabs/collection/CollectionHistoryWindow.java    | 3 +--
 .../java/com/c2kernel/gui/tabs/collection/CollectionView.java    | 3 ++-
 4 files changed, 7 insertions(+), 12 deletions(-)

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

diff --git a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java
index 6f15bfc..ab5a539 100644
--- a/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java
+++ b/src/main/java/com/c2kernel/gui/tabs/ViewpointPane.java
@@ -35,7 +35,7 @@ import com.c2kernel.gui.tabs.outcome.OutcomeHandler;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.persistency.outcome.Outcome;
 import com.c2kernel.persistency.outcome.Viewpoint;
-import com.c2kernel.utils.CastorXMLUtility;
+import com.c2kernel.process.Gateway;
 import com.c2kernel.utils.Language;
 import com.c2kernel.utils.LocalObjectLoader;
 import com.c2kernel.utils.Logger;
@@ -372,7 +372,7 @@ public class ViewpointPane extends EntityTabPane implements ItemListener, Action
         oldView.setEventId(newEvent.eventId);
         try {
             String[] predefParams = new String[1];
-            predefParams[0] = CastorXMLUtility.marshall(oldView);
+            predefParams[0] = Gateway.getMarshaller().marshall(oldView);
             MainFrame.userAgent.execute((ItemProxy)sourceEntity.getEntity(), "AddC2KObject", predefParams);
         } catch (Exception e) {
             Logger.error(e);
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)
diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
index 673f3ac..79c11cb 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java
@@ -25,7 +25,6 @@ import com.c2kernel.lookup.InvalidEntityPathException;
 import com.c2kernel.persistency.ClusterStorage;
 import com.c2kernel.persistency.outcome.Outcome;
 import com.c2kernel.process.Gateway;
-import com.c2kernel.utils.CastorXMLUtility;
 import com.c2kernel.utils.Language;
 import com.c2kernel.utils.Logger;
 
@@ -131,7 +130,7 @@ public class CollectionHistoryWindow extends JFrame  {
 				else {
 					Object obj;
 					try {
-						obj = CastorXMLUtility.unmarshall(params[0]);
+						obj = Gateway.getMarshaller().unmarshall(params[0]);
 					} catch (Exception e) {
 						Logger.error(e);
 						return;
diff --git a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionView.java b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionView.java
index c698430..022433f 100644
--- a/src/main/java/com/c2kernel/gui/tabs/collection/CollectionView.java
+++ b/src/main/java/com/c2kernel/gui/tabs/collection/CollectionView.java
@@ -6,6 +6,7 @@ import com.c2kernel.collection.Collection;
 import com.c2kernel.collection.CollectionMember;
 import com.c2kernel.entity.proxy.ItemProxy;
 import com.c2kernel.gui.MainFrame;
+import com.c2kernel.process.Gateway;
 import com.c2kernel.utils.Logger;
 
 /**************************************************************************
@@ -38,7 +39,7 @@ public abstract class CollectionView<M extends CollectionMember> extends JPanel
         try
         {
             String[] params = new String[1];
-            params[0] = com.c2kernel.utils.CastorXMLUtility.marshall(thisColl);
+            params[0] = Gateway.getMarshaller().marshall(thisColl);
             MainFrame.userAgent.execute(item, "AddC2KObject", params);
         }
         catch (Exception e)
-- 
cgit v1.2.3