diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2012-07-02 14:16:20 +0200 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2012-07-02 14:16:20 +0200 |
| commit | cc79e98c4763affba4fa2e17dfe5a412f9de66c3 (patch) | |
| tree | cc9bbf21bed983bec0a9320dc9a3504e3821dbdd /src/main/java/com/c2kernel/graph | |
| parent | 11eb9557a35e17450c0aefb758471f1ff3148336 (diff) | |
Removed persistency of VertexOutlineCreator - containing subclasses
should set this.
Fixed persistency of GTimeStamp
Fixed CompActOutcome not showing when loaded
Diffstat (limited to 'src/main/java/com/c2kernel/graph')
3 files changed, 9 insertions, 26 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);
}
}
diff --git a/src/main/java/com/c2kernel/graph/model/GraphModelCastorData.java b/src/main/java/com/c2kernel/graph/model/GraphModelCastorData.java index 7717c33..955c408 100644 --- a/src/main/java/com/c2kernel/graph/model/GraphModelCastorData.java +++ b/src/main/java/com/c2kernel/graph/model/GraphModelCastorData.java @@ -3,6 +3,7 @@ package com.c2kernel.graph.model; public class GraphModelCastorData
{
+ // Deprecated: Vertex outline creator is now set by the container
public String mClassNameOfVertexOutlineCreator = "";
public Vertex[] mVertexImpls = {};
public DirectedEdge[] mEdgeImpls = {};
diff --git a/src/main/java/com/c2kernel/graph/model/GraphableVertex.java b/src/main/java/com/c2kernel/graph/model/GraphableVertex.java index cb4724d..7c9adef 100644 --- a/src/main/java/com/c2kernel/graph/model/GraphableVertex.java +++ b/src/main/java/com/c2kernel/graph/model/GraphableVertex.java @@ -113,11 +113,6 @@ public abstract class GraphableVertex extends Vertex }
return null;
}
- // deprecated methods
- public GraphableVertex[] getCNonLayoutableChildren() {
- return new GraphableVertex[0];
- }
- public void setCNonLayoutableChildren(GraphableVertex[] dummy) { }
/**@returns the Graphable searched or null if not this or children*/
public GraphableVertex search(String ids)
|