summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSidharth Singh2012-08-02 01:23:17 (EDT)
committerManik Kishore2012-08-07 05:02:01 (EDT)
commit4c6ecea93c513bca0c7910c26f0458f23e59bb9d (patch)
tree89379ad16a489360ffed4668eedd1b85172a31b0
parent45803d6c687895cf05b9ffd2375be882b512c75f (diff)
downloadorg.eclipse.stardust.ui.web-4c6ecea93c513bca0c7910c26f0458f23e59bb9d.zip
org.eclipse.stardust.ui.web-4c6ecea93c513bca0c7910c26f0458f23e59bb9d.tar.gz
org.eclipse.stardust.ui.web-4c6ecea93c513bca0c7910c26f0458f23e59bb9d.tar.bz2
Jira-ID: CRNT-25626
1)Removed ObjectNotFoundException and added check if startEvent is empty check for endEvent in createConnection git-svn-id: http://emeafrazerg/svn/ipp/product/trunk/stardust/ui.web@58110 8100b5e0-4d52-466c-ae9c-bdeccbdeaf6b
-rw-r--r--web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java13
1 files changed, 7 insertions, 6 deletions
diff --git a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java
index 4af9657..ef9d4fa 100644
--- a/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java
+++ b/web-modeler/src/main/java/org/eclipse/stardust/ui/web/modeler/edit/diagram/node/ConnectionCommandHandler.java
@@ -81,19 +81,19 @@ public class ConnectionCommandHandler
else if (ModelerConstants.EVENT_KEY.equals(extractString(request,
ModelerConstants.TO_MODEL_ELEMENT_TYPE)))
{
- try
- {
- StartEventSymbol startEventSymbol = MBFacade.findStartEventSymbol(
- processDefinition.getDiagram().get(0),
- extractLong(request, ModelerConstants.TO_MODEL_ELEMENT_OID));
+ StartEventSymbol startEventSymbol = MBFacade.findStartEventSymbol(
+ processDefinition.getDiagram().get(0),
+ extractLong(request, ModelerConstants.TO_MODEL_ELEMENT_OID));
+ if (null != startEventSymbol)
+ {
createControlFlowConnection(request, processDefinition,
startEventSymbol, MBFacade.findActivitySymbol(
processDefinition.getDiagram().get(0),
extractLong(request,
ModelerConstants.FROM_MODEL_ELEMENT_OID)), maxOid);
}
- catch (ObjectNotFoundException x)
+ else
{
EndEventSymbol endEventSymbol = MBFacade.findEndEventSymbol(
processDefinition.getDiagram().get(0),
@@ -104,6 +104,7 @@ public class ConnectionCommandHandler
extractLong(request,
ModelerConstants.FROM_MODEL_ELEMENT_OID)),
endEventSymbol, maxOid);
+
}
}
else if (ModelerConstants.DATA.equals(extractString(request,