Revision: 7384
Author: [email protected]
Date: Tue Jan 12 09:42:24 2010
Log: Merge tr...@7382 into this branch, to fix test broken by tr...@7378
svn merge --ignore-ancestry -c 7382
http://google-web-toolkit.googlecode.com/svn/trunk .
http://code.google.com/p/google-web-toolkit/source/detail?r=7384
Modified:
/branches/snapshot-2009.11.20-r7061/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
=======================================
---
/branches/snapshot-2009.11.20-r7061/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
Mon Jan 11 21:22:57 2010
+++
/branches/snapshot-2009.11.20-r7061/dev/core/test/com/google/gwt/dev/javac/asm/ResolveGenericsTest.java
Tue Jan 12 09:42:24 2010
@@ -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();
}
--
http://groups.google.com/group/Google-Web-Toolkit-Contributors
