[jbpm-commits] JBoss JBPM SVN: r2920 - in projects/gwt-console/trunk: server/src/main/java/org/jboss/bpm/console/server/dao/internal and 4 other directories.

Author: heiko.braun(a)jboss.com Date: 2008-11-14 04:07:25 -0500 (Fri, 14 Nov 2008) New Revision: 2920 Added: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/lock.png projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/lock_small.png projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/unlock.png Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/TokenReference.java projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java 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/widgets/TokenEditor.java projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenForm.java projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css Log: Disallow signaling on tokens that are terminated or have active children Modified: projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/TokenReference.java =================================================================== --- projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/TokenReference.java 2008-11-14 07:51:48 UTC (rev 2919) +++ projects/gwt-console/trunk/rpc/src/main/java/org/jboss/bpm/console/client/model/jbpm3/TokenReference.java 2008-11-14 09:07:25 UTC (rev 2920) @@ -41,6 +41,8 @@ private Set<TokenReference> children = new HashSet<TokenReference>(); private List<String> availableSignals = new ArrayList<String>(); + private boolean canBeSignaled = true; + public TokenReference(long id, String name, String nodeName) { this.id = id; @@ -73,4 +75,13 @@ return currentNodeName; } + public boolean canBeSignaled() + { + return canBeSignaled; + } + + public void setCanBeSignaled(boolean canBeSignaled) + { + this.canBeSignaled = canBeSignaled; + } } Modified: projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java =================================================================== --- projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java 2008-11-14 07:51:48 UTC (rev 2919) +++ projects/gwt-console/trunk/server/src/main/java/org/jboss/bpm/console/server/dao/internal/Transform.java 2008-11-14 09:07:25 UTC (rev 2920) @@ -63,6 +63,9 @@ { TokenReference token = new TokenReference(t0.getId(), t0.getName(), t0.getNode().getName()); + if(t0.hasActiveChildren() || t0.isTerminatedImplicitly()) + token.setCanBeSignaled(false); + Map children = t0.getChildren(); if(children!=null) { 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-14 07:51:48 UTC (rev 2919) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java 2008-11-14 09:07:25 UTC (rev 2920) @@ -213,8 +213,12 @@ long rootTokenId = JSONWalk.on(jso).next("id").asLong(); String name = JSONWalk.on(jso).next("name").asString(); String nodeName = JSONWalk.on(jso).next("currentNodeName").asString(); + TokenReference rt = new TokenReference(rootTokenId, name, nodeName); + boolean canBeSignaled = JSONWalk.on(jso).next("canBeSignaled").asBool(); + rt.setCanBeSignaled(canBeSignaled); + JSONArray signals = JSONWalk.on(jso).next("availableSignals").asArray(); for(int i=0; i<signals.size(); i++) { Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenEditor.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenEditor.java 2008-11-14 07:51:48 UTC (rev 2919) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenEditor.java 2008-11-14 09:07:25 UTC (rev 2920) @@ -127,6 +127,9 @@ } } ); + + if(!tok.canBeSignaled()) + treeNode.setIcon("images/icons/lock.png"); return treeNode; } } Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenForm.java =================================================================== --- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenForm.java 2008-11-14 07:51:48 UTC (rev 2919) +++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/widgets/TokenForm.java 2008-11-14 09:07:25 UTC (rev 2920) @@ -32,7 +32,6 @@ import com.gwtext.client.widgets.form.Form; import com.gwtext.client.widgets.form.FormPanel; import com.gwtext.client.widgets.form.TextField; -import com.allen_sauer.gwt.log.client.Log; import org.jboss.bpm.console.client.UIConstants; import org.jboss.bpm.console.client.model.ProcessInstance; import org.jboss.bpm.console.client.model.jbpm3.TokenReference; @@ -158,11 +157,16 @@ cb.setStore(store); // suspended instances cannot be signaled - if(processInstance.isSuspended()) + if(processInstance.isSuspended() || !tok.canBeSignaled()) + { signalButton.disable(); + cb.disable(); + } else + { signalButton.enable(); - + cb.enable(); + } } // ----------- Modified: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css =================================================================== --- projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-11-14 07:51:48 UTC (rev 2919) +++ projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/console.css 2008-11-14 09:07:25 UTC (rev 2920) @@ -114,6 +114,10 @@ background-image: url( images/icons/add.png) } +.bpm-lock-icon-small { + background-image: url( images/icons/lock_small.png) +} + .bpm-remove-icon { background-image: url( images/icons/remove.png) } Added: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/lock.png =================================================================== (Binary files differ) Property changes on: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/lock.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/lock_small.png =================================================================== (Binary files differ) Property changes on: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/lock_small.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/unlock.png =================================================================== (Binary files differ) Property changes on: projects/gwt-console/trunk/war/src/main/resources/org/jboss/bpm/console/public/images/icons/unlock.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream