Removing deprecation and other warnings from TypeOracle classes.
git-svn-id: https://google-web-toolkit.googlecode.com/svn/trunk@2552 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/dev/core/src/com/google/gwt/core/ext/typeinfo/Annotations.java b/dev/core/src/com/google/gwt/core/ext/typeinfo/Annotations.java
index e90fa74..3b2b649 100644
--- a/dev/core/src/com/google/gwt/core/ext/typeinfo/Annotations.java
+++ b/dev/core/src/com/google/gwt/core/ext/typeinfo/Annotations.java
@@ -69,7 +69,7 @@
public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
initializeAnnotations();
- return (T) lazyAnnotations.get(annotationClass);
+ return annotationClass.cast(lazyAnnotations.get(annotationClass));
}
public Annotation[] getAnnotations() {
diff --git a/dev/core/src/com/google/gwt/core/ext/typeinfo/JAbstractMethod.java b/dev/core/src/com/google/gwt/core/ext/typeinfo/JAbstractMethod.java
index 4a1aa36..8d931c6 100644
--- a/dev/core/src/com/google/gwt/core/ext/typeinfo/JAbstractMethod.java
+++ b/dev/core/src/com/google/gwt/core/ext/typeinfo/JAbstractMethod.java
@@ -82,6 +82,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void addMetaData(String tagName, String[] values) {
metaData.addMetaData(tagName, values);
}
@@ -128,10 +129,12 @@
*/
public abstract JClassType getEnclosingType();
+ @SuppressWarnings("deprecation")
public String[][] getMetaData(String tagName) {
return metaData.getMetaData(tagName);
}
+ @SuppressWarnings("deprecation")
public String[] getMetaDataTags() {
return metaData.getMetaDataTags();
}
diff --git a/dev/core/src/com/google/gwt/core/ext/typeinfo/JField.java b/dev/core/src/com/google/gwt/core/ext/typeinfo/JField.java
index 1de133b..6e77701 100644
--- a/dev/core/src/com/google/gwt/core/ext/typeinfo/JField.java
+++ b/dev/core/src/com/google/gwt/core/ext/typeinfo/JField.java
@@ -59,6 +59,7 @@
MetaData.copy(this, srcField);
}
+ @SuppressWarnings("deprecation")
public void addMetaData(String tagName, String[] values) {
metaData.addMetaData(tagName, values);
}
@@ -75,10 +76,12 @@
return enclosingType;
}
+ @SuppressWarnings("deprecation")
public String[][] getMetaData(String tagName) {
return metaData.getMetaData(tagName);
}
+ @SuppressWarnings("deprecation")
public String[] getMetaDataTags() {
return metaData.getMetaDataTags();
}
diff --git a/dev/core/src/com/google/gwt/core/ext/typeinfo/JGenericType.java b/dev/core/src/com/google/gwt/core/ext/typeinfo/JGenericType.java
index 1297351..d6a2173 100644
--- a/dev/core/src/com/google/gwt/core/ext/typeinfo/JGenericType.java
+++ b/dev/core/src/com/google/gwt/core/ext/typeinfo/JGenericType.java
@@ -74,7 +74,7 @@
public JRawType getRawType() {
if (lazyRawType == null) {
- lazyRawType = new JRawType(this, getEnclosingType());
+ lazyRawType = new JRawType(this);
}
return lazyRawType;
diff --git a/dev/core/src/com/google/gwt/core/ext/typeinfo/JParameter.java b/dev/core/src/com/google/gwt/core/ext/typeinfo/JParameter.java
index cb964a9..da3a2ad 100644
--- a/dev/core/src/com/google/gwt/core/ext/typeinfo/JParameter.java
+++ b/dev/core/src/com/google/gwt/core/ext/typeinfo/JParameter.java
@@ -57,6 +57,7 @@
MetaData.copy(this, srcParam);
}
+ @SuppressWarnings("deprecation")
public void addMetaData(String tagName, String[] values) {
metaData.addMetaData(tagName, values);
}
@@ -69,10 +70,12 @@
return enclosingMethod;
}
+ @SuppressWarnings("deprecation")
public String[][] getMetaData(String tagName) {
return metaData.getMetaData(tagName);
}
+ @SuppressWarnings("deprecation")
public String[] getMetaDataTags() {
return metaData.getMetaDataTags();
}
diff --git a/dev/core/src/com/google/gwt/core/ext/typeinfo/JRawType.java b/dev/core/src/com/google/gwt/core/ext/typeinfo/JRawType.java
index b7a6017..b35075d 100644
--- a/dev/core/src/com/google/gwt/core/ext/typeinfo/JRawType.java
+++ b/dev/core/src/com/google/gwt/core/ext/typeinfo/JRawType.java
@@ -28,18 +28,12 @@
}
};
- private final JClassType enclosingType;
-
private List<JClassType> interfaces;
private final AbstractMembers members;
- public JRawType(JGenericType genericType, JClassType enclosingType) {
+ public JRawType(JGenericType genericType) {
super.setBaseType(genericType);
- this.enclosingType = enclosingType;
-
- // NOTE: this instance is not considered a nested type of the enclosing type
-
members = new DelegateMembers(this, getBaseType(), ERASURE_SUBSTITUTION);
}
diff --git a/dev/core/src/com/google/gwt/core/ext/typeinfo/JRealClassType.java b/dev/core/src/com/google/gwt/core/ext/typeinfo/JRealClassType.java
index 42dc892..15b653c 100644
--- a/dev/core/src/com/google/gwt/core/ext/typeinfo/JRealClassType.java
+++ b/dev/core/src/com/google/gwt/core/ext/typeinfo/JRealClassType.java
@@ -122,6 +122,7 @@
interfaces.add(intf);
}
+ @SuppressWarnings("deprecation")
public void addMetaData(String tagName, String[] values) {
metaData.addMetaData(tagName, values);
}
@@ -210,10 +211,12 @@
return "L" + packageName + typeName + ";";
}
+ @SuppressWarnings("deprecation")
public String[][] getMetaData(String tagName) {
return metaData.getMetaData(tagName);
}
+ @SuppressWarnings("deprecation")
public String[] getMetaDataTags() {
return metaData.getMetaDataTags();
}
diff --git a/dev/core/src/com/google/gwt/core/ext/typeinfo/MetaData.java b/dev/core/src/com/google/gwt/core/ext/typeinfo/MetaData.java
index dd4adaf..0966d5e 100644
--- a/dev/core/src/com/google/gwt/core/ext/typeinfo/MetaData.java
+++ b/dev/core/src/com/google/gwt/core/ext/typeinfo/MetaData.java
@@ -31,6 +31,7 @@
* @param dest
* @param src
*/
+ @SuppressWarnings("deprecation")
static void copy(HasMetaData dest, HasMetaData src) {
String[] tagNames = src.getMetaDataTags();
for (String tagName : tagNames) {
