Author: [email protected]
Date: Tue Jul 7 15:32:31 2009
New Revision: 5687
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/impl/SourceFileCompilationUnit.java
changes/jat/ihm/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
Log:
Rename ASM visitor to better reflect what it does, add TODO.
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 7 15:32:31 2009
@@ -487,6 +487,7 @@
if (realClassType == null) {
CollectClassData classData =
classMap.get(compiledClass.getInternalName());
JRealClassType enclosingType = null;
+ // TODO(jat): need to get enclosing classes from ClassData instead
CompiledClass enclosingClass = compiledClass.getEnclosingClass();
if (enclosingClass != null) {
enclosingType = enclosingClass.getRealClassType();
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
Tue Jul 7 15:32:31 2009
@@ -60,7 +60,7 @@
* Reads the bytecode for a class and determine if it is suitable for use
* from bytecode rather than source.
*/
- protected class MyClassVisitor extends EmptyVisitor {
+ protected class CheckAcceptabilityVisitor extends EmptyVisitor {
private String source = null;
private List<String> innerClasses = new ArrayList<String>();
@@ -69,7 +69,7 @@
private Resource classResource;
private BinaryCompiledClass enclosingClass;
- public MyClassVisitor(Resource classResource,
+ public CheckAcceptabilityVisitor(Resource classResource,
BinaryCompiledClass enclosingClass, byte[] bytes) {
this.classResource = classResource;
this.bytes = bytes;
@@ -318,7 +318,7 @@
}
try {
ClassReader reader = new ClassReader(classBytes);
- MyClassVisitor visitor = new MyClassVisitor(
+ CheckAcceptabilityVisitor visitor = new CheckAcceptabilityVisitor(
classResource, enclosingClass, classBytes);
reader.accept(visitor, ClassReader.SKIP_CODE);
return visitor.getBinaryCompiledClass();
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
Tue Jul 7 15:32:31 2009
@@ -32,7 +32,6 @@
import com.google.gwt.dev.asm.Opcodes;
import com.google.gwt.dev.asm.Type;
import com.google.gwt.dev.asm.signature.SignatureReader;
-import com.google.gwt.dev.javac.CompilationUnit;
import com.google.gwt.dev.javac.TypeOracleMediator;
import com.google.gwt.dev.javac.TypeOracleTestingUtils;
import com.google.gwt.dev.javac.TypeParameterLookup;
--~--~---------~--~----~------------~-------~--~----~
http://groups.google.com/group/Google-Web-Toolkit-Contributors
-~----------~----~----~----~------~----~------~--~---