From 6ec9eb40783373d29ffec0668a38270adf9a29fe Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 1 Oct 2013 10:03:09 +0200 Subject: [PATCH] Port to asm:asm --- src/main/java/org/jenkinsci/bytecode/AdaptField.java | 8 ++++---- src/main/java/org/jenkinsci/bytecode/Kind.java | 2 +- src/main/java/org/jenkinsci/bytecode/MemberAdapter.java | 4 ++-- .../java/org/jenkinsci/bytecode/MemberTransformSpec.java | 8 ++++---- src/main/java/org/jenkinsci/bytecode/Transformer.java | 16 ++++++++-------- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/jenkinsci/bytecode/AdaptField.java b/src/main/java/org/jenkinsci/bytecode/AdaptField.java index fe85af8..cb1fea8 100644 --- a/src/main/java/org/jenkinsci/bytecode/AdaptField.java +++ b/src/main/java/org/jenkinsci/bytecode/AdaptField.java @@ -1,8 +1,8 @@ package org.jenkinsci.bytecode; import org.jvnet.hudson.annotation_indexer.Indexed; -import org.kohsuke.asm3.MethodVisitor; -import org.kohsuke.asm3.Type; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -14,8 +14,8 @@ import java.lang.reflect.Modifier; import static java.lang.annotation.ElementType.*; import static java.lang.annotation.RetentionPolicy.*; -import static org.kohsuke.asm3.Opcodes.*; -import static org.kohsuke.asm3.Type.*; +import static org.objectweb.asm.Opcodes.*; +import static org.objectweb.asm.Type.*; /** * Rewrites a field reference by adapting the type of the field. diff --git a/src/main/java/org/jenkinsci/bytecode/Kind.java b/src/main/java/org/jenkinsci/bytecode/Kind.java index e6edd62..43f5f7b 100644 --- a/src/main/java/org/jenkinsci/bytecode/Kind.java +++ b/src/main/java/org/jenkinsci/bytecode/Kind.java @@ -1,6 +1,6 @@ package org.jenkinsci.bytecode; -import org.kohsuke.asm3.MethodVisitor; +import org.objectweb.asm.MethodVisitor; /** * Rewriting a method reference and a field reference takes a very similar code path, diff --git a/src/main/java/org/jenkinsci/bytecode/MemberAdapter.java b/src/main/java/org/jenkinsci/bytecode/MemberAdapter.java index c7f3027..4b9393e 100644 --- a/src/main/java/org/jenkinsci/bytecode/MemberAdapter.java +++ b/src/main/java/org/jenkinsci/bytecode/MemberAdapter.java @@ -1,7 +1,7 @@ package org.jenkinsci.bytecode; -import org.kohsuke.asm3.MethodVisitor; -import org.kohsuke.asm3.Type; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; import java.lang.reflect.Member; diff --git a/src/main/java/org/jenkinsci/bytecode/MemberTransformSpec.java b/src/main/java/org/jenkinsci/bytecode/MemberTransformSpec.java index 8854e1b..6f171a9 100644 --- a/src/main/java/org/jenkinsci/bytecode/MemberTransformSpec.java +++ b/src/main/java/org/jenkinsci/bytecode/MemberTransformSpec.java @@ -1,15 +1,15 @@ package org.jenkinsci.bytecode; -import org.kohsuke.asm3.Label; -import org.kohsuke.asm3.MethodVisitor; -import org.kohsuke.asm3.Type; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; import java.util.HashMap; import java.util.HashSet; import java.util.Map.Entry; import java.util.Set; -import static org.kohsuke.asm3.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; /** * All the adapters of {@linkplain #kind a specific member type} keyed by their name and descriptor. diff --git a/src/main/java/org/jenkinsci/bytecode/Transformer.java b/src/main/java/org/jenkinsci/bytecode/Transformer.java index 6a5bc77..6dccc01 100644 --- a/src/main/java/org/jenkinsci/bytecode/Transformer.java +++ b/src/main/java/org/jenkinsci/bytecode/Transformer.java @@ -1,12 +1,12 @@ package org.jenkinsci.bytecode; -import org.kohsuke.asm3.ClassAdapter; -import org.kohsuke.asm3.ClassReader; -import org.kohsuke.asm3.ClassWriter; -import org.kohsuke.asm3.Label; -import org.kohsuke.asm3.MethodAdapter; -import org.kohsuke.asm3.MethodVisitor; -import org.kohsuke.asm3.Type; +import org.objectweb.asm.ClassAdapter; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodAdapter; +import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; import java.io.IOException; import java.util.Collection; @@ -14,7 +14,7 @@ import java.util.Collections; import java.util.Set; import java.util.logging.Logger; -import static org.kohsuke.asm3.Opcodes.*; +import static org.objectweb.asm.Opcodes.*; /** * Transform byte code where code references bytecode rewrite annotations. -- 1.8.3.1