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/lifecycle/CompositeActivityDef.java | |
| 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/lifecycle/CompositeActivityDef.java')
| -rw-r--r-- | src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java | 10 |
1 files changed, 7 insertions, 3 deletions
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];
|