Stephen Haberman has uploaded a new change for review.
https://gwt-review.googlesource.com/3470
Change subject: Fix binary vs. internal variable names, remove unused Name
code.
......................................................................
Fix binary vs. internal variable names, remove unused Name code.
Change-Id: I540b1225efe7f81f0fc3ac50871cc66d1e99e753
---
M dev/core/src/com/google/gwt/dev/javac/CompilationState.java
M dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
M dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
M dev/core/src/com/google/gwt/dev/javac/JsniChecker.java
M dev/core/src/com/google/gwt/dev/javac/Resolver.java
M dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
M dev/core/src/com/google/gwt/dev/javac/asm/ResolveMethodSignature.java
M dev/core/src/com/google/gwt/dev/javac/asm/ResolveTypeSignature.java
M dev/core/src/com/google/gwt/dev/util/Name.java
M dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
M dev/core/test/com/google/gwt/dev/util/NameTest.java
11 files changed, 66 insertions(+), 219 deletions(-)
diff --git a/dev/core/src/com/google/gwt/dev/javac/CompilationState.java
b/dev/core/src/com/google/gwt/dev/javac/CompilationState.java
index 5e8844c..c043dfb 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationState.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationState.java
@@ -36,7 +36,7 @@
public class CompilationState {
/**
- * Classes mapped by binary name.
+ * Classes mapped by internal name.
*/
protected final Map<String, CompiledClass> classFileMap = new
HashMap<String, CompiledClass>();
@@ -105,7 +105,7 @@
}
/**
- * Returns a map of all compiled classes by binary name.
+ * Returns a map of all compiled classes by internal name.
*/
public Map<String, CompiledClass> getClassFileMap() {
return exposedClassFileMap;
diff --git
a/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
b/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
index d450ca7..72caade 100644
--- a/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
+++ b/dev/core/src/com/google/gwt/dev/javac/CompilationStateBuilder.java
@@ -83,8 +83,8 @@
Map<String, Binding> jsniRefs = new HashMap<String, Binding>();
JsniChecker.check(cud, jsoState, jsniMethods, jsniRefs, new
JsniChecker.TypeResolver() {
@Override
- public ReferenceBinding resolveType(String typeName) {
- ReferenceBinding resolveType =
compiler.resolveType(typeName);
+ public ReferenceBinding resolveType(String sourceOrBinaryName)
{
+ ReferenceBinding resolveType =
compiler.resolveType(sourceOrBinaryName);
if (resolveType != null) {
jsniDeps.add(String.valueOf(resolveType.qualifiedSourceName()));
}
diff --git a/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
b/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
index 2f7e90d..4438f97 100644
--- a/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
+++ b/dev/core/src/com/google/gwt/dev/javac/JdtCompiler.java
@@ -501,9 +501,9 @@
}
public NameEnvironmentAnswer findType(char[][] compoundTypeName) {
- char[] binaryNameChars =
CharOperation.concatWith(compoundTypeName, '/');
- String binaryName = String.valueOf(binaryNameChars);
- CompiledClass compiledClass = binaryTypes.get(binaryName);
+ char[] internalNameChars =
CharOperation.concatWith(compoundTypeName, '/');
+ String internalName = String.valueOf(internalNameChars);
+ CompiledClass compiledClass = internalTypes.get(internalName);
try {
if (compiledClass != null) {
return compiledClass.getNameEnvironmentAnswer();
@@ -511,11 +511,11 @@
} catch (ClassFormatException ex) {
// fall back to binary class
}
- if (isPackage(binaryName)) {
+ if (isPackage(internalName)) {
return null;
}
if (additionalTypeProviderDelegate != null) {
- GeneratedUnit unit =
additionalTypeProviderDelegate.doFindAdditionalType(binaryName);
+ GeneratedUnit unit =
additionalTypeProviderDelegate.doFindAdditionalType(internalName);
if (unit != null) {
CompilationUnitBuilder b = CompilationUnitBuilder.create(unit);
Adapter a = new Adapter(b);
@@ -523,7 +523,7 @@
}
}
try {
- URL resource = getClassLoader().getResource(binaryName + ".class");
+ URL resource = getClassLoader().getResource(internalName
+ ".class");
if (resource != null) {
InputStream openStream = resource.openStream();
try {
@@ -656,19 +656,20 @@
return options;
}
- public static ReferenceBinding resolveType(LookupEnvironment
lookupEnvironment, String typeName) {
+ private static ReferenceBinding resolveType(LookupEnvironment
lookupEnvironment,
+ String sourceOrBinaryName) {
ReferenceBinding type = null;
- int p = typeName.indexOf('$');
+ int p = sourceOrBinaryName.indexOf('$');
if (p > 0) {
// resolve an outer type before trying to get the cached inner
- String cupName = typeName.substring(0, p);
+ String cupName = sourceOrBinaryName.substring(0, p);
char[][] chars = CharOperation.splitOn('.', cupName.toCharArray());
ReferenceBinding outerType = lookupEnvironment.getType(chars);
if (outerType != null) {
// outer class was found
resolveRecursive(outerType);
- chars = CharOperation.splitOn('.', typeName.toCharArray());
+ chars = CharOperation.splitOn('.',
sourceOrBinaryName.toCharArray());
type = lookupEnvironment.getCachedType(chars);
if (type == null) {
// no inner type; this is a pure failure
@@ -677,7 +678,7 @@
}
} else {
// just resolve the type straight out
- char[][] chars = CharOperation.splitOn('.', typeName.toCharArray());
+ char[][] chars = CharOperation.splitOn('.',
sourceOrBinaryName.toCharArray());
type = lookupEnvironment.getType(chars);
}
@@ -696,10 +697,11 @@
// Assume that the last '.' should be '$' and try again.
//
- p = typeName.lastIndexOf('.');
+ p = sourceOrBinaryName.lastIndexOf('.');
if (p >= 0) {
- typeName = typeName.substring(0, p) + "$" + typeName.substring(p +
1);
- return resolveType(lookupEnvironment, typeName);
+ sourceOrBinaryName =
+ sourceOrBinaryName.substring(0, p) + "$" +
sourceOrBinaryName.substring(p + 1);
+ return resolveType(lookupEnvironment, sourceOrBinaryName);
}
return null;
@@ -733,9 +735,9 @@
private AdditionalTypeProviderDelegate additionalTypeProviderDelegate;
/**
- * Maps dotted binary names to compiled classes.
+ * Maps internal names to compiled classes.
*/
- private final Map<String, CompiledClass> binaryTypes = new
HashMap<String, CompiledClass>();
+ private final Map<String, CompiledClass> internalTypes = new
HashMap<String, CompiledClass>();
/**
* Only active during a compile.
@@ -998,8 +1000,8 @@
}
}
- public ReferenceBinding resolveType(String typeName) {
- return resolveType(compilerImpl.lookupEnvironment, typeName);
+ public ReferenceBinding resolveType(String sourceOrBinaryName) {
+ return resolveType(compilerImpl.lookupEnvironment, sourceOrBinaryName);
}
public void
setAdditionalTypeProviderDelegate(AdditionalTypeProviderDelegate
newDelegate) {
@@ -1008,7 +1010,7 @@
private void addBinaryTypes(Collection<CompiledClass> compiledClasses) {
for (CompiledClass cc : compiledClasses) {
- binaryTypes.put(cc.getInternalName(), cc);
+ internalTypes.put(cc.getInternalName(), cc);
}
}
diff --git a/dev/core/src/com/google/gwt/dev/javac/JsniChecker.java
b/dev/core/src/com/google/gwt/dev/javac/JsniChecker.java
index aae722a..8d6a0aa 100644
--- a/dev/core/src/com/google/gwt/dev/javac/JsniChecker.java
+++ b/dev/core/src/com/google/gwt/dev/javac/JsniChecker.java
@@ -81,7 +81,10 @@
* A call-back interface to resolve types.
*/
public interface TypeResolver {
- ReferenceBinding resolveType(String typeName);
+ /**
+ * @param typeName Either source or binary names are allowed in JSNI
+ */
+ ReferenceBinding resolveType(String sourceOrBinaryName);
}
private class JsniDeclChecker extends SafeASTVisitor implements
diff --git a/dev/core/src/com/google/gwt/dev/javac/Resolver.java
b/dev/core/src/com/google/gwt/dev/javac/Resolver.java
index e1dec40..ef03f0e 100644
--- a/dev/core/src/com/google/gwt/dev/javac/Resolver.java
+++ b/dev/core/src/com/google/gwt/dev/javac/Resolver.java
@@ -39,7 +39,7 @@
void addThrows(JAbstractMethod method, JClassType exception);
- Map<String, JRealClassType> getBinaryMapper();
+ Map<String, JRealClassType> getInternalMapper();
TypeOracle getTypeOracle();
diff --git a/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
b/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
index 7b81b12..a56c115 100644
--- a/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
+++ b/dev/core/src/com/google/gwt/dev/javac/TypeOracleMediator.java
@@ -176,6 +176,7 @@
public TypeOracleMediatorResolver(TypeOracleBuildContext context) {
this.context = context;
}
+
public void addImplementedInterface(JRealClassType type, JClassType
intf) {
TypeOracleMediator.this.addImplementedInterface(type, intf);
}
@@ -184,8 +185,8 @@
TypeOracleMediator.this.addThrows(method, exception);
}
- public Map<String, JRealClassType> getBinaryMapper() {
- return TypeOracleMediator.this.binaryMapper;
+ public Map<String, JRealClassType> getInternalMapper() {
+ return TypeOracleMediator.this.internalMapper;
}
public TypeOracle getTypeOracle() {
@@ -355,7 +356,7 @@
}
// map of internal names to classes
- final Map<String, JRealClassType> binaryMapper = new HashMap<String,
JRealClassType>();
+ final Map<String, JRealClassType> internalMapper = new HashMap<String,
JRealClassType>();
private final Set<JRealClassType> resolved = new
HashSet<JRealClassType>();
@@ -409,7 +410,7 @@
}
JRealClassType type = createType(typeData, unresolvedTypes, context);
if (type != null) {
- binaryMapper.put(typeData.internalName, type);
+ internalMapper.put(typeData.internalName, type);
context.classMapType.put(type, cv);
}
}
@@ -457,8 +458,8 @@
/**
* @return a map from binary class names to JRealClassType.
*/
- public Map<String, JRealClassType> getBinaryMapper() {
- return binaryMapper;
+ public Map<String, JRealClassType> getInternalMapper() {
+ return internalMapper;
}
/**
@@ -829,8 +830,8 @@
if (signature != null) {
// If we have a signature, use it for superclass and interfaces
SignatureReader reader = new SignatureReader(signature);
- ResolveClassSignature classResolver = new
ResolveClassSignature(context.resolver,
- binaryMapper, logger, type, typeParamLookup);
+ ResolveClassSignature classResolver =
+ new ResolveClassSignature(context.resolver, internalMapper,
logger, type, typeParamLookup);
reader.accept(classResolver);
classResolver.finish();
} else {
@@ -838,7 +839,7 @@
if ((access & Opcodes.ACC_INTERFACE) == 0) {
String superName = classData.getSuperName();
if (superName != null) {
- JClassType superType = binaryMapper.get(superName);
+ JClassType superType = internalMapper.get(superName);
if (superType == null || !resolveClass(logger, superType,
context)) {
logger.log(TreeLogger.WARN, "Unable to resolve supertype "
+ superName);
@@ -850,7 +851,7 @@
// Set interfaces
for (String intfName : classData.getInterfaces()) {
- JClassType intf = binaryMapper.get(intfName);
+ JClassType intf = internalMapper.get(intfName);
if (intf == null || !resolveClass(logger, intf, context)) {
logger.log(TreeLogger.WARN, "Unable to resolve interface " +
intfName);
return false;
@@ -943,7 +944,7 @@
String outerClass = classData.getOuterClass();
JRealClassType enclosingType = null;
if (outerClass != null) {
- enclosingType = binaryMapper.get(outerClass);
+ enclosingType = internalMapper.get(outerClass);
// Ensure enclosing classes are resolved
if (enclosingType != null) {
if (!resolveEnclosingClass(logger, enclosingType, context)) {
@@ -989,7 +990,7 @@
if (signature != null) {
SignatureReader reader = new SignatureReader(signature);
JType[] fieldTypeRef = new JType[1];
- reader.acceptType(new ResolveTypeSignature(context.resolver,
binaryMapper,
+ reader.acceptType(new ResolveTypeSignature(context.resolver,
internalMapper,
logger, fieldTypeRef, typeParamLookup, null));
fieldType = fieldTypeRef[0];
@@ -1101,7 +1102,7 @@
assert type.getSort() == Type.OBJECT;
String className = type.getInternalName();
assert Name.isInternalName(className);
- JRealClassType classType = binaryMapper.get(className);
+ JRealClassType classType = internalMapper.get(className);
return classType;
}
diff --git
a/dev/core/src/com/google/gwt/dev/javac/asm/ResolveMethodSignature.java
b/dev/core/src/com/google/gwt/dev/javac/asm/ResolveMethodSignature.java
index 0e76ce3..aa0a3ab 100644
--- a/dev/core/src/com/google/gwt/dev/javac/asm/ResolveMethodSignature.java
+++ b/dev/core/src/com/google/gwt/dev/javac/asm/ResolveMethodSignature.java
@@ -156,7 +156,7 @@
public SignatureVisitor visitClassBound() {
JType[] bound = new JClassType[1];
bounds.add(bound);
- return new ResolveTypeSignature(resolver, resolver.getBinaryMapper(),
+ return new ResolveTypeSignature(resolver, resolver.getInternalMapper(),
logger, bound, typeParamLookup, null);
}
@@ -164,7 +164,7 @@
public SignatureVisitor visitExceptionType() {
JClassType[] exc = new JClassType[1];
exceptions.add(exc);
- return new ResolveTypeSignature(resolver, resolver.getBinaryMapper(),
+ return new ResolveTypeSignature(resolver, resolver.getInternalMapper(),
logger, exc, typeParamLookup, null);
}
@@ -179,7 +179,7 @@
public SignatureVisitor visitInterfaceBound() {
JType[] bound = new JType[1];
bounds.add(bound);
- return new ResolveTypeSignature(resolver, resolver.getBinaryMapper(),
+ return new ResolveTypeSignature(resolver, resolver.getInternalMapper(),
logger, bound, typeParamLookup, null);
}
@@ -187,13 +187,13 @@
public SignatureVisitor visitParameterType() {
JType[] param = new JType[1];
params.add(param);
- return new ResolveTypeSignature(resolver, resolver.getBinaryMapper(),
+ return new ResolveTypeSignature(resolver, resolver.getInternalMapper(),
logger, param, typeParamLookup, null);
}
@Override
public SignatureVisitor visitReturnType() {
- return new ResolveTypeSignature(resolver, resolver.getBinaryMapper(),
+ return new ResolveTypeSignature(resolver, resolver.getInternalMapper(),
logger, returnType, typeParamLookup, null);
}
diff --git
a/dev/core/src/com/google/gwt/dev/javac/asm/ResolveTypeSignature.java
b/dev/core/src/com/google/gwt/dev/javac/asm/ResolveTypeSignature.java
index a7207b0..4f9f175 100644
--- a/dev/core/src/com/google/gwt/dev/javac/asm/ResolveTypeSignature.java
+++ b/dev/core/src/com/google/gwt/dev/javac/asm/ResolveTypeSignature.java
@@ -41,7 +41,7 @@
public class ResolveTypeSignature extends EmptySignatureVisitor {
private final Resolver resolver;
- private final Map<String, JRealClassType> binaryMapper;
+ private final Map<String, JRealClassType> internalMapper;
private final TreeLogger logger;
private final JType[] returnTypeRef;
private final TypeParameterLookup lookup;
@@ -56,26 +56,28 @@
* Resolve a parameterized type.
*
* @param resolver
- * @param binaryMapper
+ * @param internalMapper
* @param logger
* @param returnTypeRef "pointer" to return location, ie. 1-element array
* @param lookup
* @param enclosingClass
*/
public ResolveTypeSignature(Resolver resolver,
- Map<String, JRealClassType> binaryMapper, TreeLogger logger,
+ Map<String, JRealClassType> internalMapper,
+ TreeLogger logger,
JType[] returnTypeRef, TypeParameterLookup lookup,
JClassType enclosingClass) {
- this(resolver, binaryMapper, logger, returnTypeRef, lookup,
enclosingClass,
+ this(resolver, internalMapper, logger, returnTypeRef, lookup,
enclosingClass,
'=');
}
public ResolveTypeSignature(Resolver resovler,
- Map<String, JRealClassType> binaryMapper, TreeLogger logger,
+ Map<String, JRealClassType> internalMapper,
+ TreeLogger logger,
JType[] returnTypeRef, TypeParameterLookup lookup,
JClassType enclosingClass, char wildcardMatch) {
this.resolver = resovler;
- this.binaryMapper = binaryMapper;
+ this.internalMapper = internalMapper;
this.logger = logger;
this.returnTypeRef = returnTypeRef;
this.lookup = lookup;
@@ -130,7 +132,7 @@
public void visitClassType(String internalName) {
assert Name.isInternalName(internalName);
outerClass = enclosingClass;
- JRealClassType classType = binaryMapper.get(internalName);
+ JRealClassType classType = internalMapper.get(internalName);
// TODO(jat): failures here are likely binary-only annotations or local
// classes that have been elided from TypeOracle -- what should we do
in
// those cases? Currently we log an error and replace them with Object,
@@ -190,7 +192,7 @@
// 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(resolver, binaryMapper, logger, arg,
+ return new ResolveTypeSignature(resolver, internalMapper, logger, arg,
lookup, null, wildcard);
}
diff --git a/dev/core/src/com/google/gwt/dev/util/Name.java
b/dev/core/src/com/google/gwt/dev/util/Name.java
index 279a744..a1cf917 100644
--- a/dev/core/src/com/google/gwt/dev/util/Name.java
+++ b/dev/core/src/com/google/gwt/dev/util/Name.java
@@ -39,38 +39,6 @@
return binaryName.substring(lastDot + 1);
}
- /**
- * Construct the fully qualified name of an inner class.
- *
- * @param outerClassBinaryName binary name of outer class, ie
- * {@code org.test.Foo}
- * @param innerClassShortName short name of inner class, ie {@code Bar}
- * @return fully qualified binary name of the inner class
- */
- public static String getInnerClassName(String outerClassBinaryName,
- String innerClassShortName) {
- assert isBinaryName(outerClassBinaryName);
- return outerClassBinaryName + '$' + innerClassShortName;
- }
-
- public static String getOuterClassName(String binaryName) {
- assert isBinaryName(binaryName);
- int lastDollar = binaryName.lastIndexOf('$');
- if (lastDollar < 0) {
- return null;
- }
- return binaryName.substring(0, lastDollar);
- }
-
- public static String getPackageName(String binaryName) {
- assert isBinaryName(binaryName);
- int lastDot = binaryName.lastIndexOf('.');
- if (lastDot < 0) {
- return "";
- }
- return binaryName.substring(0, lastDot);
- }
-
public static String getShortClassName(String binaryName) {
assert isBinaryName(binaryName);
String className = getClassName(binaryName);
@@ -113,54 +81,6 @@
return name.substring(lastSlash + 1);
}
- /**
- * Construct the fully qualified name of an inner class.
- *
- * @param outerClassInternalName internal name of outer class,
- * ie {@code org.test.Foo}
- * @param innerClassShortName short name of inner class, ie {@code
Bar}
- * @return fully qualified internal name of the inner class
- */
- public static String getInnerClassName(String outerClassInternalName,
- String innerClassShortName) {
- assert isInternalName(outerClassInternalName);
- return outerClassInternalName + '$' + innerClassShortName;
- }
-
- /**
- * Return the outer class name of an inner class, or null if this is
not
- * an inner class.
- *
- * @param name internal name which might be an inner class
- * @return an internal name of the enclosing class or null if none
- */
- public static String getOuterClassName(String name) {
- int lastDollar = name.lastIndexOf('$');
- if (lastDollar < 0) {
- return null;
- }
- return name.substring(0, lastDollar);
- }
-
- public static String getPackageName(String name) {
- assert isInternalName(name);
- int lastSlash = name.lastIndexOf('/');
- if (lastSlash < 0) {
- return "";
- }
- return name.substring(0, lastSlash);
- }
-
- public static String getShortClassName(String internalName) {
- assert isInternalName(internalName);
- String className = getClassName(internalName);
- int lastDollar = className.lastIndexOf('$', className.length() -
2);
- if (lastDollar < 0) {
- return className;
- }
- return className.substring(lastDollar + 1);
- }
-
public static String toBinaryName(String internalName) {
assert isInternalName(internalName);
return internalName.replace('/', '.');
@@ -175,41 +95,6 @@
private InternalName() {
}
}
-
- /**
- * Represents a Java class name in source form, for example:
- * {@code org.example.Foo.Bar}.
- *
- * See
{@link "http://java.sun.com/docs/books/jvms/second_edition/html/Concepts.doc.html#20207"}
- */
-public static class SourceName {
-
- /**
- * Construct the fully qualified name of an inner class.
- *
- * @param outerClassSourceName source name of outer class, ie
- * {@code org.test.Foo}
- * @param innerClassShortName short name of inner class, ie {@code Bar}
- * @return fully qualified source name of the inner class
- */
- public static String getInnerClassName(String outerClassSourceName,
- String innerClassShortName) {
- assert isSourceName(outerClassSourceName);
- return outerClassSourceName + '.' + innerClassShortName;
- }
-
- public static String getShortClassName(String sourceName) {
- assert isSourceName(sourceName);
- int lastDollar = sourceName.lastIndexOf('.');
- if (lastDollar < 0) {
- return sourceName;
- }
- return sourceName.substring(lastDollar + 1);
- }
-
- private SourceName() {
- }
-}
/**
* Represents a Java class name in either source or binary form, for
example:
@@ -300,17 +185,6 @@
}
int dollar = name.indexOf('$');
return !name.contains("/") && (dollar < 0 || dollar == name.length() -
1);
- }
-
- /**
- * @return true if name could be a valid source or binary name.
- *
- * Note that many invalid names might pass this test.
- *
- * @param name class name to test
- */
- public static boolean isSourceOrBinaryName(String name) {
- return name == null || !name.contains("/");
}
private Name() {
diff --git
a/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
b/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
index 6f131ac..a89e1b1 100644
--- a/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
+++ b/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
@@ -87,8 +87,8 @@
delegate.addThrows(method, exception);
}
- public Map<String, JRealClassType> getBinaryMapper() {
- return delegate.getBinaryMapper();
+ public Map<String, JRealClassType> getInternalMapper() {
+ return delegate.getInternalMapper();
}
public TypeOracle getTypeOracle() {
@@ -196,7 +196,7 @@
"dispatch", TestHandler.class);
for (JClassType type : oracle.getTypes()) {
if (type instanceof JRealClassType) {
- mediator.getBinaryMapper().put(
+ mediator.getInternalMapper().put(
type.getQualifiedBinaryName().replace('.', '/'),
(JRealClassType) type);
}
@@ -289,11 +289,11 @@
}
private void resolveClassSignature(JRealClassType type, String
signature) {
- Map<String, JRealClassType> binaryMapper = resolver.getBinaryMapper();
+ Map<String, JRealClassType> internalMapper =
resolver.getInternalMapper();
TypeParameterLookup lookup = new TypeParameterLookup();
lookup.pushEnclosingScopes(type);
- ResolveClassSignature classResolver = new
ResolveClassSignature(resolver,
- binaryMapper, failTreeLogger, type, lookup);
+ ResolveClassSignature classResolver =
+ new ResolveClassSignature(resolver, internalMapper,
failTreeLogger, type, lookup);
new SignatureReader(signature).accept(classResolver);
classResolver.finish();
}
diff --git a/dev/core/test/com/google/gwt/dev/util/NameTest.java
b/dev/core/test/com/google/gwt/dev/util/NameTest.java
index c0b062f..7c56bf9 100644
--- a/dev/core/test/com/google/gwt/dev/util/NameTest.java
+++ b/dev/core/test/com/google/gwt/dev/util/NameTest.java
@@ -16,9 +16,8 @@
package com.google.gwt.dev.util;
import com.google.gwt.dev.util.Name.BinaryName;
-import com.google.gwt.dev.util.Name.SourceOrBinaryName;
import com.google.gwt.dev.util.Name.InternalName;
-import com.google.gwt.dev.util.Name.SourceName;
+import com.google.gwt.dev.util.Name.SourceOrBinaryName;
import junit.framework.TestCase;
@@ -50,12 +49,6 @@
BinaryName.toInternalName("org.test.Foo$Bar$Baz$"));
assertEquals("org/test/Foo$Bar$Baz$1",
BinaryName.toInternalName("org.test.Foo$Bar$Baz$1"));
- assertEquals("org.test.Foo$Bar",
- BinaryName.getInnerClassName("org.test.Foo", "Bar"));
- assertEquals("org.test.Foo",
- BinaryName.getOuterClassName("org.test.Foo$Bar"));
- assertEquals("org.test",
- BinaryName.getPackageName("org.test.Foo$Bar"));
assertEquals("Foo$Bar", BinaryName.getClassName("org.test.Foo$Bar"));
assertEquals("Bar", BinaryName.getShortClassName("org.test.Foo$Bar"));
}
@@ -103,14 +96,7 @@
InternalName.toBinaryName("org/test/Foo$Bar$Baz$"));
assertEquals("org.test.Foo$Bar$Baz$1",
InternalName.toBinaryName("org/test/Foo$Bar$Baz$1"));
- assertEquals("org/test/Foo$Bar",
- InternalName.getInnerClassName("org/test/Foo", "Bar"));
- assertEquals("org/test/Foo",
- InternalName.getOuterClassName("org/test/Foo$Bar"));
- assertEquals("org/test",
- InternalName.getPackageName("org/test/Foo$Bar"));
assertEquals("Foo$Bar", InternalName.getClassName("org/test/Foo$Bar"));
- assertEquals("Bar",
InternalName.getShortClassName("org/test/Foo$Bar"));
}
public void testIsBinaryName() {
@@ -164,25 +150,4 @@
assertTrue(Name.isSourceName("org.test.Foo.Bar.Baz$"));
}
- public void testIsSourceOrBinaryName() {
- assertTrue(Name.isSourceOrBinaryName("org.test.Foo"));
- assertTrue(Name.isSourceOrBinaryName("org.test.Foo$Bar"));
- assertTrue(Name.isSourceOrBinaryName("org.test.Foo$Bar$Baz"));
- assertTrue(Name.isSourceOrBinaryName("org.test.Foo$Bar$Baz$"));
- assertTrue(Name.isSourceOrBinaryName("org.test.Foo$Bar$Baz$1"));
- assertFalse(Name.isSourceOrBinaryName("org/test/Foo"));
- assertFalse(Name.isSourceOrBinaryName("org/test/Foo$Bar"));
- assertFalse(Name.isSourceOrBinaryName("org/test/Foo$Bar$Baz"));
- assertFalse(Name.isSourceOrBinaryName("org/test/Foo$Bar$Baz$"));
- assertFalse(Name.isSourceOrBinaryName("org/test/Foo$Bar$Baz$1"));
- assertTrue(Name.isSourceOrBinaryName("org.test.Foo.Bar"));
- assertTrue(Name.isSourceOrBinaryName("org.test.Foo.Bar.Baz"));
- assertTrue(Name.isSourceOrBinaryName("org.test.Foo.Bar.Baz$"));
- }
-
- public void testSourceName() {
- assertEquals("org.test.Foo.Bar",
- SourceName.getInnerClassName("org.test.Foo", "Bar"));
- assertEquals("Bar", SourceName.getShortClassName("org.test.Foo.Bar"));
- }
}
--
To view, visit https://gwt-review.googlesource.com/3470
To unsubscribe, visit https://gwt-review.googlesource.com/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I540b1225efe7f81f0fc3ac50871cc66d1e99e753
Gerrit-PatchSet: 1
Gerrit-Project: gwt
Gerrit-Branch: master
Gerrit-Owner: Stephen Haberman <[email protected]>
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
---
You received this message because you are subscribed to the Google Groups "GWT Contributors" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
