Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to asm 5 to work with java 8 applications #1

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to asm 5 to work with java 8 applications #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<target name="compile" description="Compiles Java sources" >
<mkdir dir="${build.dir}" />

<javac destdir="${build.dir}" target="1.5" source="1.5" debug="on" optimize="off"
deprecation="on" includeantruntime="off" classpath="${lib.dir}/asm-3.3.1.jar">
<javac destdir="${build.dir}" target="1.7" source="1.7" debug="on" optimize="off"
deprecation="on" includeantruntime="off" classpath="${lib.dir}/asm-5.0.3.jar">
<src path="${src.dir}" />
</javac>

Expand All @@ -25,7 +25,7 @@
<mkdir dir="${dist.dir}" />

<jarjar jarfile="${dist.dir}/agent.jar" compress="true">
<zipfileset src="${lib.dir}/asm-3.3.1.jar"/>
<zipfileset src="${lib.dir}/asm-5.0.3.jar"/>
<fileset dir="${build.dir}">
<include name="**" />
</fileset>
Expand Down
Binary file removed lib/asm-3.3.1.jar
View file
Open in desktop
Binary file not shown.
Binary file added lib/asm-5.0.3.jar
View file
Open in desktop
Binary file not shown.
16 changes: 8 additions & 8 deletions src/nl/jteam/agent/MyTransformer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public byte[] transform(ClassLoader loader, String className, Class<?> classBein
ClassReader reader = new ClassReader(classfileBuffer);
ClassWriter writer = new ClassWriter(0);

reader.accept(new MyClassAdapter(writer, awtAppClassName), 0);
reader.accept(new MyClassVisitor(writer, awtAppClassName), 0);

result = writer.toByteArray();

Expand All @@ -55,12 +55,12 @@ public byte[] transform(ClassLoader loader, String className, Class<?> classBein
return result;
}

private static class MyClassAdapter extends ClassAdapter {
private static class MyClassVisitor extends ClassVisitor {

private final String awtAppClassName;

private MyClassAdapter(ClassVisitor cv, String awtAppClassName) {
super(cv);
private MyClassVisitor(ClassVisitor cv, String awtAppClassName) {
super(Opcodes.ASM5, cv);
this.awtAppClassName= awtAppClassName;
}

Expand All @@ -72,18 +72,18 @@ public MethodVisitor visitMethod(int access, String name, String desc, String si

}

private static class MyMethodVisitor extends MethodAdapter {
private static class MyMethodVisitor extends MethodVisitor {

private final String awtAppClassName;

private MyMethodVisitor(MethodVisitor methodVisitor, String awtAppClassName) {
super(methodVisitor);
super(Opcodes.ASM5, methodVisitor);
this.awtAppClassName = awtAppClassName;
}

@Override
public void visitMethodInsn(int opcode, String owner, String name, String desc) {
super.visitMethodInsn(opcode, owner, name, desc);
public void visitMethodInsn(int opcode, String owner, String name, String desc, boolean itf) {
super.visitMethodInsn(opcode, owner, name, desc, itf);
if ("<init>".equals(name)) {
visitLdcInsn(awtAppClassName);
visitFieldInsn(Opcodes.PUTSTATIC, "sun/awt/X11/XToolkit", "awtAppClassName", "Ljava/lang/String;");
Expand Down