diff options
Diffstat (limited to 'src/main/java/com')
7 files changed, 24 insertions, 31 deletions
diff --git a/src/main/java/com/c2kernel/collection/Aggregation.java b/src/main/java/com/c2kernel/collection/Aggregation.java index f840d41..9c7b4ce 100644 --- a/src/main/java/com/c2kernel/collection/Aggregation.java +++ b/src/main/java/com/c2kernel/collection/Aggregation.java @@ -37,6 +37,7 @@ abstract public class Aggregation extends Parent2ChildCollection<AggregationMemb public void setLayout(GraphModel layout)
{
mLayout = layout;
+ layout.setVertexOutlineCreator(new AggregationVertexOutlineCreator());
}
public TypeNameAndConstructionInfo[] getVertexTypeNameAndConstructionInfo()
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)
diff --git a/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java b/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java index 54487f4..c430f20 100644 --- a/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java +++ b/src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java @@ -18,12 +18,12 @@ public class CompositeActivityDef extends ActivityDef {
private final TypeNameAndConstructionInfo[] mVertexTypeNameAndConstructionInfo =
{
- new TypeNameAndConstructionInfo(Language.translate("Atomic"), "Atomic"),
+ new TypeNameAndConstructionInfo(Language.translate("Activity"), "Atomic"),
new TypeNameAndConstructionInfo(Language.translate("Composite"), "Composite"),
new TypeNameAndConstructionInfo(Language.translate("AND Split"), "And"),
new TypeNameAndConstructionInfo(Language.translate("OR Split"), "Or"),
new TypeNameAndConstructionInfo(Language.translate("XOR Split"), "XOr"),
- new TypeNameAndConstructionInfo(Language.translate("Junction"), "Join"),
+ new TypeNameAndConstructionInfo(Language.translate("Join"), "Join"),
new TypeNameAndConstructionInfo(Language.translate("Loop"), "Loop"),
};
private final TypeNameAndConstructionInfo[] mEdgeTypeNameAndConstructionInfo =
@@ -214,7 +214,11 @@ public class CompositeActivityDef extends ActivityDef return getName();
return super.getPath();
}
-
+ @Override
+ public void setChildrenGraphModel(GraphModel childrenGraph) {
+ super.setChildrenGraphModel(childrenGraph);
+ childrenGraph.setVertexOutlineCreator(new WfVertexDefOutlineCreator());
+ }
//deprecated
public String[] getCastorNonLayoutableChildren() {
return new String[0];
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java index 0928c83..45d04c0 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/CompositeActivity.java @@ -39,6 +39,11 @@ public class CompositeActivity extends Activity setIsComposite(true);
}
+ @Override
+ public void setChildrenGraphModel(GraphModel childrenGraph) {
+ super.setChildrenGraphModel(childrenGraph);
+ childrenGraph.setVertexOutlineCreator(new WfVertexOutlineCreator());
+ }
/**
* @see com.c2kernel.lifecycle.instance.WfVertex#verify()
*/
diff --git a/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java b/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java index c51d6fe..321e53e 100644 --- a/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java +++ b/src/main/java/com/c2kernel/lifecycle/instance/Workflow.java @@ -31,12 +31,12 @@ public class Workflow extends CompositeActivity implements C2KLocalObject new TypeNameAndConstructionInfo(Language.translate("XOR Split"), "XOrSplit"),
new TypeNameAndConstructionInfo(Language.translate("Join"), "Join"),
new TypeNameAndConstructionInfo(Language.translate("Loop"), "LoopSplit"),
- new TypeNameAndConstructionInfo(Language.translate("Atomic"), "Atomic"),
+ new TypeNameAndConstructionInfo(Language.translate("Activity"), "Atomic"),
new TypeNameAndConstructionInfo(Language.translate("Composite"), "Composite")
};
private final TypeNameAndConstructionInfo[] mEdgeTypeNameAndConstructionInfo =
{
- new TypeNameAndConstructionInfo(Language.translate("Next Edge"), "Next")
+ new TypeNameAndConstructionInfo(Language.translate("Next"), "Next")
};
/**
* @see java.lang.Object#Object()
|