[jbpm-commits] JBoss JBPM SVN: r3225 - in jbpm3/trunk/modules: core/src/main/java/org/jbpm/graph/node and 2 other directories.

Author: thomas.diesler(a)jboss.com Date: 2008-12-05 09:19:35 -0500 (Fri, 05 Dec 2008) New Revision: 3225 Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Node.java jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/StartState.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java Log: Restore optional name in StartState Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Node.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Node.java 2008-12-05 14:18:51 UTC (rev 3224) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/def/Node.java 2008-12-05 14:19:35 UTC (rev 3225) @@ -65,6 +65,15 @@ return NodeType.Node; } + public String getNameExt() + { + String name = super.getName(); + if (name == null) + name = "#anonymous" + getNodeType(); + + return name; + } + // event types ////////////////////////////////////////////////////////////// public static final String[] supportedEventTypes = new String[] { Modified: jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/StartState.java =================================================================== --- jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/StartState.java 2008-12-05 14:18:51 UTC (rev 3224) +++ jbpm3/trunk/modules/core/src/main/java/org/jbpm/graph/node/StartState.java 2008-12-05 14:19:35 UTC (rev 3225) @@ -44,10 +44,6 @@ @Override public String getName() { - String name = super.getName(); - if (name == null) - name = "StartState"; - return name; } Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java 2008-12-05 14:18:51 UTC (rev 3224) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/NodeImpl.java 2008-12-05 14:19:35 UTC (rev 3225) @@ -69,7 +69,7 @@ public String getName() { - return getDelegate().getName(); + return getDelegate().getNameExt(); } public ProcessDefinition getProcessDefinition() Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java 2008-12-05 14:18:51 UTC (rev 3224) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/model/ProcessImpl.java 2008-12-05 14:19:35 UTC (rev 3225) @@ -217,9 +217,8 @@ // Set process to active setProcessStatus(ProcessStatus.Active); - // Fire the jbpm3 start event - NodeImpl<?> initialNode = (NodeImpl<?>)token.getCurrentNode(); - procInst.fireStartEvent(initialNode.getDelegate()); + // Fire the start event + procInst.fireStartEvent(rootToken.getNode()); // Signal the root token token.signal(); Modified: jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java =================================================================== --- jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-05 14:18:51 UTC (rev 3224) +++ jbpm3/trunk/modules/integration/spec/src/main/java/org/jbpm/integration/spec/runtime/TokenImpl.java 2008-12-05 14:19:35 UTC (rev 3225) @@ -134,7 +134,7 @@ // @Override public Node getCurrentNode() { - String nodeName = getDelegate().getNode().getName(); + String nodeName = getDelegate().getNode().getNameExt(); return getProcess().getNode(nodeName); } @@ -187,7 +187,6 @@ ExecutionContext bpmContext = ctxService.getExecutionContext(true); try { - // Make sure we have a current node NodeImpl<?> currNode = (NodeImpl<?>)getCurrentNode(); if (currNode == null) throw new IllegalStateException("Cannot signal token with no current node: " + this);