Merged trunk r7382 into this branch
Merge piece missing from r7378.
svn merge --ignore-ancestry -c 7382 \
http://google-web-toolkit.googlecode.com/svn/trunk .
git-svn-id: https://google-web-toolkit.googlecode.com/svn/releases/2.0@7500 8db76d5a-ed1c-0410-87a9-c151d255dfc7
diff --git a/branch-info.txt b/branch-info.txt
index cfdf394..e82fa43 100644
--- a/branch-info.txt
+++ b/branch-info.txt
@@ -1434,3 +1434,7 @@
Move hasAttribute impl from DOMImplIE6 to DOMImplTrident so it applies to IE8.
svn merge -c7498 --ignore-ancestry https://google-web-toolkit.googlecode.com/svn/trunk
+trunk@7382 was merged into this branch
+ Merge piece missing from r7378.
+ svn merge --ignore-ancestry -c 7382 \
+ http://google-web-toolkit.googlecode.com/svn/trunk .
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 c47d02d..7148cd3 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
@@ -27,6 +27,7 @@
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.MethodArgNamesLookup;
import com.google.gwt.dev.javac.Resolver;
import com.google.gwt.dev.javac.TypeOracleMediator;
import com.google.gwt.dev.javac.TypeOracleTestingUtils;
@@ -46,7 +47,7 @@
* {@link ResolveMethodSignature}.
*/
public class ResolveGenericsTest extends AsmTestCase {
-
+
public static class FailErrorTreeLogger extends TreeLogger {
@Override
public TreeLogger branch(com.google.gwt.core.ext.TreeLogger.Type type,
@@ -83,21 +84,21 @@
super(type, methodName, annotations, typeParams);
this.method = method;
}
-
+
public Method getMethod() {
return method;
}
}
public static class ResolverMockTypeOracle extends HookableTypeOracle {
-
+
private Map<String, JRealClassType> binaryMapper;
public Map<String, JRealClassType> getBinaryMapper() {
ensureBinaryMapper();
return binaryMapper;
}
-
+
@Override
protected void addNewType(JRealClassType type) {
super.addNewType(type);
@@ -308,7 +309,7 @@
}
ResolveMethodSignature methodResolver = new ResolveMethodSignature(resolver,
failTreeLogger, method, lookup, true, methodData, argTypes, argNames,
- false, Collections.<String, String[]>emptyMap());
+ false, new MethodArgNamesLookup());
new SignatureReader(signature).accept(methodResolver);
methodResolver.finish();
}
