OOPHM Checkstyle warning removal.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@4242 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java b/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java
index 3bdbce8..bad33df 100644
--- a/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java
+++ b/dev/oophm/overlay/com/google/gwt/dev/GWTShell.java
@@ -308,6 +308,12 @@
}
}
+ public ModuleSpaceHost createModuleSpaceHost(BrowserWidget widget,
+ String moduleName) throws UnableToCompleteException {
+ // TODO(jat): implement method createModuleSpaceHost
+ return null;
+ }
+
public ModuleSpaceHost createModuleSpaceHost(TreeLogger mainLogger,
String moduleName, String userAgent, String remoteSocket)
throws UnableToCompleteException {
@@ -365,6 +371,12 @@
return GWTShell.this.normalizeURL(whatTheUserTyped);
}
+ public BrowserWidget openNewBrowserWindow()
+ throws UnableToCompleteException {
+ // TODO(jat): is this ok?
+ throw new UnableToCompleteException();
+ }
+
public void unloadModule(ModuleSpaceHost moduleSpaceHost) {
ModulePanel tab = moduleTabs.remove(moduleSpaceHost);
if (tab != null) {
@@ -390,18 +402,6 @@
assert (moduleDef != null) : "Required module state is absent";
return moduleDef;
}
-
- public ModuleSpaceHost createModuleSpaceHost(BrowserWidget widget,
- String moduleName) throws UnableToCompleteException {
- // TODO(jat): implement method createModuleSpaceHost
- return null;
- }
-
- public BrowserWidget openNewBrowserWindow()
- throws UnableToCompleteException {
- // TODO(jat): is this ok?
- throw new UnableToCompleteException();
- }
}
public static final String GWT_SHELL_PATH = ".gwt-tmp" + File.separator
diff --git a/dev/oophm/overlay/com/google/gwt/dev/shell/JsValue.java b/dev/oophm/overlay/com/google/gwt/dev/shell/JsValue.java
index c8fe3b2..3ba91bb 100644
--- a/dev/oophm/overlay/com/google/gwt/dev/shell/JsValue.java
+++ b/dev/oophm/overlay/com/google/gwt/dev/shell/JsValue.java
@@ -213,7 +213,7 @@
/**
* Set the JS object to be null.
*
- * @throws HostedModeException
+ * @throws com.google.gwt.dev.shell.HostedModeException
*/
public abstract void setNull();
diff --git a/dev/oophm/overlay/com/google/gwt/dev/shell/JsValueGlue.java b/dev/oophm/overlay/com/google/gwt/dev/shell/JsValueGlue.java
index a2046f8..2d3f953 100644
--- a/dev/oophm/overlay/com/google/gwt/dev/shell/JsValueGlue.java
+++ b/dev/oophm/overlay/com/google/gwt/dev/shell/JsValueGlue.java
@@ -87,8 +87,8 @@
* @param type expected type of the returned object
* @param msgPrefix a prefix for error/warning messages
* @return the object reference
- * @throws HostedModeException if the JavaScript object is not assignable to
- * the supplied type.
+ * @throws com.google.gwt.dev.shell.HostedModeException if the JavaScript
+ * object is not assignable to the supplied type.
*/
@SuppressWarnings("unchecked")
public static <T> T get(JsValue value, CompilingClassLoader cl,
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelServer.java b/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelServer.java
index 5eb0016..c6bc775 100644
--- a/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelServer.java
+++ b/dev/oophm/src/com/google/gwt/dev/shell/BrowserChannelServer.java
@@ -89,15 +89,15 @@
convertToJsValue(ccl, remoteObjects, returnValue, returnJsValue);
if (msg.isException()) {
if (returnValue.isNull() || returnValue.isUndefined()) {
- throw ModuleSpaceOOPHM.createJavaScriptException(ccl, null);
+ throw ModuleSpace.createJavaScriptException(ccl, null);
} else if (returnValue.isString()) {
- throw ModuleSpaceOOPHM.createJavaScriptException(ccl,
+ throw ModuleSpace.createJavaScriptException(ccl,
returnValue.getString());
} else if (returnValue.isJsObject()) {
Object jso = JsValueGlue.createJavaScriptObject(returnJsValue, ccl);
- throw ModuleSpaceOOPHM.createJavaScriptException(ccl, jso);
+ throw ModuleSpace.createJavaScriptException(ccl, jso);
} else if (returnValue.isJavaObject()) {
Object object = remoteObjects.get(returnValue.getJavaObject().getRefid());
@@ -106,11 +106,11 @@
throw (Throwable) (target);
} else {
// JS throwing random Java Objects, which we'll wrap is JSException
- throw ModuleSpaceOOPHM.createJavaScriptException(ccl, target);
+ throw ModuleSpace.createJavaScriptException(ccl, target);
}
}
// JS throwing random primitives, which we'll wrap is JSException
- throw ModuleSpaceOOPHM.createJavaScriptException(ccl,
+ throw ModuleSpace.createJavaScriptException(ccl,
returnValue.getValue().toString());
}
} catch (IOException e) {
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/MethodDispatch.java b/dev/oophm/src/com/google/gwt/dev/shell/MethodDispatch.java
index 96324e9..4e2b327 100644
--- a/dev/oophm/src/com/google/gwt/dev/shell/MethodDispatch.java
+++ b/dev/oophm/src/com/google/gwt/dev/shell/MethodDispatch.java
@@ -112,7 +112,7 @@
// See if we're in the process of throwing a JavaScriptObject; remove
// it from the JavaScriptException object and throw the JS object instead
- Object jsoException = ModuleSpaceOOPHM.getJavaScriptExceptionException(
+ Object jsoException = ModuleSpace.getJavaScriptExceptionException(
classLoader, t);
if (jsoException != null) {
diff --git a/dev/oophm/src/com/google/gwt/dev/shell/ModuleSpaceOOPHM.java b/dev/oophm/src/com/google/gwt/dev/shell/ModuleSpaceOOPHM.java
index 32ce5ee..c9a93b1 100644
--- a/dev/oophm/src/com/google/gwt/dev/shell/ModuleSpaceOOPHM.java
+++ b/dev/oophm/src/com/google/gwt/dev/shell/ModuleSpaceOOPHM.java
@@ -87,6 +87,15 @@
}
/**
+ *
+ */
+ @Override
+ protected void createStaticDispatcher(TreeLogger logger) {
+ channel.loadJsni(
+ "function __defineStatic(__arg0) { window.__static = __arg0; }");
+ }
+
+ /**
* Invoke a JS method and return its value.
*
* @param name method name to invoke
@@ -128,13 +137,4 @@
protected DispatchObject getStaticDispatcher() {
return new JsValueOOPHM.DispatchObjectOOPHM(getIsolatedClassLoader());
}
-
- /**
- *
- */
- @Override
- protected void createStaticDispatcher(TreeLogger logger) {
- channel.loadJsni(
- "function __defineStatic(__arg0) { window.__static = __arg0; }");
- }
}
