From 458169a9729b9bd4b509285ce79e8517b3853c9b Mon Sep 17 00:00:00 2001 From: Andrew Branson Date: Thu, 6 Mar 2014 16:40:35 +0100 Subject: Added space to schema column in HistoryPane Fixed NullPointer on workflow export Prevent CompositeActivityDefs in error from being submitted --- .../com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java') diff --git a/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java b/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java index 3cdefee..fef2438 100644 --- a/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java +++ b/src/main/java/com/c2kernel/gui/lifecycle/desc/CompActDefOutcomeHandler.java @@ -14,6 +14,7 @@ import javax.swing.JPanel; import javax.swing.JSplitPane; import com.c2kernel.graph.layout.DefaultGraphLayoutGenerator; +import com.c2kernel.graph.model.GraphableVertex; import com.c2kernel.gui.ImageLoader; import com.c2kernel.gui.MainFrame; import com.c2kernel.gui.graph.view.EditorPanel; @@ -26,6 +27,7 @@ import com.c2kernel.gui.tabs.outcome.OutcomeHandler; import com.c2kernel.gui.tabs.outcome.OutcomeNotInitialisedException; import com.c2kernel.lifecycle.CompositeActivityDef; import com.c2kernel.lifecycle.WfVertexDefOutlineCreator; +import com.c2kernel.lifecycle.instance.WfVertex; import com.c2kernel.process.Gateway; import com.c2kernel.utils.FileStringUtility; import com.c2kernel.utils.Logger; @@ -182,6 +184,8 @@ public class CompActDefOutcomeHandler */ @Override public String getOutcome() throws OutcomeException { + if (!mCompActDef.verify()) + throw new OutcomeException(mCompActDef.getErrors()); try { return Gateway.getMarshaller().marshall(mCompActDef); } catch (Exception ex) { -- cgit v1.2.3