Create a glass panel when dev mode fails to load your module, exactly like the glass panel which indicates
lost communication with the development mode server.
Review at http://gwt-code-reviews.appspot.com/730802
Fixes issues: 1617
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@8509 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html b/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html
index 239f59c..dfd3d1c 100644
--- a/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html
+++ b/dev/core/src/com/google/gwt/core/ext/linker/impl/hosted.html
@@ -12,7 +12,7 @@
var moduleName = moduleFunc ? moduleFunc.moduleName : "unknown";
$stats({moduleName:moduleName,sessionId:$sessionId,subSystem:'startup',evtGroup:'moduleStartup',millis:(new Date()).getTime(),type:'moduleEvalStart'});
}
-var $hostedHtmlVersion="2.0";
+var $hostedHtmlVersion="2.1";
var gwtOnLoad;
var $hosted = "localhost:9997";
@@ -157,6 +157,15 @@
}
function __gwt_disconnected_impl() {
+ __gwt_displayGlassMessage('GWT Code Server Disconnected',
+ 'Most likely, you closed GWT development mode. Or you might have lost '
+ + 'network connectivity. To fix this, try restarting GWT Development Mode and '
+ + '<a style="color: #FFFFFF; font-weight: bold;" href="javascript:location.reload()">'
+ + 'REFRESH</a> this page.');
+}
+
+// Note this method is also used by ModuleSpace.java
+function __gwt_displayGlassMessage(summary, details) {
var topWin = window.top;
var topDoc = topWin.document;
var outer = topDoc.createElement("div");
@@ -164,8 +173,8 @@
outer.innerHTML =
'<div style="position:absolute;z-index:2147483646;left:0px;top:0px;right:0px;bottom:0px;filter:alpha(opacity=75);opacity:0.75;background-color:#000000;"></div>' +
'<div style="position:absolute;z-index:2147483647;left:50px;top:50px;width:600px;color:#FFFFFF;font-family:verdana;">' +
- '<div style="font-size:30px;font-weight:bold;">GWT Code Server Disconnected</div>' +
- '<p style="font-size:15px;"> Most likely, you closed GWT development mode. Or you might have lost network connectivity. To fix this, try restarting GWT Development Mode and <a style="color: #FFFFFF; font-weight: bold;" href="javascript:location.reload()">REFRESH</a> this page.</p>' +
+ '<div style="font-size:30px;font-weight:bold;">' + summary + '</div>' +
+ '<p style="font-size:15px;">' + details + '</p>' +
'</div>'
;
topDoc.body.appendChild(outer);
diff --git a/dev/core/src/com/google/gwt/dev/shell/HostedHtmlVersion.java b/dev/core/src/com/google/gwt/dev/shell/HostedHtmlVersion.java
index bb87dfd..5c4b92f 100644
--- a/dev/core/src/com/google/gwt/dev/shell/HostedHtmlVersion.java
+++ b/dev/core/src/com/google/gwt/dev/shell/HostedHtmlVersion.java
@@ -27,7 +27,7 @@
* The version number that should be passed into gwtOnLoad. Must match the
* version in hosted.html.
*/
- public static final String EXPECTED_GWT_ONLOAD_VERSION = "2.0";
+ public static final String EXPECTED_GWT_ONLOAD_VERSION = "2.1";
/**
* Validate that the supplied hosted.html version matches.
diff --git a/dev/core/src/com/google/gwt/dev/shell/ModuleSpace.java b/dev/core/src/com/google/gwt/dev/shell/ModuleSpace.java
index 744649e..e8e1dac 100644
--- a/dev/core/src/com/google/gwt/dev/shell/ModuleSpace.java
+++ b/dev/core/src/com/google/gwt/dev/shell/ModuleSpace.java
@@ -23,6 +23,8 @@
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger;
import com.google.gwt.dev.util.log.speedtracer.SpeedTracerLogger.Event;
+import java.io.PrintWriter;
+import java.io.StringWriter;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
@@ -353,33 +355,53 @@
try {
for (int i = 0; i < entryPoints.length; i++) {
entryPointTypeName = entryPoints[i];
- Class<?> clazz = loadClassFromSourceName(entryPointTypeName);
Method onModuleLoad = null;
- try {
- onModuleLoad = clazz.getMethod("onModuleLoad");
- if (!Modifier.isStatic(onModuleLoad.getModifiers())) {
- // it's non-static, so we need to rebind the class
- onModuleLoad = null;
- }
- } catch (NoSuchMethodException e) {
- // okay, try rebinding it; maybe the rebind result will have one
- }
- Object module = null;
- if (onModuleLoad == null) {
- module = rebindAndCreate(entryPointTypeName);
- onModuleLoad = module.getClass().getMethod("onModuleLoad");
- // Record the rebound name of the class for stats (below).
- entryPointTypeName = module.getClass().getName().replace('$', '.');
- }
- onModuleLoad.setAccessible(true);
- invokeNativeVoid("fireOnModuleLoadStart", null,
- new Class[] {String.class}, new Object[] {entryPointTypeName});
+ Object module;
- Event onModuleLoadEvent = SpeedTracerLogger.start(DevModeEventType.ON_MODULE_LOAD);
+ // Try to initialize EntryPoint, else throw up glass panel
try {
- onModuleLoad.invoke(module);
- } finally {
- onModuleLoadEvent.end();
+ Class<?> clazz = loadClassFromSourceName(entryPointTypeName);
+ onModuleLoad = null;
+ try {
+ onModuleLoad = clazz.getMethod("onModuleLoad");
+ if (!Modifier.isStatic(onModuleLoad.getModifiers())) {
+ // it's non-static, so we need to rebind the class
+ onModuleLoad = null;
+ }
+ } catch (NoSuchMethodException e) {
+ // okay, try rebinding it; maybe the rebind result will have one
+ }
+ module = null;
+ if (onModuleLoad == null) {
+ module = rebindAndCreate(entryPointTypeName);
+ onModuleLoad = module.getClass().getMethod("onModuleLoad");
+ // Record the rebound name of the class for stats (below).
+ entryPointTypeName = module.getClass().getName().replace(
+ '$', '.');
+ }
+ } catch (Throwable e) {
+ displayErrorGlassPanel(
+ "EntryPoint initialization exception", entryPointTypeName, e);
+ throw e;
+ }
+
+ // Try to invoke onModuleLoad, else throw up glass panel
+ try {
+ onModuleLoad.setAccessible(true);
+ invokeNativeVoid("fireOnModuleLoadStart", null,
+ new Class[]{String.class}, new Object[]{entryPointTypeName});
+
+ Event onModuleLoadEvent = SpeedTracerLogger.start(
+ DevModeEventType.ON_MODULE_LOAD);
+ try {
+ onModuleLoad.invoke(module);
+ } finally {
+ onModuleLoadEvent.end();
+ }
+ } catch (Throwable e) {
+ displayErrorGlassPanel(
+ "onModuleLoad() threw an exception", entryPointTypeName, e);
+ throw e;
}
}
} finally {
@@ -568,6 +590,23 @@
+ " was returned from JSNI method '" + name + "'";
}
+ private void displayErrorGlassPanel(
+ String summary, String entryPointTypeName, Throwable e) throws Throwable {
+ StringWriter writer = new StringWriter();
+ e.printStackTrace(new PrintWriter(writer));
+ String stackTrace = writer.toString().replaceFirst(
+ // (?ms) for regex pattern modifiers MULTILINE and DOTALL
+ "(?ms)(Caused by:.+)", "<b>$1</b>");
+ String details = "<p>Exception while loading module <b>"
+ + entryPointTypeName + "</b>. See Development Mode for details.</p>"
+ + "<div style='overflow:visisble;white-space:pre;'>" + stackTrace
+ + "</pre>";
+
+ invokeNativeVoid("__gwt_displayGlassMessage", null,
+ new Class[]{String.class, String.class},
+ new Object[]{summary, details});
+ }
+
private boolean isUserFrame(StackTraceElement element) {
try {
CompilingClassLoader cl = getIsolatedClassLoader();
