From cc79e98c4763affba4fa2e17dfe5a412f9de66c3 Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Mon, 2 Jul 2012 14:16:20 +0200 Subject: Removed persistency of VertexOutlineCreator - containing subclasses should set this. Fixed persistency of GTimeStamp Fixed CompActOutcome not showing when loaded --- src/main/java/com/c2kernel/lifecycle/CompositeActivityDef.java | 10 +++++++--- .../com/c2kernel/lifecycle/instance/CompositeActivity.java | 5 +++++ src/main/java/com/c2kernel/lifecycle/instance/Workflow.java | 4 ++-- 3 files changed, 14 insertions(+), 5 deletions(-) (limited to 'src/main/java/com/c2kernel/lifecycle') 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() -- cgit v1.2.3