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.

1 files changed, 4 insertions, 4 deletions

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java b/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
index f6e4e9b..f75632d 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/desc/ElemActDefOutcomeHandler.java
@@ -15,7 +15,7 @@ import com.c2kernel.gui.tabs.outcome.OutcomeNotInitialisedException;
 import com.c2kernel.lifecycle.ActivityDef;

 import com.c2kernel.lifecycle.ActivitySlotDef;

 import com.c2kernel.lifecycle.CompositeActivityDef;

-import com.c2kernel.utils.CastorXMLUtility;

+import com.c2kernel.process.Gateway;

 import com.c2kernel.utils.FileStringUtility;

 import com.c2kernel.utils.LocalObjectLoader;

 import com.c2kernel.utils.Logger;

@@ -44,7 +44,7 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
     @Override

 	public void setOutcome(String outcome) throws InvalidOutcomeException {

         try {

-            act = (ActivityDef)CastorXMLUtility.unmarshall(outcome);

+            act = (ActivityDef)Gateway.getMarshaller().unmarshall(outcome);

             setVertex(act);

         } catch (Exception ex) {

             Logger.error(ex);

@@ -84,7 +84,7 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
     @Override

 	public String getOutcome() throws OutcomeException {

         try {

-            return CastorXMLUtility.marshall(act);

+            return Gateway.getMarshaller().marshall(act);

         } catch (Exception ex) {

             Logger.error(ex);

             throw new OutcomeException();

@@ -115,7 +115,7 @@ public class ElemActDefOutcomeHandler extends VertexPropertyPanel implements Out
 	}

 

 	public static void exportAct(File dir, ActivityDef actDef) throws Exception {

-		FileStringUtility.string2File(new File(dir, actDef.getActName()+".xml"), CastorXMLUtility.marshall(actDef));

+		FileStringUtility.string2File(new File(dir, actDef.getActName()+".xml"), Gateway.getMarshaller().marshall(actDef));

 		// Export associated schema

 		exportSchema((String)actDef.getProperties().get("SchemaType"), (String)actDef.getProperties().get("SchemaVersion"), dir);

 		// Export associated script