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, 3 insertions, 4 deletions

diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java b/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java
index 51e2939..c47931f 100644
--- a/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java
+++ b/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java
@@ -4,7 +4,6 @@ import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;

 import java.awt.event.ActionEvent;

 import java.awt.event.ActionListener;

-import com.c2kernel.gui.ImageLoader;

 import java.io.File;

 

 import javax.swing.JButton;

@@ -13,6 +12,7 @@ import javax.swing.JPanel;
 import javax.swing.JSplitPane;

 

 import com.c2kernel.graph.layout.DefaultGraphLayoutGenerator;

+import com.c2kernel.gui.ImageLoader;

 import com.c2kernel.gui.MainFrame;

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

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

@@ -25,7 +25,6 @@ import com.c2kernel.gui.tabs.outcome.OutcomeNotInitialisedException;
 import com.c2kernel.lifecycle.CompositeActivityDef;

 import com.c2kernel.lifecycle.WfVertexDefOutlineCreator;

 import com.c2kernel.process.Gateway;

-import com.c2kernel.utils.CastorXMLUtility;

 import com.c2kernel.utils.FileStringUtility;

 import com.c2kernel.utils.Logger;

 

@@ -142,7 +141,7 @@ public class CompActDefOutcomeHandler
     @Override

 	public void setOutcome(String outcome) throws InvalidOutcomeException {

         try {

-            CompositeActivityDef newAct = (CompositeActivityDef)CastorXMLUtility.unmarshall(outcome);

+            CompositeActivityDef newAct = (CompositeActivityDef)Gateway.getMarshaller().unmarshall(outcome);

             if (mCompActDef != null)

                 newAct.setName(mCompActDef.getName());

             mCompActDef = newAct;

@@ -182,7 +181,7 @@ public class CompActDefOutcomeHandler
     @Override

 	public String getOutcome() throws OutcomeException {

         try {

-            return CastorXMLUtility.marshall(mCompActDef);

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

         } catch (Exception ex) {

             throw new OutcomeException(ex.getMessage());

         }