commit 7d737774fd26566b100e4e2117811a840571f751
author amitmanjhi@google.com <amitmanjhi@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Fri Jun 18 13:44:18 2010 +0000
committer amitmanjhi@google.com <amitmanjhi@google.com@8db76d5a-ed1c-0410-87a9-c151d255dfc7> Fri Jun 18 13:44:18 2010 +0000
tree c3e092916b6f0f209dedc263132e3f4db9121ff2
parent 38b3eca547836a8da4711ee81043b28474c1a9fa

Update HtmlUnit logging.

Review at http://gwt-code-reviews.appspot.com/632802


git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@8280 8db76d5a-ed1c-0410-87a9-c151d255dfc7

dev/core/src/com/google/gwt/dev/shell/HostedModePluginObject.java

diff --git a/dev/core/src/com/google/gwt/dev/shell/HostedModePluginObject.java b/dev/core/src/com/google/gwt/dev/shell/HostedModePluginObject.java
index 37d54b6..4cbe870 100644
--- a/dev/core/src/com/google/gwt/dev/shell/HostedModePluginObject.java
+++ b/dev/core/src/com/google/gwt/dev/shell/HostedModePluginObject.java
@@ -15,6 +15,8 @@
  */
 package com.google.gwt.dev.shell;
 
+import com.google.gwt.core.ext.TreeLogger;
+
 import com.gargoylesoftware.htmlunit.javascript.JavaScriptEngine;
 import com.gargoylesoftware.htmlunit.javascript.host.Window;
 import com.gargoylesoftware.htmlunit.javascript.host.WindowProxy;
@@ -140,7 +142,8 @@
   private Scriptable disconnectMethod;
   private Scriptable initMethod;
   private Window window;
-  private JavaScriptEngine jsEngine;
+  private final JavaScriptEngine jsEngine;
+  private final TreeLogger logger;
 
   private BrowserChannelClient browserChannelClient;
 
@@ -149,8 +152,9 @@
    * 
    * @param jsEngine The JavaScriptEngine.
    */
-  public HostedModePluginObject(JavaScriptEngine jsEngine) {
+  public HostedModePluginObject(JavaScriptEngine jsEngine, TreeLogger logger) {
     this.jsEngine = jsEngine;
+    this.logger = logger;
   }
 
   /**
@@ -168,6 +172,8 @@
       String module, String version) {
     String addressParts[] = address.split(":");
     if (addressParts.length < 2) {
+      logger.log(TreeLogger.ERROR, "connect failed because address " + address
+          + " was not of the form foo.com:8080");
       return false;
     }
     // TODO: add whitelist and default-port support?
@@ -181,10 +187,12 @@
           htmlUnitSessionHandler, browserChannelClient));
       return browserChannelClient.process();
     } catch (BrowserChannelException e) {
-      e.printStackTrace();
+      logger.log(TreeLogger.ERROR,
+          "BrowserChannelException returned from connect " + e.getMessage(), e);
       return false;
     } catch (IOException e) {
-      e.printStackTrace();
+      logger.log(TreeLogger.ERROR, "IOException returned from connect "
+          + e.getMessage(), e);
       return false;
     }
   }
@@ -193,6 +201,8 @@
     try {
       return browserChannelClient.disconnectFromHost();
     } catch (IOException e) {
+      logger.log(TreeLogger.ERROR, "IOException returned from disconnect "
+          + e.getMessage(), e);
       return false;
     }
   }

user/src/com/google/gwt/junit/RunStyleHtmlUnit.java

diff --git a/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java b/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
index 9a2b3b1..22c1354 100644
--- a/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
+++ b/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java
@@ -116,7 +116,8 @@
 
     protected void setupWebClient(WebClient webClient) {
       if (developmentMode) {
-        JavaScriptEngine hostedEngine = new HostedJavaScriptEngine(webClient);
+        JavaScriptEngine hostedEngine = new HostedJavaScriptEngine(webClient,
+            treeLogger);
         webClient.setJavaScriptEngine(hostedEngine);
       }
     }
@@ -130,9 +131,11 @@
   private static class HostedJavaScriptEngine extends JavaScriptEngine {
 
     private static final long serialVersionUID = 3594816610842448691L;
+    private final TreeLogger logger;
 
-    public HostedJavaScriptEngine(WebClient webClient) {
+    public HostedJavaScriptEngine(WebClient webClient, TreeLogger logger) {
       super(webClient);
+      this.logger = logger;
     }
 
     @Override
@@ -141,7 +144,7 @@
       super.initialize(webWindow);
       Window window = (Window) webWindow.getScriptObject();
       window.defineProperty("__gwt_HostedModePlugin",
-          new HostedModePluginObject(this), ScriptableObject.READONLY);
+          new HostedModePluginObject(this, logger), ScriptableObject.READONLY);
     }
   }