[jbpm-commits] JBoss JBPM SVN: r2676 - in projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client: process and 1 other directories.

[do-not-reply at jboss.org]

Author: heiko.braun at jboss.com
Date: 2008-10-30 08:48:25 -0400 (Thu, 30 Oct 2008)
New Revision: 2676

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/process/ProcessDefinitionList.java
   projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java
Log:
Parse TaskRefernces upon store.load() in TaskList

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-10-30 11:19:39 UTC (rev 2675)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java	2008-10-30 12:48:25 UTC (rev 2676)
@@ -72,34 +72,39 @@
       for (int i = 0; i < array.size(); ++i)
       {
          JSONObject item = array.get(i).isObject();
-         long id = JSONWalk.on(item).next("id").asLong();
-         long tokenId = JSONWalk.on(item).next("tokenId").asLong();
-         long instanceId = JSONWalk.on(item).next("processInstanceId").asLong();
-         String name = JSONWalk.on(item).next("name").asString();
-         String actor = JSONWalk.on(item).next("actor").asString();
-         boolean isBlocking = JSONWalk.on(item).next("isBlocking").asBool();
-         boolean isSignalling = JSONWalk.on(item).next("isSignalling").asBool();
-                                                        
-         TaskReference ref = new TaskReference(
-               id, tokenId, instanceId,
-               name, actor,
-               isSignalling, isBlocking
-         );
+         TaskReference ref = parseTaskReference(item);
+         results.add(ref);
+      }
 
-         if(isSignalling)
+      return results;
+   }
+
+   public static TaskReference parseTaskReference(JSONObject item)
+   {
+      long id = JSONWalk.on(item).next("id").asLong();
+      long tokenId = JSONWalk.on(item).next("tokenId").asLong();
+      long instanceId = JSONWalk.on(item).next("processInstanceId").asLong();
+      String name = JSONWalk.on(item).next("name").asString();
+      String actor = JSONWalk.on(item).next("actor").asString();
+      boolean isBlocking = JSONWalk.on(item).next("isBlocking").asBool();
+      boolean isSignalling = JSONWalk.on(item).next("isSignalling").asBool();
+
+      TaskReference ref = new TaskReference(
+            id, tokenId, instanceId,
+            name, actor,
+            isSignalling, isBlocking
+      );
+
+      if(isSignalling)
+      {
+         JSONArray arr = JSONWalk.on(item).next("transitionNames").asArray();
+         for (int k = 0; k < arr.size(); ++k)
          {
-            JSONArray arr = JSONWalk.on(item).next("transitionNames").asArray();
-            for (int k = 0; k < arr.size(); ++k)
-            {
-               JSONString t = arr.get(k).isString();               
-               ref.getTransitionNames().add(t.stringValue());
-            }
+            JSONString t = arr.get(k).isString();
+            ref.getTransitionNames().add(t.stringValue());
          }
-
-         results.add(ref);
-
       }
 
-      return results;
+      return ref;
    }
 }

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java	2008-10-30 11:19:39 UTC (rev 2675)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/process/ProcessDefinitionList.java	2008-10-30 12:48:25 UTC (rev 2676)
@@ -161,7 +161,7 @@
          i++;
       }
 
-      System.out.println("Loaded " + row2ProcessMap.size() + " records");
+      System.out.println("Loaded " + row2ProcessMap.size() + " process definitions");
    }
 
    public List<ProcessDefinition> getAvailableProcessDefinitions()

Modified: projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java
===================================================================
--- projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java	2008-10-30 11:19:39 UTC (rev 2675)
+++ projects/gwt-console/trunk/war/src/main/java/org/jboss/bpm/console/client/task/TaskList.java	2008-10-30 12:48:25 UTC (rev 2676)
@@ -21,17 +21,26 @@
  */
 package org.jboss.bpm.console.client.task;
 
-import org.jboss.bpm.console.client.widgets.RemoteListView;
-import org.jboss.bpm.console.client.MainView;
+import com.google.gwt.core.client.JavaScriptObject;
+import com.google.gwt.json.client.JSONObject;
 import com.gwtext.client.data.*;
+import com.gwtext.client.widgets.grid.ColumnConfig;
 import com.gwtext.client.widgets.grid.ColumnModel;
-import com.gwtext.client.widgets.grid.ColumnConfig;
+import org.jboss.bpm.console.client.MainView;
+import org.jboss.bpm.console.client.model.DTOParser;
+import org.jboss.bpm.console.client.model.TaskReference;
+import org.jboss.bpm.console.client.widgets.RemoteListView;
 
+import java.util.Map;
+import java.util.HashMap;
+
 /**
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
 public class TaskList extends RemoteListView
 {
+   private Map<Integer,TaskReference> row2taskref = new HashMap<Integer,TaskReference>();
+
    public TaskList(String titleName, final MainView view)
    {
       super(titleName, view,
@@ -59,7 +68,17 @@
 
    protected void onRecordsLoaded(Record[] records)
    {
+      int i=0;
+      for(Record r : records)
+      {
+         JavaScriptObject js = r.getDataAsJsObject();
+         JSONObject jso = new JSONObject(js);
+         TaskReference ref = DTOParser.parseTaskReference(jso);
+         row2taskref.put(i, ref);
+         i++;
+      }
 
+      System.out.println("Loaded " + row2taskref.size() + " tasks");
    }
 
    protected ColumnModel createColumnModel()