[jbpm-commits] JBoss JBPM SVN: r5650 - jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console.

[do-not-reply at jboss.org]

Author: jbarrez
Date: 2009-09-16 09:15:55 -0400 (Wed, 16 Sep 2009)
New Revision: 5650

Modified:
   jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
Log:
Small enhancements in how the current activitities are displayed

Modified: jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java
===================================================================
--- jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java	2009-09-16 12:52:34 UTC (rev 5649)
+++ jbpm4/trunk/modules/integration/console/src/main/java/org/jbpm/integration/console/ModelAdaptor.java	2009-09-16 13:15:55 UTC (rev 5650)
@@ -113,20 +113,24 @@
     if (currentActivities.size() == 1) { 
       tok.setCurrentNodeName(currentActivities.iterator().next());
     }
-    else
-    {
-      tok.setCurrentNodeName(executionId);      
+    else if (currentActivities.size() > 1){
+      StringBuilder strb = new StringBuilder();
+      for (String activeActivity : currentActivities) {
+        strb.append(activeActivity + ",");
+      }
+      tok.setCurrentNodeName(strb.deleteCharAt(strb.length() - 1).toString());      
+    } else {
+      tok.setCurrentNodeName(executionId);
     }
             
     // transitions
     List<String> availableSignals = new ArrayList<String>();
-    /* TODO: FIX THIS
+    /* TODO: in jBPM4, executions don't have outgoing transitions. verifiy if this is needed.
     ExecutionImpl openTopLevelExecution = (ExecutionImpl) execution;
     
     List<Transition> outTransitions = openTopLevelExecution.getActivity().getOutgoingTransitions();
     if (outTransitions != null) {
       for (Transition t : outTransitions) {
-        // TODO: Fix when https://jira.jboss.org/jira/browse/JBPM-2220 is done
         String transitionName = t.getName() != null ? t.getName() : "to_" + t.getDestination().getName();
         availableSignals.add(transitionName);
       }