Author: [email protected]
Date: Tue Jul 14 11:36:36 2009
New Revision: 5734
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
Log:
Add support for raw types in non-generic methods/etc.
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
Tue Jul 14 11:36:36 2009
@@ -788,8 +788,8 @@
if (!resolveClass(logger, outerType)) {
return false;
}
- assert outerType instanceof JRealClassType;
- JRealClassType outer = (JRealClassType) outerType;
+ assert outerType instanceof JClassType;
+ JClassType outer = (JClassType) outerType;
String methodName = classData.getOuterMethodName();
String methodDesc = classData.getOuterMethodDesc();
if (methodName != null) {
@@ -1174,7 +1174,15 @@
case Type.ARRAY:
return resolveArray(logger, type);
case Type.OBJECT:
- return resolveObject(logger, type);
+ JType resolvedType = resolveObject(logger, type);
+ // check for raw usage of a generic type
+ if (resolvedType != null) {
+ JGenericType genericType = resolvedType.isGenericType();
+ if (genericType != null) {
+ resolvedType = genericType.getRawType();
+ }
+ }
+ return resolvedType;
default:
assert false : "Unexpected type " + type;
return null;
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
