|
 |
5975bbe |
--- xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java~ 2014-04-14 13:00:42.025851035 +0200
|
|
|
5975bbe |
+++ xbean-reflect/src/main/java/org/apache/xbean/recipe/XbeanAsmParameterNameLoader.java 2014-04-14 13:01:13.794418041 +0200
|
|
|
6eb71d5 |
@@ -17,12 +17,12 @@
|
|
|
6eb71d5 |
*/
|
|
|
6eb71d5 |
package org.apache.xbean.recipe;
|
|
|
6eb71d5 |
|
|
|
5975bbe |
-import org.apache.xbean.asm5.shade.commons.EmptyVisitor;
|
|
|
5975bbe |
-import org.apache.xbean.asm5.ClassReader;
|
|
|
5975bbe |
-import org.apache.xbean.asm5.Label;
|
|
|
5975bbe |
-import org.apache.xbean.asm5.MethodVisitor;
|
|
|
5975bbe |
-import org.apache.xbean.asm5.Opcodes;
|
|
|
5975bbe |
-import org.apache.xbean.asm5.Type;
|
|
|
6eb71d5 |
+import org.objectweb.asm.ClassReader;
|
|
|
6eb71d5 |
+import org.objectweb.asm.ClassVisitor;
|
|
|
6eb71d5 |
+import org.objectweb.asm.Label;
|
|
|
6eb71d5 |
+import org.objectweb.asm.MethodVisitor;
|
|
|
6eb71d5 |
+import org.objectweb.asm.Opcodes;
|
|
|
6eb71d5 |
+import org.objectweb.asm.Type;
|
|
|
6eb71d5 |
|
|
|
6eb71d5 |
import java.io.IOException;
|
|
|
6eb71d5 |
import java.io.InputStream;
|
|
|
6eb71d5 |
@@ -211,7 +211,7 @@
|
|
|
6eb71d5 |
}
|
|
|
6eb71d5 |
}
|
|
|
6eb71d5 |
|
|
|
6eb71d5 |
- private static class AllParameterNamesDiscoveringVisitor extends EmptyVisitor {
|
|
|
6eb71d5 |
+ private static class AllParameterNamesDiscoveringVisitor extends ClassVisitor {
|
|
|
6eb71d5 |
private final Map<Constructor,List<String>> constructorParameters = new HashMap<Constructor,List<String>>();
|
|
|
6eb71d5 |
private final Map<Method,List<String>> methodParameters = new HashMap<Method,List<String>>();
|
|
|
6eb71d5 |
private final Map<String,Exception> exceptions = new HashMap<String,Exception>();
|
|
|
6eb71d5 |
@@ -220,6 +220,7 @@
|
|
|
6eb71d5 |
private final Map<String,Constructor> constructorMap = new HashMap<String,Constructor>();
|
|
|
6eb71d5 |
|
|
|
6eb71d5 |
public AllParameterNamesDiscoveringVisitor(Class type, String methodName) {
|
|
|
6eb71d5 |
+ super(Opcodes.ASM4);
|
|
|
6eb71d5 |
this.methodName = methodName;
|
|
|
6eb71d5 |
|
|
|
6eb71d5 |
List<Method> methods = new ArrayList<Method>(Arrays.asList(type.getMethods()));
|
|
|
6eb71d5 |
@@ -232,6 +233,7 @@
|
|
|
6eb71d5 |
}
|
|
|
6eb71d5 |
|
|
|
6eb71d5 |
public AllParameterNamesDiscoveringVisitor(Class type) {
|
|
|
6eb71d5 |
+ super(Opcodes.ASM4);
|
|
|
6eb71d5 |
this.methodName = "<init>";
|
|
|
6eb71d5 |
|
|
|
6eb71d5 |
List<Constructor> constructors = new ArrayList<Constructor>(Arrays.asList(type.getConstructors()));
|