svn merge -r4872:4873 https://google-web-toolkit.googlecode.com/svn/trunk .
This patch adds identifiers that cause loading of the java plugin in the
browser to the blacklist of identifiers that must not be used in the generated
javascript
Patch by: amitmanjhi
Review by: fabbott (desk review)
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/1.6@4878 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/dev/js/ast/JsRootScope.java b/dev/core/src/com/google/gwt/dev/js/ast/JsRootScope.java
index 62b564b..30909ac 100644
--- a/dev/core/src/com/google/gwt/dev/js/ast/JsRootScope.java
+++ b/dev/core/src/com/google/gwt/dev/js/ast/JsRootScope.java
@@ -102,6 +102,13 @@
// Functions commonly defined on Object
"toString", "getClass", "constructor", "prototype",
+ /*
+ * These keywords trigger the loading of the java-plugin. For the
+ * next-generation plugin, this results in starting a new Java process.
+ */
+ "java", "Packages", "netscape", "sun", "JavaObject", "JavaClass",
+ "JavaArray", "JavaMember",
+
// GWT-defined identifiers
"$wnd", "$doc", "$moduleName", "$moduleBase", "$gwt_version",
