Remove Serializable. CRISTAL never uses Java serialization, only Castor.

23 files changed, 23 insertions, 40 deletions

diff --git a/src/main/java/com/c2kernel/collection/CollectionMember.java b/src/main/java/com/c2kernel/collection/CollectionMember.java
index 247ada5..4258839 100644
--- a/src/main/java/com/c2kernel/collection/CollectionMember.java
+++ b/src/main/java/com/c2kernel/collection/CollectionMember.java
@@ -20,7 +20,7 @@ import com.c2kernel.utils.CastorHashMap;
  * All rights reserved.

  **************************************************************************/

 

-public interface CollectionMember extends Serializable {

+public interface CollectionMember {

 

 	public void setItemPath(ItemPath itemPath) throws MembershipException;

 	public ItemPath getItemPath();

diff --git a/src/main/java/com/c2kernel/entity/C2KLocalObject.java b/src/main/java/com/c2kernel/entity/C2KLocalObject.java
index ec30dc1..8fb1e80 100644
--- a/src/main/java/com/c2kernel/entity/C2KLocalObject.java
+++ b/src/main/java/com/c2kernel/entity/C2KLocalObject.java
@@ -1,6 +1,5 @@
 package com.c2kernel.entity;

 

-import java.io.Serializable;

 

 /**

  * Objects that are to be stored by Cristal Entities must implement this interface and be (un)marshallable by Castor

@@ -23,7 +22,7 @@ import java.io.Serializable;
  * All rights reserved.

  */

 

-public interface C2KLocalObject extends Serializable {

+public interface C2KLocalObject {

 

 	public void setName(String name);

 	public String getName();

diff --git a/src/main/java/com/c2kernel/entity/imports/Geometry.java b/src/main/java/com/c2kernel/entity/imports/Geometry.java
index cb973d3..a11b8d7 100644
--- a/src/main/java/com/c2kernel/entity/imports/Geometry.java
+++ b/src/main/java/com/c2kernel/entity/imports/Geometry.java
@@ -4,7 +4,7 @@ package com.c2kernel.entity.imports;
 

 

 

-public class Geometry implements java.io.Serializable {

+public class Geometry {

 

 

     public int x;

diff --git a/src/main/java/com/c2kernel/entity/imports/ImportAgent.java b/src/main/java/com/c2kernel/entity/imports/ImportAgent.java
index 52546a6..eb5587c 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportAgent.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportAgent.java
@@ -16,7 +16,7 @@ import com.c2kernel.property.Property;
 import com.c2kernel.property.PropertyArrayList;

 import com.c2kernel.utils.Logger;

 

-public class ImportAgent extends ModuleImport implements java.io.Serializable {

+public class ImportAgent extends ModuleImport {

 

     private String password;

 	private ArrayList<Property> properties  = new ArrayList<Property>();

diff --git a/src/main/java/com/c2kernel/entity/imports/ImportAggregation.java b/src/main/java/com/c2kernel/entity/imports/ImportAggregation.java
index 46cb0b6..27eb0ed 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportAggregation.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportAggregation.java
@@ -12,7 +12,7 @@ import com.c2kernel.property.PropertyDescription;
 import com.c2kernel.property.PropertyDescriptionList;

 import com.c2kernel.property.PropertyUtility;

 

-public class ImportAggregation implements java.io.Serializable {

+public class ImportAggregation {

 

     public boolean isDescription;

     public ArrayList<ImportAggregationMember> aggregationMemberList = new ArrayList<ImportAggregationMember>();

diff --git a/src/main/java/com/c2kernel/entity/imports/ImportAggregationMember.java b/src/main/java/com/c2kernel/entity/imports/ImportAggregationMember.java
index 7a1cf21..159e02c 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportAggregationMember.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportAggregationMember.java
@@ -3,7 +3,7 @@ package com.c2kernel.entity.imports;
 import com.c2kernel.utils.CastorHashMap;

 import com.c2kernel.utils.KeyValuePair;

 

-public class ImportAggregationMember implements java.io.Serializable {

+public class ImportAggregationMember {

 

     public int slotNo;

     public String itemDescriptionPath;

diff --git a/src/main/java/com/c2kernel/entity/imports/ImportDependency.java b/src/main/java/com/c2kernel/entity/imports/ImportDependency.java
index 3fafd6f..c235ba4 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportDependency.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportDependency.java
@@ -13,7 +13,7 @@ import com.c2kernel.property.PropertyUtility;
 import com.c2kernel.utils.CastorHashMap;

 import com.c2kernel.utils.KeyValuePair;

 

-public class ImportDependency implements java.io.Serializable {

+public class ImportDependency {

 

     public String name;

     public boolean isDescription;

diff --git a/src/main/java/com/c2kernel/entity/imports/ImportDependencyMember.java b/src/main/java/com/c2kernel/entity/imports/ImportDependencyMember.java
index 6fc6b5a..8260b77 100644
--- a/src/main/java/com/c2kernel/entity/imports/ImportDependencyMember.java
+++ b/src/main/java/com/c2kernel/entity/imports/ImportDependencyMember.java
@@ -4,7 +4,7 @@ package com.c2kernel.entity.imports;
 import com.c2kernel.utils.CastorHashMap;

 import com.c2kernel.utils.KeyValuePair;

 

-public class ImportDependencyMember implements java.io.Serializable {

+public class ImportDependencyMember {

 

 

     public String itemPath;

diff --git a/src/main/java/com/c2kernel/graph/event/GraphModelEvent.java b/src/main/java/com/c2kernel/graph/event/GraphModelEvent.java
index 95cd6fb..39bb02a 100644
--- a/src/main/java/com/c2kernel/graph/event/GraphModelEvent.java
+++ b/src/main/java/com/c2kernel/graph/event/GraphModelEvent.java
@@ -1,7 +1,6 @@
 package com.c2kernel.graph.event;

 

-import java.io.Serializable;

 

-public abstract class GraphModelEvent implements Serializable

+public abstract class GraphModelEvent

 {

 }

diff --git a/src/main/java/com/c2kernel/graph/model/DirectedEdge.java b/src/main/java/com/c2kernel/graph/model/DirectedEdge.java
index 830d70d..8c5e44e 100644
--- a/src/main/java/com/c2kernel/graph/model/DirectedEdge.java
+++ b/src/main/java/com/c2kernel/graph/model/DirectedEdge.java
@@ -1,10 +1,9 @@
 package com.c2kernel.graph.model;

 

-import java.io.Serializable;

 

 

 

-public abstract class DirectedEdge implements Serializable

+public abstract class DirectedEdge 

 {

     // Persistent data

     private int        mId               = -1;

diff --git a/src/main/java/com/c2kernel/graph/model/GraphModel.java b/src/main/java/com/c2kernel/graph/model/GraphModel.java
index f392d26..aecb90f 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphModel.java
+++ b/src/main/java/com/c2kernel/graph/model/GraphModel.java
@@ -1,6 +1,5 @@
 package com.c2kernel.graph.model;

 

-import java.io.Serializable;

 import java.util.Hashtable;

 

 import com.c2kernel.graph.event.ClearedEvent;

@@ -18,7 +17,7 @@ import com.c2kernel.graph.event.VertexRemovedEvent;
 import com.c2kernel.graph.event.VerticesChangedEvent;

 import com.c2kernel.utils.Logger;

 

-public class GraphModel implements Serializable {

+public class GraphModel {

     /* Persistent data */

 

     private int mWidth = 0;

diff --git a/src/main/java/com/c2kernel/graph/model/GraphPoint.java b/src/main/java/com/c2kernel/graph/model/GraphPoint.java
index f2aa165..3b537de 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphPoint.java
+++ b/src/main/java/com/c2kernel/graph/model/GraphPoint.java
@@ -1,8 +1,7 @@
 package com.c2kernel.graph.model;

 

-import java.io.Serializable;

 

-public class GraphPoint implements Serializable{

+public class GraphPoint {

 

     public int x;

     public int y;

diff --git a/src/main/java/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java b/src/main/java/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java
index e5b6c3d..eb3d82a 100644
--- a/src/main/java/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java
+++ b/src/main/java/com/c2kernel/graph/model/TypeNameAndConstructionInfo.java
@@ -1,9 +1,8 @@
 package com.c2kernel.graph.model;

 

-import java.io.Serializable;

 

 

-public class TypeNameAndConstructionInfo implements Serializable

+public class TypeNameAndConstructionInfo

 {

     public String mName = null;

     public Object mInfo = null;

diff --git a/src/main/java/com/c2kernel/graph/model/Vertex.java b/src/main/java/com/c2kernel/graph/model/Vertex.java
index 83f99ef..1e13f7f 100644
--- a/src/main/java/com/c2kernel/graph/model/Vertex.java
+++ b/src/main/java/com/c2kernel/graph/model/Vertex.java
@@ -1,11 +1,10 @@
 package com.c2kernel.graph.model;

 

 import java.awt.Polygon;

-import java.io.Serializable;

 import java.util.Vector;

 

 

-public class Vertex implements Serializable

+public class Vertex

 {

     private int          mId              = -1;

     private String       mName            = "";

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java b/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
index e688a47..d95d12a 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/AdvancementCalculator.java
@@ -1,13 +1,12 @@
 /* Created on 11 mars 2004 */

 package com.c2kernel.lifecycle.instance;

-import java.io.Serializable;

 import java.util.Hashtable;

 

 import com.c2kernel.common.InvalidDataException;

 import com.c2kernel.graph.model.Vertex;

 //import com.c2kernel.utils.Logger;

 /** @author XSeb74 */

-public class AdvancementCalculator implements Serializable

+public class AdvancementCalculator

 {

 	private CompositeActivity activity;

 	private Hashtable<Vertex, Object> isMarked;

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/WfVertexOutlineCreator.java b/src/main/java/com/c2kernel/lifecycle/instance/WfVertexOutlineCreator.java
index bc345f9..79ce859 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/WfVertexOutlineCreator.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/WfVertexOutlineCreator.java
@@ -1,12 +1,10 @@
 package com.c2kernel.lifecycle.instance;

 

-import java.io.Serializable;

-

 import com.c2kernel.graph.model.GraphPoint;

 import com.c2kernel.graph.model.Vertex;

 import com.c2kernel.graph.model.VertexOutlineCreator;

 

-public class WfVertexOutlineCreator implements VertexOutlineCreator,Serializable

+public class WfVertexOutlineCreator implements VertexOutlineCreator

 {

     private static final int mActivityWidth   = 130;

     private static final int mActivityHeight  = 60;

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/State.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/State.java
index dd0c763..399d6d6 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/State.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/State.java
@@ -1,10 +1,9 @@
 package com.c2kernel.lifecycle.instance.stateMachine;

 

-import java.io.Serializable;

 import java.util.HashMap;

 import java.util.Set;

 

-public class State implements Serializable {

+public class State {

 

 	int id;

 	String name;

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
index b16520c..03abafb 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/Transition.java
@@ -1,6 +1,5 @@
 package com.c2kernel.lifecycle.instance.stateMachine;

 

-import java.io.Serializable;

 import java.util.HashMap;

 import java.util.regex.Matcher;

 import java.util.regex.Pattern;

@@ -17,7 +16,7 @@ import com.c2kernel.utils.CastorHashMap;
 import com.c2kernel.utils.LocalObjectLoader;

 import com.c2kernel.utils.Logger;

 

-public class Transition implements Serializable {

+public class Transition {

 

 	int id;

 	String name;

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionOutcome.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionOutcome.java
index ad2d54c..e0f9e1b 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionOutcome.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionOutcome.java
@@ -1,8 +1,7 @@
 package com.c2kernel.lifecycle.instance.stateMachine;

 

-import java.io.Serializable;

 

-public class TransitionOutcome extends TransitionResource implements Serializable {

+public class TransitionOutcome extends TransitionResource {

 	

 	// schema properties

 	String schemaName, schemaVersion; // Name & version of the schema of the data required for this transition. 

diff --git a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionScript.java b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionScript.java
index 271b44d..1d7b66a 100644
--- a/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionScript.java
+++ b/src/main/java/com/c2kernel/lifecycle/instance/stateMachine/TransitionScript.java
@@ -1,8 +1,7 @@
 package com.c2kernel.lifecycle.instance.stateMachine;

 

-import java.io.Serializable;

 

-public class TransitionScript extends TransitionResource implements Serializable {

+public class TransitionScript extends TransitionResource {

 

 	// script properties

 	String scriptName, scriptVersion; // Name & version of the script to be run by the agent during this transition

diff --git a/src/main/java/com/c2kernel/lookup/Path.java b/src/main/java/com/c2kernel/lookup/Path.java
index 1a563b5..bcd04ab 100644
--- a/src/main/java/com/c2kernel/lookup/Path.java
+++ b/src/main/java/com/c2kernel/lookup/Path.java
@@ -10,7 +10,6 @@
 

 package com.c2kernel.lookup;

 

-import java.io.Serializable;

 import java.util.ArrayList;

 import java.util.StringTokenizer;

 import java.util.UUID;

@@ -23,7 +22,7 @@ import com.c2kernel.process.Gateway;
 /**

 * 

 **/

-public abstract class Path implements Serializable

+public abstract class Path

 {

     public static final String delim = "/";

 

diff --git a/src/main/java/com/c2kernel/utils/CastorArrayList.java b/src/main/java/com/c2kernel/utils/CastorArrayList.java
index a7b5d8a..9f105c4 100644
--- a/src/main/java/com/c2kernel/utils/CastorArrayList.java
+++ b/src/main/java/com/c2kernel/utils/CastorArrayList.java
@@ -1,6 +1,5 @@
 package com.c2kernel.utils;

 

-import java.io.Serializable;

 import java.util.ArrayList;

 

 /**************************************************************************

@@ -15,7 +14,7 @@ import java.util.ArrayList;
  * All rights reserved.

  **************************************************************************/

 //

-abstract public class CastorArrayList<E> implements Serializable {

+abstract public class CastorArrayList<E> {

     public ArrayList<E> list;

 

     public CastorArrayList() {

diff --git a/src/main/java/com/c2kernel/utils/GTimeStampComparator.java b/src/main/java/com/c2kernel/utils/GTimeStampComparator.java
index 7dbbf8d..8701b0e 100644
--- a/src/main/java/com/c2kernel/utils/GTimeStampComparator.java
+++ b/src/main/java/com/c2kernel/utils/GTimeStampComparator.java
@@ -1,11 +1,10 @@
 package com.c2kernel.utils;

 

-import java.io.Serializable;

 import java.util.Comparator;

 

 import com.c2kernel.common.GTimeStamp;

 

-public class GTimeStampComparator implements Comparator<GTimeStamp>, Serializable {

+public class GTimeStampComparator implements Comparator<GTimeStamp> {

 

 	@Override

 	public int compare(GTimeStamp t0, GTimeStamp t1) {