Remove TypeOracle dependency on hosted mode code.
Review by: bobv
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@5826 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracle.java b/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracle.java
index 0318998..8a8a661 100644
--- a/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracle.java
+++ b/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracle.java
@@ -17,7 +17,6 @@
import com.google.gwt.core.ext.typeinfo.JWildcardType.BoundType;
import com.google.gwt.dev.jjs.InternalCompilerException;
-import com.google.gwt.dev.shell.JsValueGlue;
import com.google.gwt.dev.util.collect.HashMap;
import com.google.gwt.dev.util.collect.IdentityHashMap;
@@ -118,8 +117,12 @@
* A reserved metadata tag to indicates that a field type, method return type
* or method parameter type is intended to be parameterized. Note that
* constructor type parameters are not supported at present.
+ *
+ * @deprecated gwt.typeArgs is not longer supported
*/
+ @Deprecated
public static final String TAG_TYPEARGS = "gwt.typeArgs";
+
static final int MOD_ABSTRACT = 0x00000001;
static final int MOD_FINAL = 0x00000002;
static final int MOD_NATIVE = 0x00000004;
@@ -128,8 +131,8 @@
static final int MOD_PUBLIC = 0x00000020;
static final int MOD_STATIC = 0x00000040;
static final int MOD_TRANSIENT = 0x00000080;
-
static final int MOD_VOLATILE = 0x00000100;
+
static final Annotation[] NO_ANNOTATIONS = new Annotation[0];
static final JClassType[] NO_JCLASSES = new JClassType[0];
static final JConstructor[] NO_JCTORS = new JConstructor[0];
@@ -141,6 +144,8 @@
static final String[][] NO_STRING_ARR_ARR = new String[0][];
static final String[] NO_STRINGS = new String[0];
+ private static final String JSO_CLASS = "com.google.gwt.core.client.JavaScriptObject";
+
static String[] modifierBitsToNames(int bits) {
List<String> strings = new ArrayList<String>();
@@ -649,7 +654,7 @@
* Updates the list of jsoSingleImpl types from recently-added types.
*/
private void computeSingleJsoImplData(JClassType... newTypes) {
- JClassType jsoType = findType(JsValueGlue.JSO_CLASS);
+ JClassType jsoType = findType(JSO_CLASS);
if (jsoType == null) {
return;
}
@@ -826,7 +831,7 @@
}
private void removeSingleJsoImplData(JClassType... types) {
- JClassType jsoType = findType(JsValueGlue.JSO_CLASS);
+ JClassType jsoType = findType(JSO_CLASS);
if (jsoType == null) {
return;
}