Author: heiko.braun(a)jboss.com Date: 2008-11-26 04:31:53 -0500 (Wed, 26 Nov 2008) New Revision: 3097 Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/Transform.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/UIConstants.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java Log: Fix JBPM-1828: TaskRef transition names are null Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/Transform.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/Transform.java 2008-11-26 09:24:00 UTC (rev 3096) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/integration/jbpm3/Transform.java 2008-11-26 09:31:53 UTC (rev 3097) @@ -80,7 +80,8 @@ for(Object tr0 : t0.getNode().getLeavingTransitionsList()) { Transition transition = (Transition)tr0; - token.getAvailableSignals().add(transition.getName()); + String tName = transition.getName()!=null ? transition.getName() : "default transition"; + token.getAvailableSignals().add(tName); } return token; @@ -118,20 +119,18 @@ t0.isBlocking(), t0.isSignalling() ); - List<Transition> transitionList = (List<Transition>) - t0.getToken().getNode().getLeavingTransitionsList(); - Set<PooledActor> pooledActors = (Set<PooledActor>)t0.getPooledActors(); for(PooledActor p : pooledActors) { taskRef.addPooledActor(p.getActorId()); } - for(Transition trs0 : transitionList) + List<Transition> transitionList = + t0.getToken().getNode().getLeavingTransitionsList(); + for(Transition transition : transitionList) { - taskRef.getTransitionNames().add( - trs0.getName() - ); + String tName = transition.getName()!=null ? transition.getName() : "default transition"; + taskRef.getTransitionNames().add(tName); } return taskRef; Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/UIConstants.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/UIConstants.java 2008-11-26 09:24:00 UTC (rev 3096) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/UIConstants.java 2008-11-26 09:31:53 UTC (rev 3097) @@ -34,6 +34,6 @@ public static final int TEASER_PANEL_WIDTH = 200; public static final int EDITOR_PANEL_WIDTH = 450; - public static final String DEFAULT_TRANSITION = "(Default transition)"; + public static final String DEFAULT_TRANSITION = "default transition"; public static final String DATE_FORMAT = "yyyy-m-j H:i:s"; //08-10-02 13:51:27 } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-11-26 09:24:00 UTC (rev 3096) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-11-26 09:31:53 UTC (rev 3097) @@ -22,6 +22,7 @@ package org.jboss.bpm.console.client.model; import com.google.gwt.json.client.*; +import com.allen_sauer.gwt.log.client.Log; import org.jboss.bpm.console.client.util.ConsoleLog; import org.jboss.bpm.console.client.model.forms.FieldDef; import org.jboss.bpm.console.client.model.forms.FormDef; @@ -130,7 +131,10 @@ { JSONValue jsonValue = arr.get(k); if(jsonValue.toString().equals("null")) + { + Log.warn("FIXME JBPM-1828: Null value on transitionNames:" +arr.toString()); continue; // TODO: JBPM-1828 + } JSONString t = jsonValue.isString(); ref.getTransitionNames().add(t.stringValue()); } @@ -233,7 +237,10 @@ { JSONValue jsonValue = signals.get(i); if(jsonValue.toString().equals("null")) + { + Log.warn("FIXME JBPM-1828: Null value on availableSignals:" +signals.toString()); continue; // TODO: JBPM-1828 + } JSONString item = jsonValue.isString(); rt.getAvailableSignals().add(item.stringValue()); } @@ -261,7 +268,10 @@ { JSONValue jsonValue = jsonArray.get(i); if(jsonValue.toString().equals("null")) + { + Log.warn("FIXME JBPM-1828: Null value on string array:" +jsonArray.toString()); continue; // TODO: JBPM-1828 + } JSONString item = jsonValue.isString(); result.add(item.stringValue()); }