Revision: 8538
Author: [email protected]
Date: Fri Aug 13 13:25:52 2010
Log: Removes vestiges of TypeOracle support for local types.
TypeOracle hasn't supported local types for a while, this change removes
traces of it.
http://gwt-code-reviews.appspot.com/761801/show
Review by: jat
http://code.google.com/p/google-web-toolkit/source/detail?r=8538
Modified:
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JAnnotationType.java
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JArrayType.java
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JClassType.java
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JDelegatingClassType.java
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JEnumType.java
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JGenericType.java
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JRealClassType.java
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracleBuilder.java
/trunk/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
/trunk/dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTestBase.java
/trunk/dev/core/test/com/google/gwt/core/ext/typeinfo/JTypeParameterTest.java
/trunk/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
/trunk/user/src/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilder.java
/trunk/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java
=======================================
---
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JAnnotationType.java
Thu Aug 12 11:58:29 2010
+++
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JAnnotationType.java
Fri Aug 13 13:25:52 2010
@@ -24,8 +24,7 @@
JAnnotationType(TypeOracle oracle, JPackage declaringPackage,
String enclosingTypeName, String name) {
- super(oracle, declaringPackage, enclosingTypeName, false, name,
- true);
+ super(oracle, declaringPackage, enclosingTypeName, name, true);
}
@Override
=======================================
--- /trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JArrayType.java
Thu Aug 12 11:58:29 2010
+++ /trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JArrayType.java
Fri Aug 13 10:15:10 2010
@@ -273,11 +273,6 @@
// intentional null
return null;
}
-
- @Override
- public boolean isLocalType() {
- return false;
- }
@Override
public boolean isMemberType() {
=======================================
--- /trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JClassType.java
Thu Aug 12 11:58:29 2010
+++ /trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JClassType.java
Fri Aug 13 10:15:10 2010
@@ -591,12 +591,12 @@
public abstract JClassType isInterface();
/**
- * Tests if this type is a local type (within a method).
- *
- * @return true if this type is a local type, whether it is named or
- * anonymous.
+ * @deprecated local types are not modeled
*/
- public abstract boolean isLocalType();
+ @Deprecated
+ public final boolean isLocalType() {
+ return false;
+ }
/**
* Tests if this type is contained within another type.
=======================================
---
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JDelegatingClassType.java
Wed Apr 1 13:03:34 2009
+++
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JDelegatingClassType.java
Fri Aug 13 10:15:10 2010
@@ -240,11 +240,6 @@
return null;
}
}
-
- @Override
- public boolean isLocalType() {
- return baseType.isLocalType();
- }
@Override
public boolean isMemberType() {
=======================================
--- /trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JEnumType.java Thu
Aug 12 11:58:29 2010
+++ /trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JEnumType.java Fri
Aug 13 10:15:10 2010
@@ -25,9 +25,8 @@
private JEnumConstant[] lazyEnumConstants;
JEnumType(TypeOracle oracle, JPackage declaringPackage,
- String enclosingTypeName, boolean isLocalType, String name) {
- super(oracle, declaringPackage, enclosingTypeName, isLocalType, name,
- false);
+ String enclosingTypeName, String name) {
+ super(oracle, declaringPackage, enclosingTypeName, name, false);
}
/**
=======================================
--- /trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JGenericType.java
Mon Nov 9 20:50:50 2009
+++ /trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JGenericType.java
Fri Aug 13 10:15:10 2010
@@ -30,10 +30,9 @@
private List<JTypeParameter> typeParams = Lists.create();
public JGenericType(TypeOracle oracle, JPackage declaringPackage,
- String enclosingTypeName, boolean isLocalType, String name,
- boolean isInterface, JTypeParameter[] jtypeParameters) {
- super(oracle, declaringPackage, enclosingTypeName, isLocalType, name,
- isInterface);
+ String enclosingTypeName, String name, boolean isInterface,
+ JTypeParameter[] jtypeParameters) {
+ super(oracle, declaringPackage, enclosingTypeName, name, isInterface);
if (jtypeParameters != null) {
for (JTypeParameter jtypeParameter : jtypeParameters) {
=======================================
---
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JRealClassType.java
Thu Aug 12 11:58:29 2010
+++
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/JRealClassType.java
Fri Aug 13 10:15:10 2010
@@ -43,8 +43,6 @@
private final boolean isInterface;
- private final boolean isLocalType;
-
private String lazyQualifiedBinaryName;
private String lazyQualifiedName;
@@ -74,11 +72,9 @@
* @param isInterface
*/
JRealClassType(TypeOracle oracle, JPackage declaringPackage,
- String enclosingTypeName, boolean isLocalType, String name,
- boolean isInterface) {
+ String enclosingTypeName, String name, boolean isInterface) {
this.oracle = oracle;
this.declaringPackage = declaringPackage;
- this.isLocalType = isLocalType;
this.name = name;
this.isInterface = isInterface;
if (enclosingTypeName == null) {
@@ -303,9 +299,6 @@
if (isMemberType() && !isStatic()) {
return false;
}
- if (isLocalType()) {
- return false;
- }
if (getConstructors().length == 0) {
return true;
}
@@ -335,17 +328,6 @@
public JClassType isInterface() {
return isInterface ? this : null;
}
-
- /**
- * Tests if this type is a local type (within a method).
- *
- * @return true if this type is a local type, whether it is named or
- * anonymous.
- */
- @Override
- public boolean isLocalType() {
- return isLocalType;
- }
/**
* Tests if this type is contained within another type.
=======================================
---
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracleBuilder.java
Thu Aug 12 11:58:29 2010
+++
/trunk/dev/core/src/com/google/gwt/core/ext/typeinfo/TypeOracleBuilder.java
Fri Aug 13 10:15:10 2010
@@ -88,9 +88,8 @@
}
protected JEnumType newEnumType(JPackage pkg, String enclosingTypeName,
- boolean isLocalType, String className) {
- return new JEnumType(typeOracle, pkg, enclosingTypeName, isLocalType,
- className);
+ String className) {
+ return new JEnumType(typeOracle, pkg, enclosingTypeName, className);
}
protected JField newField(JRealClassType type, String name,
@@ -113,10 +112,9 @@
}
protected JRealClassType newRealClassType(JPackage pkg,
- String enclosingTypeName, boolean isLocalType, String className,
- boolean isIntf) {
- return new JRealClassType(typeOracle, pkg, enclosingTypeName,
isLocalType,
- className, isIntf);
+ String enclosingTypeName, String className, boolean isIntf) {
+ return new JRealClassType(typeOracle, pkg, enclosingTypeName,
className,
+ isIntf);
}
protected void setEnclosingType(JRealClassType type, JClassType
enclosingType) {
=======================================
--- /trunk/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
Thu Aug 12 11:58:29 2010
+++ /trunk/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
Fri Aug 13 10:15:10 2010
@@ -281,7 +281,7 @@
String enclosingTypeName, boolean isLocalType, String className,
boolean isIntf) {
return TypeOracleMediator.this.newRealClassType(pkg,
enclosingTypeName,
- isLocalType, className, isIntf);
+ className, isIntf);
}
public boolean resolveAnnotation(TreeLogger logger,
@@ -454,7 +454,7 @@
String jpkgName = compiledClass.getPackageName();
JPackage pkg = typeOracle.getOrCreatePackage(jpkgName);
boolean isIntf = (access & Opcodes.ACC_INTERFACE) != 0;
- boolean isLocalType = classData.hasNoExternalName();
+ assert !classData.hasNoExternalName();
String enclosingTypeName = null;
if (enclosingClassData != null) {
enclosingTypeName =
InternalName.toSourceName(InternalName.getClassName(enclosingClassData.getName()));
@@ -462,16 +462,16 @@
if ((access & Opcodes.ACC_ANNOTATION) != 0) {
resultType = newAnnotationType(pkg, enclosingTypeName, className);
} else if ((access & Opcodes.ACC_ENUM) != 0) {
- resultType = newEnumType(pkg, enclosingTypeName, isLocalType,
className);
+ resultType = newEnumType(pkg, enclosingTypeName, className);
} else {
JTypeParameter[] typeParams = getTypeParametersForClass(classData);
if ((typeParams != null && typeParams.length > 0)
|| nonStaticInsideGeneric(classData, enclosingClassData)) {
resultType = new JGenericType(typeOracle, pkg, enclosingTypeName,
- isLocalType, className, isIntf, typeParams);
+ className, isIntf, typeParams);
} else {
- resultType = newRealClassType(pkg, enclosingTypeName, isLocalType,
- className, isIntf);
+ resultType = newRealClassType(pkg, enclosingTypeName, className,
+ isIntf);
}
}
=======================================
---
/trunk/dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTestBase.java
Thu Nov 5 10:42:58 2009
+++
/trunk/dev/core/test/com/google/gwt/core/ext/typeinfo/JDelegatingClassTypeTestBase.java
Fri Aug 13 10:15:10 2010
@@ -689,17 +689,6 @@
assertEquals(baseType.isInterface() != null, testType.isInterface() !=
null);
}
-
- /**
- * Test method for
- * {...@link
com.google.gwt.core.ext.typeinfo.JDelegatingClassType#isLocalType()}.
- */
- public void testIsLocalType() throws NotFoundException {
- JDelegatingClassType testType = getTestType();
- JClassType baseType = testType.getBaseType();
-
- assertEquals(baseType.isLocalType(), testType.isLocalType());
- }
/**
* Test method for
=======================================
---
/trunk/dev/core/test/com/google/gwt/core/ext/typeinfo/JTypeParameterTest.java
Thu Mar 13 20:36:35 2008
+++
/trunk/dev/core/test/com/google/gwt/core/ext/typeinfo/JTypeParameterTest.java
Fri Aug 13 10:15:10 2010
@@ -112,10 +112,6 @@
JClassType[] computedSubtypes = typeParameter.getSubtypes();
for (JClassType computedSubtype : computedSubtypes) {
- if (computedSubtype.isLocalType()) {
- // Ignore local types.
- continue;
- }
// Find the parameterized version of the Comparable interface.
JClassType comparableIntf = findParameterizationOf(computedSubtype,
comparableType);
=======================================
---
/trunk/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
Thu Aug 12 11:58:29 2010
+++
/trunk/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
Fri Aug 13 10:15:10 2010
@@ -265,8 +265,8 @@
clazz.getSimpleName(), clazz.isInterface());
} else {
JTypeParameter[] params = createTypeParams(typeParams);
- type = new JGenericType(oracle, pkg, enclosingTypeName, false,
- clazz.getSimpleName(), clazz.isInterface(), params);
+ type = new JGenericType(oracle, pkg, enclosingTypeName,
clazz.getSimpleName(),
+ clazz.isInterface(), params);
}
return type;
}
=======================================
---
/trunk/user/src/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilder.java
Fri Mar 19 08:12:41 2010
+++
/trunk/user/src/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilder.java
Fri Aug 13 10:15:10 2010
@@ -656,7 +656,7 @@
* Returns <code>true</code> if a serializer class could access this
type.
*/
private static boolean isAccessibleToSerializer(JClassType type) {
- if (type.isPrivate() || type.isLocalType()) {
+ if (type.isPrivate()) {
return false;
}
=======================================
---
/trunk/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java
Mon Nov 9 20:50:50 2009
+++
/trunk/user/test/com/google/gwt/user/rebind/rpc/SerializableTypeOracleBuilderTest.java
Fri Aug 13 10:15:10 2010
@@ -2357,8 +2357,7 @@
JTypeParameter syntheticTypeParam = new JTypeParameter("U", 0);
// Force the type parameter to have a declaring class
- new JGenericType(to, a.getPackage(), null, false, "C", false,
- new JTypeParameter[] {syntheticTypeParam});
+ new JGenericType(to, a.getPackage(), null, "C", false, new
JTypeParameter[] {syntheticTypeParam});
syntheticTypeParam.setBounds(makeArray(b));
JParameterizedType parameterizedType = to.getParameterizedType(a,
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
