[jbpm-commits] JBoss JBPM SVN: r6388 - projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/app and 1 other directory.

[do-not-reply at jboss.org]

Author: alex.guizar at jboss.com
Date: 2010-06-01 20:50:02 -0400 (Tue, 01 Jun 2010)
New Revision: 6388

Modified:
   jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
   projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/app/t_tokens.xhtml
Log:
JBPM-1930: do not sort if there are no available transitions

Modified: jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/Token.java
===================================================================
--- jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/Token.java	2010-06-01 18:39:14 UTC (rev 6387)
+++ jbpm3/branches/jbpm-3.2-soa/modules/core/src/main/java/org/jbpm/graph/exe/Token.java	2010-06-02 00:50:02 UTC (rev 6388)
@@ -23,6 +23,7 @@
 
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -223,10 +224,10 @@
    * resolves to true.
    */
   public Set getAvailableTransitions() {
+    if (node == null) return Collections.EMPTY_SET;
+
     Set availableTransitions = new HashSet();
-    if (node != null) {
-      addAvailableTransitionsOfNode(node, availableTransitions);
-    }
+    addAvailableTransitionsOfNode(node, availableTransitions);
     return availableTransitions;
   }
 

Modified: projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/app/t_tokens.xhtml
===================================================================
--- projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/app/t_tokens.xhtml	2010-06-01 18:39:14 UTC (rev 6387)
+++ projects/jsf-console/branches/jsf-console-3.2-soa/console/src/main/webapp/app/t_tokens.xhtml	2010-06-02 00:50:02 UTC (rev 6388)
@@ -152,7 +152,8 @@
                     <h:form>
                         <ga:attribute name="rendered" value="#{token.end == null and ! token.suspended}"/>
                         <ga:responseActions>
-                            <gd:sort source="#{token.availableTransitions}" target="#{transitions}"
+                            <gd:sort if="#{! empty token.availableTransitions}"
+                                source="#{token.availableTransitions}" target="#{transitions}"
                                 entryVar="t" argument="#{t.name != null ? t.name : ''}"/>
                         </ga:responseActions>
                         <gd:repeat value="#{transitions}" var="transition">