Removed persistency of VertexOutlineCreator - containing subclasses

should set this.
Fixed persistency of GTimeStamp
Fixed CompActOutcome not showing when loaded

1 files changed, 8 insertions, 21 deletions

diff --git a/src/main/java/com/c2kernel/graph/model/GraphModel.java b/src/main/java/com/c2kernel/graph/model/GraphModel.java
index c428e79..63fe0e3 100644
--- a/src/main/java/com/c2kernel/graph/model/GraphModel.java
+++ b/src/main/java/com/c2kernel/graph/model/GraphModel.java
@@ -528,22 +528,8 @@ public class GraphModel implements Serializable {
     }

 

     public void setGraphModelCastorData(GraphModelCastorData data) {

-        Class<?> vertexOutlineCreatorClass = null;

         int i = 0;

-        // Create the vertex outline creator

-        if (data.mClassNameOfVertexOutlineCreator.equals("")) {

-            mVertexOutlineCreator = null;

-        }

-        else {

-            try {

-                vertexOutlineCreatorClass = Class.forName(data.mClassNameOfVertexOutlineCreator);

-                mVertexOutlineCreator = (VertexOutlineCreator)vertexOutlineCreatorClass.newInstance();

-            }

-            catch (Exception e) {

-                e.printStackTrace();

-                mVertexOutlineCreator = null;

-            }

-        }

+

         // Create and populate the vertex hashtable

         mVertexHashtable = new Hashtable<String, Vertex>();

         for (i = 0; i < data.mVertexImpls.length; i++) {

@@ -575,13 +561,14 @@ public class GraphModel implements Serializable {
         for (i = 0; i < directedEdgeImpls.length; i++) {

             directedEdgeImpls[i] = (DirectedEdge)edgeObjs[i];

         }

+        // Disable persistency of the vertex outline creator: determined by container

         // Determine the class name of the vertex outline creator

-        if (mVertexOutlineCreator == null) {

-            className = "";

-        }

-        else {

-            className = mVertexOutlineCreator.getClass().getName();

-        }

+//        if (mVertexOutlineCreator == null) {

+//            className = "";

+//        }

+//        else {

+//            className = mVertexOutlineCreator.getClass().getName();

+//        }

         return new GraphModelCastorData(className, vertexImpls, directedEdgeImpls, mStartVertexId, mNextId);

     }

 }