From d1977e93e34e606faecfa3218636eaf681f39069 Mon Sep 17 00:00:00 2001 From: Haruaki Tamada Date: Sat, 3 Dec 2011 18:02:04 +0900 Subject: [PATCH] =?utf8?q?=E3=81=A8=E3=82=8A=E3=81=82=E3=81=88=E3=81=9A?= =?utf8?q?=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88=E3=81=97=E3=81=A8=E3=81=8F?= =?utf8?q?=EF=BC=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- pom.xml | 4 ++-- .../jp/sourceforge/stigmata/birthmarks/BirthmarkExtractVisitor.java | 6 +++--- .../cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java | 3 +-- .../birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java | 4 ++-- .../stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/pom.xml b/pom.xml index 2955b68..0080d2b 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 jp.sourceforge stigmata - 3.0.0-SNAPSHOT + 3.0-SNAPSHOT Stigmata Java birthmark toolkit http://stigmata.sourceforge.jp/ @@ -47,7 +47,7 @@ asm asm-all - 3.3 + 4.0 compile diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/BirthmarkExtractVisitor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/BirthmarkExtractVisitor.java index 96f1081..9e41d8c 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/BirthmarkExtractVisitor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/BirthmarkExtractVisitor.java @@ -8,21 +8,21 @@ import jp.sourceforge.stigmata.BirthmarkContext; import jp.sourceforge.stigmata.BirthmarkElement; import jp.sourceforge.stigmata.BirthmarkEnvironment; -import org.objectweb.asm.ClassAdapter; import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.Opcodes; /** * Abstract visitor class of extracting birthmarks from class file. * * @author Haruaki TAMADA */ -public abstract class BirthmarkExtractVisitor extends ClassAdapter{ +public abstract class BirthmarkExtractVisitor extends ClassVisitor{ private Birthmark birthmark; private BirthmarkContext context; private List causes = new ArrayList(); public BirthmarkExtractVisitor(ClassVisitor visitor, Birthmark birthmark, BirthmarkContext context){ - super(visitor); + super(Opcodes.ASM4, visitor); this.birthmark = birthmark; this.context = context; } diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java index bc7601a..ecd6dfe 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/cvfv/ConstantValueOfFieldVariableBirthmarkExtractVisitor.java @@ -9,7 +9,6 @@ import jp.sourceforge.stigmata.birthmarks.BirthmarkExtractVisitor; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.FieldVisitor; -import org.objectweb.asm.MethodAdapter; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; @@ -70,7 +69,7 @@ public class ConstantValueOfFieldVariableBirthmarkExtractVisitor extends Birthma MethodVisitor visitor = super.visitMethod(access, name, desc, signature, exceptions); if(name.equals("") || name.equals("")){ - visitor = new MethodAdapter(visitor){ + visitor = new MethodVisitor(Opcodes.ASM4, visitor){ private Object constant = null; @Override diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java index a8520a5..5d9f2d0 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/smc/SequentialMethodCallBirthmarkExtractVisitor.java @@ -5,8 +5,8 @@ import jp.sourceforge.stigmata.BirthmarkContext; import jp.sourceforge.stigmata.birthmarks.BirthmarkExtractVisitor; import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.MethodAdapter; import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; /** * @@ -25,7 +25,7 @@ public class SequentialMethodCallBirthmarkExtractVisitor extends BirthmarkExtrac MethodVisitor visitor = super.visitMethod(access, name, desc, signature, exceptions); - return new MethodAdapter(visitor){ + return new MethodVisitor(Opcodes.ASM4, visitor){ @Override public void visitMethodInsn(int opcode, String owner, String name, String desc){ String className = owner.replace('/', '.'); diff --git a/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java b/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java index 0ff0b4e..35b00b1 100644 --- a/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java +++ b/src/main/java/jp/sourceforge/stigmata/birthmarks/uc/UsedClassesBirthmarkExtractVisitor.java @@ -8,8 +8,8 @@ import jp.sourceforge.stigmata.birthmarks.BirthmarkExtractVisitor; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.FieldVisitor; import org.objectweb.asm.Label; -import org.objectweb.asm.MethodAdapter; import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Opcodes; import org.objectweb.asm.Type; import org.objectweb.asm.signature.SignatureReader; import org.objectweb.asm.signature.SignatureWriter; @@ -59,7 +59,7 @@ public class UsedClassesBirthmarkExtractVisitor extends BirthmarkExtractVisitor{ MethodVisitor visitor = super.visitMethod(access, name, desc, signature, exceptions); - return new MethodAdapter(visitor){ + return new MethodVisitor(Opcodes.ASM4, visitor){ @Override public void visitTypeInsn(int opcode, String desc){ Type type = Type.getType("L" + desc + ";"); -- 2.11.0