From 93ba823b147f200f5e5f20d272d1d982509ae021 Mon Sep 17 00:00:00 2001 From: abranson 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. --- .../java/com/c2kernel/gui/tabs/collection/CollectionHistoryWindow.java | 3 +-- src/main/java/com/c2kernel/gui/tabs/collection/CollectionView.java | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/c2kernel/gui/tabs/collection') 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 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