diff options
Diffstat (limited to 'src/main/java/com/c2kernel/gui/lifecycle/desc')
3 files changed, 8 insertions, 9 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());
}
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
diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java b/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java index 2bf058f..fe70678 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/desc/WfVertexDefFactory.java @@ -48,7 +48,7 @@ public class WfVertexDefFactory implements VertexFactory, WorkflowDialogue }
}
@Override
- public void loadThisWorkflow(String newName, HashMap<?, ?> hashMap)
+ public void loadThisWorkflow(String newName, HashMap<String, Serializable> hashMap)
{
String vertexTypeId = (String) hashMap.get("P1");
GraphPoint location = (GraphPoint) hashMap.get("P2");
|