Author: [email protected]
Date: Wed Jul 15 07:37:51 2009
New Revision: 5737
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/CompilationUnit.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JSORestrictionsChecker.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinary.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinaryOracleImpl.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/asm/CollectClassData.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/asm/ResolveMethodSignature.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/asm/ResolveTypeSignature.java
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/impl/SourceFileCompilationUnit.java
changes/jat/ihm/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
Log:
Cleanup TODOs, remove unneeded code.
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/CompilationUnit.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/CompilationUnit.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/CompilationUnit.java
Wed Jul 15 07:37:51 2009
@@ -268,34 +268,6 @@
protected static final DiskCache diskCache = new DiskCache();
-// private static Set<String> computeFileNameRefs(
-// CompilationUnitDeclaration cud,
-// final Map<String, String> binaryTypeToSourceFileMap) {
-// final Set<String> result = new HashSet<String>();
-// cud.traverse(new TypeRefVisitor() {
-// @Override
-// protected void onBinaryTypeRef(BinaryTypeBinding referencedType,
-// CompilationUnitDeclaration unitOfReferrer, Expression
expression) {
-// // TODO(jat): clean up
-// char[] fname = referencedType.getFileName();
-// if (fname != null) {
-// String fileName =
binaryTypeToSourceFileMap.get(String.valueOf(fname));
-// if (fileName != null) {
-// result.add(fileName);
-// }
-// }
-// }
-//
-// @Override
-// protected void onTypeRef(SourceTypeBinding referencedType,
-// CompilationUnitDeclaration unitOfReferrer) {
-// // Map the referenced type to the target compilation unit file.
-// result.add(String.valueOf(referencedType.getFileName()));
-// }
-// }, cud.scope);
-// return Sets.normalize(result);
-// }
-
protected Set<CompiledClass> exposedCompiledClasses;
/**
@@ -496,7 +468,7 @@
}
}
} else {
- // TODO(jat): error here?
+ // TODO(jat): how to report error here?
}
return referencedTypes;
}
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JSORestrictionsChecker.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JSORestrictionsChecker.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JSORestrictionsChecker.java
Wed Jul 15 07:37:51 2009
@@ -158,7 +158,7 @@
Type[] argTypes = Type.getArgumentTypes(desc);
boolean isCtor = false;
if ("<clinit>".equals(name)) {
- // TODO(jat): ?
+ // TODO(jat): is there anything to do for clinits?
} else if ("<init>".equals(name)) {
isCtor = true;
if (argTypes.length > 0) {
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinary.java
==============================================================================
--- changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinary.java
(original)
+++ changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinary.java
Wed Jul 15 07:37:51 2009
@@ -61,11 +61,6 @@
public abstract Resource getSourceFile();
/**
- * @return class files for types not contained in another type
- */
- public abstract Set<Resource> getTopClassFiles();
-
- /**
* Returns the fully-qualified binary name of the top level public type.
*/
public abstract String getTypeName();
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinaryOracleImpl.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinaryOracleImpl.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/JavaBinaryOracleImpl.java
Wed Jul 15 07:37:51 2009
@@ -102,12 +102,6 @@
}
@Override
- public Set<Resource> getTopClassFiles() {
- // TODO(jat): !! implement getTopClassFiles
- return null;
- }
-
- @Override
public String getTypeName() {
return typeName;
}
@@ -274,7 +268,8 @@
}
/**
- * TODO(jat): is this actually needed?
+ * TODO(jat): is this actually needed, or will they get invalidated
+ * automatically by the source dependency check?
*/
public void invalidate(Set<Resource> changedSources) {
boolean changed = false;
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/asm/CollectClassData.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/asm/CollectClassData.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/asm/CollectClassData.java
Wed Jul 15 07:37:51 2009
@@ -134,9 +134,6 @@
private String source = null;
- // TODO(jat): do we need to collect inner classes?
-// private List<Resource> innerClasses = new ArrayList<Resource>();
-
// internal name
private String name;
@@ -330,7 +327,6 @@
// skip synthetic fields
return null;
}
- // TODO(jat): generic signature for fields
CollectFieldData fv = new CollectFieldData(access, name, desc,
signature, value);
fields.add(fv);
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/asm/ResolveMethodSignature.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/asm/ResolveMethodSignature.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/asm/ResolveMethodSignature.java
Wed Jul 15 07:37:51 2009
@@ -158,14 +158,12 @@
public SignatureVisitor visitParameterType() {
JType[] param = new JType[1];
params.add(param);
- // TODO(jat): enclosing type for local classes?
return new ResolveTypeSignature(mediator.getTypeOracle(),
mediator.getBinaryMapper(), logger, param, typeParamLookup, null);
}
@Override
public SignatureVisitor visitReturnType() {
- // TODO(jat): enclosing type for local classes?
return new ResolveTypeSignature(mediator.getTypeOracle(),
mediator.getBinaryMapper(), logger, returnType, typeParamLookup,
null);
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/asm/ResolveTypeSignature.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/asm/ResolveTypeSignature.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/asm/ResolveTypeSignature.java
Wed Jul 15 07:37:51 2009
@@ -50,7 +50,6 @@
private JClassType outerClass;
private List<JType[]> args = new ArrayList<JType[]>();
private int arrayDepth = 0;
- private Throwable creationStackTrace;
/**
* Resolve a parameterized type.
@@ -75,8 +74,6 @@
TreeLogger logger, JType[] returnTypeRef,
TypeParameterLookup lookup, JClassType enclosingClass,
char wildcardMatch) {
- creationStackTrace = new Throwable();
- creationStackTrace.fillInStackTrace();
this.typeOracle = typeOracle;
this.binaryMapper = binaryMapper;
this.logger = logger;
@@ -94,44 +91,37 @@
@Override
public void visitBaseType(char descriptor) {
- // TODO(jat): remove try/catch and creationStackTrace
- try {
- switch (descriptor) {
- case 'V':
- returnTypeRef[0] = JPrimitiveType.VOID;
- break;
- case 'B':
- returnTypeRef[0] = JPrimitiveType.BYTE;
- break;
- case 'J':
- returnTypeRef[0] = JPrimitiveType.LONG;
- break;
- case 'Z':
- returnTypeRef[0] = JPrimitiveType.BOOLEAN;
- break;
- case 'I':
- returnTypeRef[0] = JPrimitiveType.INT;
- break;
- case 'S':
- returnTypeRef[0] = JPrimitiveType.SHORT;
- break;
- case 'C':
- returnTypeRef[0] = JPrimitiveType.CHAR;
- break;
- case 'F':
- returnTypeRef[0] = JPrimitiveType.FLOAT;
- break;
- case 'D':
- returnTypeRef[0] = JPrimitiveType.DOUBLE;
- break;
- default:
- throw new IllegalStateException("Unrecognized base type "
- + descriptor);
- }
- } catch (ArrayStoreException e) {
- throw new RuntimeException(
- "ArrayStore exception in ResolveParameterizedType",
- creationStackTrace);
+ switch (descriptor) {
+ case 'V':
+ returnTypeRef[0] = JPrimitiveType.VOID;
+ break;
+ case 'B':
+ returnTypeRef[0] = JPrimitiveType.BYTE;
+ break;
+ case 'J':
+ returnTypeRef[0] = JPrimitiveType.LONG;
+ break;
+ case 'Z':
+ returnTypeRef[0] = JPrimitiveType.BOOLEAN;
+ break;
+ case 'I':
+ returnTypeRef[0] = JPrimitiveType.INT;
+ break;
+ case 'S':
+ returnTypeRef[0] = JPrimitiveType.SHORT;
+ break;
+ case 'C':
+ returnTypeRef[0] = JPrimitiveType.CHAR;
+ break;
+ case 'F':
+ returnTypeRef[0] = JPrimitiveType.FLOAT;
+ break;
+ case 'D':
+ returnTypeRef[0] = JPrimitiveType.DOUBLE;
+ break;
+ default:
+ throw new IllegalStateException("Unrecognized base type "
+ + descriptor);
}
// this is the last visitor called on this visitor
visitEnd();
@@ -177,7 +167,6 @@
@Override
public void visitTypeArgument() {
- // TODO(jat): is this the correct way to use JWildcardType?
JType[] arg = new JType[1]; // This could be int[] for example
arg[0] = typeOracle.getWildcardType(JWildcardType.BoundType.UNBOUND,
typeOracle.getJavaLangObject());
@@ -188,7 +177,10 @@
public SignatureVisitor visitTypeArgument(char wildcard) {
JType[] arg = new JType[1];
args.add(arg);
- // TODO(jat): !! enclosingClass?
+ // TODO(jat): should we pass enclosingClass here instead of null?
+ // not sure what the enclosing class of a type argument means, but
+ // I haven't found a case where it is actually used while processing
+ // the type argument.
return new ResolveTypeSignature(typeOracle, binaryMapper, logger,
arg, lookup, null, wildcard);
}
Modified:
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/impl/SourceFileCompilationUnit.java
==============================================================================
---
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/impl/SourceFileCompilationUnit.java
(original)
+++
changes/jat/ihm/dev/core/src/com/google/gwt/dev/javac/impl/SourceFileCompilationUnit.java
Wed Jul 15 07:37:51 2009
@@ -144,12 +144,6 @@
return null;
}
- @Override
- public void visitOuterClass(String owner, String name, String desc) {
- // TODO(jat): Do we need to save this?
- super.visitOuterClass(owner, name, desc);
- }
-
/**
* If compiled with debug, visit the source information.
*
@@ -240,7 +234,6 @@
classes = Sets.add(classes, compiledClass);
}
if (!classes.isEmpty()) {
- // TODO(jat): better way?
exposedCompiledClasses = Sets.normalizeUnmodifiable(classes);
setBinaries();
}
Modified:
changes/jat/ihm/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
==============================================================================
---
changes/jat/ihm/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
(original)
+++
changes/jat/ihm/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
Wed Jul 15 07:37:51 2009
@@ -101,20 +101,6 @@
ensureBinaryMapper();
return binaryMapper;
}
-
- @Override
- public JParameterizedType getParameterizedType(JGenericType
genericType,
- JClassType enclosingType, JClassType[] typeArgs) {
- // TODO(jat): Auto-generated method stub
- return super.getParameterizedType(genericType, enclosingType,
typeArgs);
- }
-
- @Override
- public JWildcardType getWildcardType(BoundType boundType,
- JClassType typeBound) {
- // TODO(jat): Auto-generated method stub
- return super.getWildcardType(boundType, typeBound);
- }
@Override
protected void addNewType(JRealClassType type) {
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---
