[overlord-commits] Overlord SVN: r723 - in bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client: engine and 1 other directories.

[overlord-commits at lists.jboss.org]

Author: heiko.braun at jboss.com
Date: 2009-07-31 05:48:37 -0400 (Fri, 31 Jul 2009)
New Revision: 723

Modified:
   bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java
   bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/engine/ViewDeploymentAction.java
   bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
Log:
Remove dependency on DTOParser

Modified: bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java
===================================================================
--- bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java	2009-07-31 09:05:30 UTC (rev 722)
+++ bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/BootstrapAction.java	2009-07-31 09:48:37 UTC (rev 723)
@@ -23,12 +23,15 @@
 
 import com.google.gwt.http.client.RequestBuilder;
 import com.google.gwt.http.client.Response;
+import com.google.gwt.json.client.JSONArray;
 import com.google.gwt.json.client.JSONParser;
 import com.google.gwt.json.client.JSONValue;
 import com.mvc4g.client.Controller;
 import org.jboss.bpm.console.client.common.AbstractRESTAction;
-import org.jboss.bpm.console.client.model.DTOParser;
+import org.jboss.bpm.console.client.model.PluginInfo;
 import org.jboss.bpm.console.client.model.ServerStatus;
+import org.jboss.bpm.console.client.util.ConsoleLog;
+import org.jboss.bpm.console.client.util.JSONWalk;
 
 /**
  * Bootstrap the console form server settings.
@@ -58,9 +61,27 @@
   public void handleSuccessfulResponse(final Controller controller, final Object event, Response response)
   {
     JSONValue json = JSONParser.parse(response.getText());
-    ServerStatus status = DTOParser.parseStatus(json);
+    ServerStatus status = BootstrapAction.parseStatus(json);
 
     // global var
     ServerPlugins.setStatus(status);
   }
+
+  public static ServerStatus parseStatus(JSONValue json)
+  {
+    ConsoleLog.debug("parse " + json);
+
+    ServerStatus status = new ServerStatus();
+
+    JSONArray jsonArray = JSONWalk.on(json).next("plugins").asArray();
+    for (int i = 0; i < jsonArray.size(); i++)
+    {
+      JSONValue item = jsonArray.get(i);
+      String type = JSONWalk.on(item).next("type").asString();
+      boolean avail = JSONWalk.on(item).next("available").asBool();
+      status.getPlugins().add( new PluginInfo(type, avail) );
+    }
+
+    return status;
+  }
 }

Modified: bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/engine/ViewDeploymentAction.java
===================================================================
--- bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/engine/ViewDeploymentAction.java	2009-07-31 09:05:30 UTC (rev 722)
+++ bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/engine/ViewDeploymentAction.java	2009-07-31 09:48:37 UTC (rev 723)
@@ -31,7 +31,7 @@
 /**
  * Cross editor view toggle.
  * Event requires to be a deployment ID.
- * 
+ *
  * @author Heiko.Braun <heiko.braun at jboss.com>
  */
 public class ViewDeploymentAction implements ActionInterface
@@ -48,18 +48,13 @@
   public void execute(Controller controller, Object object)
   {
     String dplId = (String)object;
-    System.out.println("view deployment " + dplId);
 
     Workspace workspace = appContext.getWorkpace();
     if(workspace.hasEditor(EngineEditor.ID))
-    {
       workspace.showEditor(EngineEditor.ID);
-    }
 
     controller.handleEvent(
         new Event(UpdateDeploymentsAction.ID, dplId)
     );
-
-    
   }
 }

Modified: bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java
===================================================================
--- bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java	2009-07-31 09:05:30 UTC (rev 722)
+++ bpm-console/trunk/console/war/src/main/java/org/jboss/bpm/console/client/model/DTOParser.java	2009-07-31 09:48:37 UTC (rev 723)
@@ -294,24 +294,6 @@
     return result;
   }
 
-  public static ServerStatus parseStatus(JSONValue json)
-  {
-    ConsoleLog.debug("parse " + json);
-
-    ServerStatus status = new ServerStatus();
-
-    JSONArray jsonArray = JSONWalk.on(json).next("plugins").asArray();
-    for (int i = 0; i < jsonArray.size(); i++)
-    {
-      JSONValue item = jsonArray.get(i);
-      String type = JSONWalk.on(item).next("type").asString();
-      boolean avail = JSONWalk.on(item).next("available").asBool();
-      status.getPlugins().add( new PluginInfo(type, avail) );
-    }
-
-    return status;
-  }
-
   public static List<DeploymentRef> parseDeploymentRefList(JSONValue json)
   {
     ConsoleLog.debug("parse " + json);