Commit 7bc1be02 authored by ebruneton's avatar ebruneton

restored package name to "objectweb"

changed interfaces to abstract classes (to provide backward compatibility in future versions)
parent c7b66c27
......@@ -36,8 +36,8 @@
<mkdir dir="${out.dist.lib}/all"/>
<jar jarfile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"
basedir="${out.build}">
<include name="org/ow2/asm/**/*.class"/>
<exclude name="org/ow2/asm/optimizer/*.class"/>
<include name="org/objectweb/asm/**/*.class"/>
<exclude name="org/objectweb/asm/optimizer/*.class"/>
<manifest>
<attribute name="Implementation-Title" value="ASM all classes"/>
<attribute name="Implementation-Version" value="${product.artifact}"/>
......@@ -47,9 +47,9 @@
<attribute name="Bundle-Name" value="ASM all classes"/>
<attribute name="Bundle-Vendor" value="France Telecom R&amp;D"/>
<attribute name="Bundle-Version" value="${product.artifact}"/>
<attribute name="Bundle-DocURL" value="http://asm.ow2.org"/>
<attribute name="Bundle-SymbolicName" value="org.ow2.asm.all"/>
<attribute name="Export-Package" value="org.ow2.asm;version=${product.artifact},org.ow2.asm.signature;version=${product.artifact},org.ow2.asm.commons;version=${product.artifact},org.ow2.asm.tree;version=${product.artifact},org.ow2.asm.tree.analysis;version=${product.artifact},org.ow2.asm.util;version=${product.artifact},org.ow2.asm.xml;version=${product.artifact}"/>
<attribute name="Bundle-DocURL" value="http://asm.objectweb.org"/>
<attribute name="Bundle-SymbolicName" value="org.objectweb.asm.all"/>
<attribute name="Export-Package" value="org.objectweb.asm;version=${product.artifact},org.objectweb.asm.signature;version=${product.artifact},org.objectweb.asm.commons;version=${product.artifact},org.objectweb.asm.tree;version=${product.artifact},org.objectweb.asm.tree.analysis;version=${product.artifact},org.objectweb.asm.util;version=${product.artifact},org.objectweb.asm.xml;version=${product.artifact}"/>
<attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.3"/>
</manifest>
</jar>
......
......@@ -35,7 +35,7 @@
<target name="build-jar">
<jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
basedir="${out.build}">
<include name="org/ow2/asm/tree/analysis/*.class"/>
<include name="org/objectweb/asm/tree/analysis/*.class"/>
<manifest>
<attribute name="Implementation-Title" value="ASM static code analysis framework"/>
<attribute name="Implementation-Version" value="${product.artifact}"/>
......
......@@ -35,7 +35,7 @@
<target name="build-jar">
<jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
basedir="${out.build}">
<include name="org/ow2/asm/commons/*.class"/>
<include name="org/objectweb/asm/commons/*.class"/>
<manifest>
<attribute name="Implementation-Title" value="ASM commons"/>
<attribute name="Implementation-Version" value="${product.artifact}"/>
......
......@@ -36,8 +36,8 @@
<mkdir dir="${out.dist.lib}/all"/>
<jar jarfile="${out.dist.lib}/all/${ant.project.name}-${product.artifact}.jar"
basedir="${out.build}/tmp">
<include name="org/ow2/asm/**/*.class"/>
<exclude name="org/ow2/asm/optimizer/*.class"/>
<include name="org/objectweb/asm/**/*.class"/>
<exclude name="org/objectweb/asm/optimizer/*.class"/>
<manifest>
<attribute name="Implementation-Title" value="ASM all classes with debug info"/>
<attribute name="Implementation-Version" value="${product.artifact}"/>
......@@ -47,9 +47,9 @@
<attribute name="Bundle-Name" value="ASM all classes with debug info"/>
<attribute name="Bundle-Vendor" value="France Telecom R&amp;D"/>
<attribute name="Bundle-Version" value="${product.artifact}"/>
<attribute name="Bundle-DocURL" value="http://asm.ow2.org"/>
<attribute name="Bundle-SymbolicName" value="org.ow2.asm.all"/>
<attribute name="Export-Package" value="org.ow2.asm;version=${product.artifact},org.ow2.asm.signature;version=${product.artifact},org.ow2.asm.commons;version=${product.artifact},org.ow2.asm.tree;version=${product.artifact},org.ow2.asm.tree.analysis;version=${product.artifact},org.ow2.asm.util;version=${product.artifact},org.ow2.asm.xml;version=${product.artifact}"/>
<attribute name="Bundle-DocURL" value="http://asm.objectweb.org"/>
<attribute name="Bundle-SymbolicName" value="org.objectweb.asm.all"/>
<attribute name="Export-Package" value="org.objectweb.asm;version=${product.artifact},org.objectweb.asm.signature;version=${product.artifact},org.objectweb.asm.commons;version=${product.artifact},org.objectweb.asm.tree;version=${product.artifact},org.objectweb.asm.tree.analysis;version=${product.artifact},org.objectweb.asm.util;version=${product.artifact},org.objectweb.asm.xml;version=${product.artifact}"/>
<attribute name="Bundle-RequiredExecutionEnvironment" value="J2SE-1.3"/>
</manifest>
</jar>
......
......@@ -41,18 +41,18 @@
<name>ASM</name>
<description>A very small and fast Java bytecode manipulation framework</description>
<url>http://asm.ow2.org/</url>
<url>http://asm.objectweb.org/</url>
<organization>
<name>ObjectWeb</name>
<url>http://www.ow2.org/</url>
<url>http://www.objectweb.org/</url>
</organization>
<inceptionYear>2000</inceptionYear>
<licenses>
<license>
<name>BSD</name>
<url>http://asm.ow2.org/license.html</url>
<url>http://asm.objectweb.org/license.html</url>
</license>
</licenses>
......@@ -139,17 +139,17 @@
<mailingLists>
<mailingList>
<name>ASM Users List</name>
<subscribe>sympa@ow2.org?subject=subscribe%20asm</subscribe>
<unsubscribe>sympa@ow2.org?subject=unsubscribe%20asm</unsubscribe>
<post>asm@ow2.org</post>
<archive>http://www.ow2.org/wws/arc/asm</archive>
<subscribe>sympa@objectweb.org?subject=subscribe%20asm</subscribe>
<unsubscribe>sympa@objectweb.org?subject=unsubscribe%20asm</unsubscribe>
<post>asm@objectweb.org</post>
<archive>http://www.objectweb.org/wws/arc/asm</archive>
</mailingList>
<mailingList>
<name>ASM Team List</name>
<subscribe>sympa@ow2.org?subject=subscribe%20asm-team</subscribe>
<unsubscribe>sympa@ow2.org?subject=unsubscribe%20asm-team</unsubscribe>
<post>asm-team@ow2.org</post>
<archive>http://www.ow2.org/wws/arc/asm-team</archive>
<subscribe>sympa@objectweb.org?subject=subscribe%20asm-team</subscribe>
<unsubscribe>sympa@objectweb.org?subject=unsubscribe%20asm-team</unsubscribe>
<post>asm-team@objectweb.org</post>
<archive>http://www.objectweb.org/wws/arc/asm-team</archive>
</mailingList>
</mailingLists>
......
......@@ -35,7 +35,7 @@
<target name="build-jar">
<jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
basedir="${out.build}">
<include name="org/ow2/asm/tree/*.class"/>
<include name="org/objectweb/asm/tree/*.class"/>
<manifest>
<attribute name="Implementation-Title" value="ASM Tree class visitor"/>
<attribute name="Implementation-Version" value="${product.artifact}"/>
......
......@@ -35,7 +35,7 @@
<target name="build-jar">
<jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
basedir="${out.build}">
<include name="org/ow2/asm/util/**/*.class"/>
<include name="org/objectweb/asm/util/**/*.class"/>
<manifest>
<attribute name="Implementation-Title" value="ASM Utilities"/>
<attribute name="Implementation-Version" value="${product.artifact}"/>
......
......@@ -35,13 +35,13 @@
<target name="build-jar">
<jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
basedir="${out.build}">
<include name="org/ow2/asm/xml/*.class"/>
<include name="org/objectweb/asm/xml/*.class"/>
<manifest>
<attribute name="Implementation-Title" value="ASM XML classes"/>
<attribute name="Implementation-Version" value="${product.artifact}"/>
<attribute name="Implementation-Vendor" value="Eugene Kuleshov"/>
<attribute name="Class-path" value="asm-${product.artifact}.jar asm-util-${product.artifact}.jar asm-attrs-${product.artifact}.jar"/>
<attribute name="Main-class" value="org.ow2.asm.xml.Processor"/>
<attribute name="Main-class" value="org.objectweb.asm.xml.Processor"/>
</manifest>
</jar>
......
......@@ -35,8 +35,8 @@
<target name="build-jar">
<jar jarfile="${out.dist.lib}/${ant.project.name}-${product.artifact}.jar"
basedir="${out.build}">
<include name="org/ow2/asm/*.class"/>
<include name="org/ow2/asm/signature/*.class"/>
<include name="org/objectweb/asm/*.class"/>
<include name="org/objectweb/asm/signature/*.class"/>
<manifest>
<attribute name="Implementation-Title" value="ASM"/>
<attribute name="Implementation-Version" value="${product.artifact}"/>
......
......@@ -31,7 +31,7 @@
# Some information about the product
product.name asm
product.version 4.0
product.version 4.0_RC2
# product.snapshot yes
plugin.version 3.3.0
......@@ -50,7 +50,7 @@ build.compiler modern
# Build class path (classes needed to build the project)
# Class path for the ObjectWeb utility Ant tasks (version 1.3.2 or higher)
# See http://forge.ow2.org/projects/monolog
# See http://forge.objectweb.org/projects/monolog
# objectweb.ant.tasks.path ow_util_ant_tasks.jar
......
......@@ -150,7 +150,7 @@
<target name="compile-init">
<mkdir dir="${out.build}/tmp" />
<condition property="config.uptodate">
<uptodate srcfile="${src}/org/ow2/asm/ClassReader.java" targetfile="${out.build}/tmp/org/ow2/asm/ClassReader.java" />
<uptodate srcfile="${src}/org/objectweb/asm/ClassReader.java" targetfile="${out.build}/tmp/org/objectweb/asm/ClassReader.java" />
</condition>
<copy todir="${out.build}/tmp">
<fileset dir="${src}">
......@@ -182,16 +182,16 @@
<target name="shrink" depends="compile-debug" if="product.shrink">
<echo message="Shrinking" />
<java classname="org.ow2.asm.optimizer.Shrinker">
<java classname="org.objectweb.asm.optimizer.Shrinker">
<classpath>
<pathelement location="${out.build}/tmp" />
</classpath>
<arg value="${src}/org/ow2/asm/optimizer/shrink.properties" />
<arg value="${src}/org/ow2/asm/optimizer/shrink${SIG}.properties" />
<arg value="${src}/org/ow2/asm/optimizer/shrink${ANN}.properties" />
<arg value="${src}/org/ow2/asm/optimizer/shrink${FRAMES}.properties" />
<arg value="${src}/org/ow2/asm/optimizer/shrink${WRITER}.properties" />
<arg value="${src}/org/ow2/asm/optimizer/shrink${RESIZE}.properties" />
<arg value="${src}/org/objectweb/asm/optimizer/shrink.properties" />
<arg value="${src}/org/objectweb/asm/optimizer/shrink${SIG}.properties" />
<arg value="${src}/org/objectweb/asm/optimizer/shrink${ANN}.properties" />
<arg value="${src}/org/objectweb/asm/optimizer/shrink${FRAMES}.properties" />
<arg value="${src}/org/objectweb/asm/optimizer/shrink${WRITER}.properties" />
<arg value="${src}/org/objectweb/asm/optimizer/shrink${RESIZE}.properties" />
<arg value="${out.build}/tmp" />
<arg value="${out.build}" />
</java>
......@@ -318,12 +318,12 @@
<ant antfile="${archive}/asm-tree.xml" />
<ant antfile="${archive}/asm-util.xml" />
<ant antfile="${archive}/asm-xml.xml" />
<java classname="org.ow2.asm.optimizer.JarOptimizer">
<java classname="org.objectweb.asm.optimizer.JarOptimizer">
<classpath>
<pathelement location="${out.build}" />
</classpath>
<!--arg value="${src}/org/ow2/asm/optimizer/jdk1.2.2_017.txt.gz"/-->
<arg value="${src}/org/ow2/asm/optimizer/jdk1.3.1_19.txt.gz" />
<!--arg value="${src}/org/objectweb/asm/optimizer/jdk1.2.2_017.txt.gz"/-->
<arg value="${src}/org/objectweb/asm/optimizer/jdk1.3.1_19.txt.gz" />
<arg value="-nodebug" />
<arg value="${out.dist.lib}" />
</java>
......@@ -380,7 +380,7 @@
</target>
<target name="eclipse.plugin" depends="jar,eclipse.generate">
<jar zipfile="${out}/org.ow2.asm_${plugin.artifact}.jar">
<jar zipfile="${out}/org.objectweb.asm_${plugin.artifact}.jar">
<zipfileset dir="${basedir}">
<include name="plugin.xml"/>
<include name="META-INF/MANIFEST.MF"/>
......@@ -394,7 +394,7 @@
<manifest>
<attribute name="Bundle-ManifestVersion" value="2"/>
<attribute name="Bundle-Name" value="ASM Framework"/>
<attribute name="Bundle-SymbolicName" value="org.ow2.asm;singleton:=true"/>
<attribute name="Bundle-SymbolicName" value="org.objectweb.asm;singleton:=true"/>
<attribute name="Bundle-Version" value="${plugin.artifact}"/>
<attribute name="Bundle-ClassPath" value="output/dist/lib/asm-${product.artifact}.jar,
output/dist/lib/asm-tree-${product.artifact}.jar,
......@@ -404,14 +404,14 @@ output/dist/lib/asm-attrs-${product.artifact}.jar,
output/dist/lib/asm-util-${product.artifact}.jar"/>
<attribute name="Bundle-Vendor" value="ObjectWeb.org"/>
<attribute name="Bundle-Localization" value="plugin"/>
<attribute name="Export-Package" value="org.ow2.asm,
org.ow2.asm.attrs,
org.ow2.asm.commons,
org.ow2.asm.signature,
org.ow2.asm.tree,
org.ow2.asm.tree.analysis,
org.ow2.asm.util,
org.ow2.asm.xml"/>
<attribute name="Export-Package" value="org.objectweb.asm,
org.objectweb.asm.attrs,
org.objectweb.asm.commons,
org.objectweb.asm.signature,
org.objectweb.asm.tree,
org.objectweb.asm.tree.analysis,
org.objectweb.asm.util,
org.objectweb.asm.xml"/>
<attribute name="Eclipse-AutoStart" value="true"/>
</manifest>
</jar>
......@@ -419,10 +419,10 @@ org.ow2.asm.xml"/>
<target name="eclipse.feature" depends="eclipse.plugin">
<echo file="${out}/feature.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<feature id="org.ow2.asm.feature" label="ASM Framework"
<feature id="org.objectweb.asm.feature" label="ASM Framework"
version="${plugin.artifact}" provider-name="ObjectWeb.org">
<description url="http://asm.ow2.org/eclipse/asm/index.html">
<description url="http://asm.objectweb.org/eclipse/asm/index.html">
Feature contains ASM Java bytecode manipulation framework runtime.
</description>
......@@ -447,14 +447,14 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
</license>
<url>
<update label="ASM Framework" url="http://download.forge.ow2.org/eclipse-update/site.xml"/>
<update label="ASM Framework" url="http://download.forge.objectweb.org/eclipse-update/site.xml"/>
</url>
<plugin id="org.ow2.asm" download-size="0" install-size="0" version="${plugin.artifact}"/>
<plugin id="org.objectweb.asm" download-size="0" install-size="0" version="${plugin.artifact}"/>
</feature>]]></echo>
<jar jarfile="${out}/org.ow2.asm.feature_${plugin.artifact}.jar">
<jar jarfile="${out}/org.objectweb.asm.feature_${plugin.artifact}.jar">
<fileset file="${out}/feature.xml"/>
</jar>
</target>
......@@ -462,23 +462,23 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
<target name="eclipse.site" depends="eclipse.feature">
<echo file="${out}/site.xml"><![CDATA[<?xml version="1.0" encoding="UTF-8"?>
<site>
<description url="http://asm.ow2.org/eclipse/asm/index.html">
<description url="http://asm.objectweb.org/eclipse/asm/index.html">
ASM Framework
</description>
<feature url="features/org.ow2.asm.feature_${plugin.artifact}.jar" id="org.ow2.asm.feature" version="${plugin.artifact}">
<feature url="features/org.objectweb.asm.feature_${plugin.artifact}.jar" id="org.objectweb.asm.feature" version="${plugin.artifact}">
<category name="asm"/>
</feature>
<category-def name="asm" label="ASM Framework"/>
<archive path="plugins/org.ow2.asm_${plugin.artifact}.jar" url="http://download.forge.ow2.org/asm/org.ow2.asm_${plugin.artifact}.jar"/>
<archive path="plugins/org.objectweb.asm_${plugin.artifact}.jar" url="http://download.forge.objectweb.org/asm/org.objectweb.asm_${plugin.artifact}.jar"/>
</site>]]></echo>
<zip zipfile="${out}/org.ow2.asm.update_${plugin.artifact}.zip">
<zip zipfile="${out}/org.objectweb.asm.update_${plugin.artifact}.zip">
<zipfileset dir="${out}" includes="site.xml"/>
<zipfileset dir="${out}" includes="org.ow2.asm.feature_${plugin.artifact}.jar" prefix="features"/>
<zipfileset dir="${out}" includes="org.ow2.asm_${plugin.artifact}.jar" prefix="plugins"/>
<zipfileset dir="${out}" includes="org.objectweb.asm.feature_${plugin.artifact}.jar" prefix="features"/>
<zipfileset dir="${out}" includes="org.objectweb.asm_${plugin.artifact}.jar" prefix="plugins"/>
</zip>
</target>
-->
......
......@@ -27,21 +27,19 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
import org.ow2.asm.FieldVisitor;
import org.ow2.asm.ClassAdapter;
import org.ow2.asm.ClassReader;
import org.ow2.asm.ClassVisitor;
import org.ow2.asm.ClassWriter;
import org.ow2.asm.MethodAdapter;
import org.ow2.asm.MethodVisitor;
import org.ow2.asm.Opcodes;
import org.ow2.asm.Type;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.lang.reflect.Method;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.FieldVisitor;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
/**
* @author Eric Bruneton
*/
......@@ -102,12 +100,12 @@ public class Adapt extends ClassLoader {
}
}
class TraceFieldClassAdapter extends ClassAdapter implements Opcodes {
class TraceFieldClassAdapter extends ClassVisitor implements Opcodes {
private String owner;
public TraceFieldClassAdapter(final ClassVisitor cv) {
super(cv);
super(Opcodes.ASM4, cv);
}
@Override
......@@ -201,12 +199,12 @@ class TraceFieldClassAdapter extends ClassAdapter implements Opcodes {
}
}
class TraceFieldCodeAdapter extends MethodAdapter implements Opcodes {
class TraceFieldCodeAdapter extends MethodVisitor implements Opcodes {
private String owner;
public TraceFieldCodeAdapter(final MethodVisitor mv, final String owner) {
super(mv);
super(Opcodes.ASM4, mv);
this.owner = owner;
}
......
......@@ -32,20 +32,22 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
import org.ow2.asm.ClassReader;
import org.ow2.asm.Opcodes;
import org.ow2.asm.tree.AbstractInsnNode;
import org.ow2.asm.tree.ClassNode;
import org.ow2.asm.tree.IincInsnNode;
import org.ow2.asm.tree.MethodNode;
import org.ow2.asm.tree.VarInsnNode;
import org.ow2.asm.tree.analysis.Analyzer;
import org.ow2.asm.tree.analysis.BasicValue;
import org.ow2.asm.tree.analysis.BasicVerifier;
import org.ow2.asm.tree.analysis.SourceInterpreter;
import org.ow2.asm.tree.analysis.SourceValue;
import org.ow2.asm.tree.analysis.Frame;
import org.ow2.asm.util.TraceMethodVisitor;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.ClassNode;
import org.objectweb.asm.tree.IincInsnNode;
import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.VarInsnNode;
import org.objectweb.asm.tree.analysis.Analyzer;
import org.objectweb.asm.tree.analysis.BasicValue;
import org.objectweb.asm.tree.analysis.BasicVerifier;
import org.objectweb.asm.tree.analysis.Frame;
import org.objectweb.asm.tree.analysis.SourceInterpreter;
import org.objectweb.asm.tree.analysis.SourceValue;
import org.objectweb.asm.util.TraceMethodVisitor;
import org.objectweb.asm.util.TraceVisitor;
/**
* @author Eric Bruneton
......@@ -69,7 +71,7 @@ public class Analysis implements Opcodes {
}
final Frame<?>[] frames = a.getFrames();
TraceMethodVisitor mv = new TraceMethodVisitor() {
TraceVisitor tv = new TraceVisitor() {
@Override
public void visitMaxs(
final int maxStack,
......@@ -91,6 +93,7 @@ public class Analysis implements Opcodes {
System.err.println();
}
};
MethodVisitor mv = new TraceMethodVisitor(tv);
for (int j = 0; j < method.instructions.size(); ++j) {
Object insn = method.instructions.get(j);
((AbstractInsnNode) insn).accept(mv);
......
......@@ -32,15 +32,14 @@ import java.lang.reflect.Method;
import java.util.ArrayList;
import java.util.List;
import org.ow2.asm.AnnotationVisitor;
import org.ow2.asm.ClassAdapter;
import org.ow2.asm.ClassReader;
import org.ow2.asm.ClassWriter;
import org.ow2.asm.Label;
import org.ow2.asm.MethodAdapter;
import org.ow2.asm.MethodVisitor;
import org.ow2.asm.Opcodes;
import org.ow2.asm.Type;
import org.objectweb.asm.AnnotationVisitor;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.Type;
public class Annotations {
......@@ -61,7 +60,7 @@ public class Annotations {
final String n = Annotations.class.getName();
final ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS);
ClassReader cr = new ClassReader(n);
cr.accept(new ClassAdapter(cw) {
cr.accept(new ClassVisitor(Opcodes.ASM4, cw) {
@Override
public MethodVisitor visitMethod(
......@@ -77,7 +76,7 @@ public class Annotations {
desc,
signature,
exceptions);
return new MethodAdapter(v) {
return new MethodVisitor(Opcodes.ASM4, v) {
private final List<Integer> params = new ArrayList<Integer>();
......
......@@ -27,21 +27,20 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*/
import org.ow2.asm.Attribute;
import org.ow2.asm.FieldVisitor;
import org.ow2.asm.ClassAdapter;
import org.ow2.asm.ClassReader;
import org.ow2.asm.ClassVisitor;
import org.ow2.asm.ClassWriter;
import org.ow2.asm.MethodVisitor;
import org.ow2.asm.Opcodes;
import org.ow2.asm.Label;
import org.ow2.asm.ByteVector;
import org.ow2.asm.util.TraceClassVisitor;
import java.io.FileOutputStream;
import java.io.PrintWriter;
import org.objectweb.asm.Attribute;
import org.objectweb.asm.ByteVector;
import org.objectweb.asm.ClassReader;
import org.objectweb.asm.ClassVisitor;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.FieldVisitor;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.util.TraceClassVisitor;
/**
* @author Eric Bruneton
*/
......@@ -70,10 +69,10 @@ public class Attributes extends ClassLoader {
}
}
class AddCommentClassAdapter extends ClassAdapter implements Opcodes {
class AddCommentClassAdapter extends ClassVisitor implements Opcodes {
public AddCommentClassAdapter(final ClassVisitor cv) {
super(cv);
super(Opcodes.ASM4, cv);
}
@Override
......
......@@ -33,36 +33,36 @@
# build.compiler jikes
# Runtime class path for the ASM library (version @product.version@)
# See http://asm.ow2.org
# See http://asm.objectweb.org
asm.path ../../lib/asm-@product.version@.jar
# Runtime class path for the ASM tree library (version @product.version@)
# See http://asm.ow2.org
# See http://asm.objectweb.org
asm.tree.path ../../lib/asm-tree-@product.version@.jar
# Runtime class path for the ASM analysis library (version @product.version@)
# See http://asm.ow2.org
# See http://asm.objectweb.org
asm.analysis.path ../../lib/asm-analysis-@product.version@.jar
# Runtime class path for the ASM attrs library (version @product.version@)
# See http://asm.ow2.org
# See http://asm.objectweb.org
asm.attrs.path ../../lib/asm-attrs-@product.version@.jar
# Runtime class path for the ASM util library (version @product.version@)
# See http://asm.ow2.org
# See http://asm.objectweb.org
asm.util.path ../../lib/asm-util-@product.version@.jar
# Runtime class path for the ASM commons library (version @product.version@)
# See http://asm.ow2.org
# See http://asm.objectweb.org
asm.commons.path ../../lib/asm-commons-@product.version@.jar
# Compile time class path for the whole ASM library (version @product.version@)
# See http://asm.ow2.org
# See http://asm.objectweb.org
asm.debug.path ../../lib/all/asm-debug-all-@product.version@.jar
......@@ -31,24 +31,24 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
import static org.ow2.asm.Opcodes.ACC_PUBLIC;
import static org.ow2.asm.Opcodes.ACC_STATIC;
import static org.ow2.asm.Opcodes.ALOAD;
import static org.ow2.asm.Opcodes.ARETURN;
import static org.ow2.asm.Opcodes.DUP;
import static org.ow2.asm.Opcodes.IFEQ;
import static org.ow2.asm.Opcodes.IFNE;
import static org.ow2.asm.Opcodes.H_INVOKESTATIC;
import static org.ow2.asm.Opcodes.POP;
import static org.ow2.asm.Opcodes.V1_7;
import static org.objectweb.asm.Opcodes.ACC_PUBLIC;
import static org.objectweb.asm.Opcodes.ACC_STATIC;
import static org.objectweb.asm.Opcodes.ALOAD;
import static org.objectweb.asm.Opcodes.ARETURN;
import static org.objectweb.asm.Opcodes.DUP;
import static org.objectweb.asm.Opcodes.H_INVOKESTATIC;
import static org.objectweb.asm.Opcodes.IFEQ;
import static org.objectweb.asm.Opcodes.IFNE;
import static org.objectweb.asm.Opcodes.POP;
import static org.objectweb.asm.Opcodes.V1_7;
import java.io.FileOutputStream;
import java.lang.reflect.Method;
import org.ow2.asm.ClassWriter;
import org.ow2.asm.Label;
import org.ow2.asm.Handle;
import org.ow2.asm.MethodVisitor;
import org.objectweb.asm.ClassWriter;
import org.objectweb.asm.Handle;
import org.objectweb.asm.Label;
import org.objectweb.asm.MethodVisitor;
/**
* @author Remi Forax
......
......@@ -31,9 +31,9 @@ import java.lang.invoke.CallSite;