[gwt-contrib] [google-web-toolkit] r8280 committed - Update HtmlUnit logging....

[codesite-noreply]

Revision: 8280
Author: amitman...@google.com
Date: Fri Jun 18 06:44:18 2010
Log: Update HtmlUnit logging.
Review at http://gwt-code-reviews.appspot.com/632802

http://code.google.com/p/google-web-toolkit/source/detail?r=8280

Modified:
 /trunk/dev/core/src/com/google/gwt/dev/shell/HostedModePluginObject.java
 /trunk/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java

=======================================
---  
/trunk/dev/core/src/com/google/gwt/dev/shell/HostedModePluginObject.java	 
Thu Mar 25 10:46:07 2010
+++  
/trunk/dev/core/src/com/google/gwt/dev/shell/HostedModePluginObject.java	 
Fri Jun 18 06:44:18 2010
@@ -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;
     }
   }
=======================================
--- /trunk/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java	Thu Mar 25  
10:46:07 2010
+++ /trunk/user/src/com/google/gwt/junit/RunStyleHtmlUnit.java	Fri Jun 18  
06:44:18 2010
@@ -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;
-
-    public HostedJavaScriptEngine(WebClient webClient) {
+    private final TreeLogger logger;
+
+    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);
     }
   }

--
http://groups.google.com/group/Google-Web-Toolkit-Contributors