diff options
Diffstat (limited to 'src/main/java')
10 files changed, 21 insertions, 25 deletions
diff --git a/src/main/java/com/c2kernel/gui/lifecycle/chooser/ActivityChooser.java b/src/main/java/com/c2kernel/gui/lifecycle/chooser/ActivityChooser.java index 05d5e86..acce7ef 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/chooser/ActivityChooser.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/chooser/ActivityChooser.java @@ -12,6 +12,7 @@ import java.awt.Image; import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
+import java.io.Serializable;
import java.util.HashMap;
import javax.swing.BorderFactory;
@@ -50,9 +51,9 @@ public class ActivityChooser extends JFrame private JLabel label = null;
- HashMap<?, ?> mhashmap = null;
+ HashMap<String, Serializable> mhashmap = null;
- public ActivityChooser(String message, String title, Image img, WorkflowDialogue parent, HashMap<?, ?> hashmap)
+ public ActivityChooser(String message, String title, Image img, WorkflowDialogue parent, HashMap<String, Serializable> hashmap)
{
super(title);
mMessage = message;
diff --git a/src/main/java/com/c2kernel/gui/lifecycle/chooser/WorkflowDialogue.java b/src/main/java/com/c2kernel/gui/lifecycle/chooser/WorkflowDialogue.java index 30a98a2..4f99a61 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/chooser/WorkflowDialogue.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/chooser/WorkflowDialogue.java @@ -6,6 +6,7 @@ */
package com.c2kernel.gui.lifecycle.chooser;
+import java.io.Serializable;
import java.util.HashMap;
/**
@@ -16,5 +17,5 @@ import java.util.HashMap; */
public interface WorkflowDialogue
{
- public void loadThisWorkflow(String name, HashMap<?, ?> hashMap);
+ public void loadThisWorkflow(String name, HashMap<String, Serializable> hashMap);
}
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");
diff --git a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java b/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java index 8a02d6a..38e3ec4 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/instance/WfVertexFactory.java @@ -52,7 +52,7 @@ public class WfVertexFactory implements VertexFactory, WorkflowDialogue mRootAct = (CompositeActivity) newContext;
}
@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");
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)
|