Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java?rev=1089585&r1=1089584&r2=1089585&view=diff ============================================================================== --- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java (original) +++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/AbstractAnnotationBuilder.java Wed Apr 6 19:12:13 2011 @@ -18,8 +18,8 @@ import java.lang.reflect.Array; import java.util.ArrayList; import java.util.List; -import org.objectweb.asm.AnnotationVisitor; -import org.objectweb.asm.Type; +import org.apache.tapestry5.internal.plastic.asm.AnnotationVisitor; +import org.apache.tapestry5.internal.plastic.asm.Type; @SuppressWarnings( { "rawtypes", "unchecked" })
Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java?rev=1089585&r1=1089584&r2=1089585&view=diff ============================================================================== --- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java (original) +++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderImpl.java Wed Apr 6 19:12:13 2011 @@ -14,15 +14,15 @@ package org.apache.tapestry5.internal.plastic; +import org.apache.tapestry5.internal.plastic.asm.Label; +import org.apache.tapestry5.internal.plastic.asm.MethodVisitor; +import org.apache.tapestry5.internal.plastic.asm.Opcodes; +import org.apache.tapestry5.internal.plastic.asm.Type; import org.apache.tapestry5.plastic.InstructionBuilder; import org.apache.tapestry5.plastic.InstructionBuilderCallback; import org.apache.tapestry5.plastic.MethodDescription; import org.apache.tapestry5.plastic.SwitchCallback; import org.apache.tapestry5.plastic.TryCatchCallback; -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.Type; @SuppressWarnings("rawtypes") public class InstructionBuilderImpl extends Lockable implements Opcodes, InstructionBuilder Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderState.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderState.java?rev=1089585&r1=1089584&r2=1089585&view=diff ============================================================================== --- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderState.java (original) +++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/InstructionBuilderState.java Wed Apr 6 19:12:13 2011 @@ -16,9 +16,9 @@ package org.apache.tapestry5.internal.pl import java.util.Map; +import org.apache.tapestry5.internal.plastic.asm.Label; +import org.apache.tapestry5.internal.plastic.asm.MethodVisitor; import org.apache.tapestry5.plastic.MethodDescription; -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; /** * Stores information about the method whose instructions are being constructed, to make it easier Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java?rev=1089585&r1=1089584&r2=1089585&view=diff ============================================================================== --- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java (original) +++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassImpl.java Wed Apr 6 19:12:13 2011 @@ -28,6 +28,17 @@ import java.util.ListIterator; import java.util.Map; import java.util.Set; +import org.apache.tapestry5.internal.plastic.asm.Opcodes; +import org.apache.tapestry5.internal.plastic.asm.Type; +import org.apache.tapestry5.internal.plastic.asm.tree.AbstractInsnNode; +import org.apache.tapestry5.internal.plastic.asm.tree.AnnotationNode; +import org.apache.tapestry5.internal.plastic.asm.tree.ClassNode; +import org.apache.tapestry5.internal.plastic.asm.tree.FieldInsnNode; +import org.apache.tapestry5.internal.plastic.asm.tree.FieldNode; +import org.apache.tapestry5.internal.plastic.asm.tree.InsnList; +import org.apache.tapestry5.internal.plastic.asm.tree.MethodInsnNode; +import org.apache.tapestry5.internal.plastic.asm.tree.MethodNode; +import org.apache.tapestry5.internal.plastic.asm.tree.VarInsnNode; import org.apache.tapestry5.plastic.AnnotationAccess; import org.apache.tapestry5.plastic.ClassInstantiator; import org.apache.tapestry5.plastic.ComputedValue; @@ -51,17 +62,6 @@ import org.apache.tapestry5.plastic.Swit import org.apache.tapestry5.plastic.SwitchCallback; import org.apache.tapestry5.plastic.TryCatchBlock; import org.apache.tapestry5.plastic.TryCatchCallback; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.Type; -import org.objectweb.asm.tree.AbstractInsnNode; -import org.objectweb.asm.tree.AnnotationNode; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.FieldInsnNode; -import org.objectweb.asm.tree.FieldNode; -import org.objectweb.asm.tree.InsnList; -import org.objectweb.asm.tree.MethodInsnNode; -import org.objectweb.asm.tree.MethodNode; -import org.objectweb.asm.tree.VarInsnNode; @SuppressWarnings("all") public class PlasticClassImpl extends Lockable implements PlasticClass, InternalPlasticClassTransformation, Opcodes Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java?rev=1089585&r1=1089584&r2=1089585&view=diff ============================================================================== --- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java (original) +++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticClassPool.java Wed Apr 6 19:12:13 2011 @@ -26,15 +26,15 @@ import java.util.List; import java.util.Map; import java.util.Set; +import org.apache.tapestry5.internal.plastic.asm.ClassReader; +import org.apache.tapestry5.internal.plastic.asm.ClassWriter; +import org.apache.tapestry5.internal.plastic.asm.Opcodes; +import org.apache.tapestry5.internal.plastic.asm.tree.AnnotationNode; +import org.apache.tapestry5.internal.plastic.asm.tree.ClassNode; import org.apache.tapestry5.plastic.AnnotationAccess; import org.apache.tapestry5.plastic.ClassInstantiator; import org.apache.tapestry5.plastic.PlasticClassTransformation; import org.apache.tapestry5.plastic.PlasticManagerDelegate; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.Opcodes; -import org.objectweb.asm.tree.AnnotationNode; -import org.objectweb.asm.tree.ClassNode; /** * Responsible for managing a class loader that allows ASM {@link ClassNode}s Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java?rev=1089585&r1=1089584&r2=1089585&view=diff ============================================================================== --- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java (original) +++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PlasticInternalUtils.java Wed Apr 6 19:12:13 2011 @@ -27,11 +27,11 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.tapestry5.internal.plastic.asm.Type; +import org.apache.tapestry5.internal.plastic.asm.tree.ClassNode; +import org.apache.tapestry5.internal.plastic.asm.tree.MethodNode; +import org.apache.tapestry5.internal.plastic.asm.util.TraceClassVisitor; import org.apache.tapestry5.plastic.MethodDescription; -import org.objectweb.asm.Type; -import org.objectweb.asm.tree.ClassNode; -import org.objectweb.asm.tree.MethodNode; -import org.objectweb.asm.util.TraceClassVisitor; @SuppressWarnings("rawtypes") public class PlasticInternalUtils Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PrimitiveType.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PrimitiveType.java?rev=1089585&r1=1089584&r2=1089585&view=diff ============================================================================== --- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PrimitiveType.java (original) +++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/PrimitiveType.java Wed Apr 6 19:12:13 2011 @@ -17,7 +17,7 @@ package org.apache.tapestry5.internal.pl import java.util.HashMap; import java.util.Map; -import org.objectweb.asm.Opcodes; +import org.apache.tapestry5.internal.plastic.asm.Opcodes; /** * Collects together information needed to write code that involves primitive types, including Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java?rev=1089585&r1=1089584&r2=1089585&view=diff ============================================================================== --- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java (original) +++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/SwitchBlockImpl.java Wed Apr 6 19:12:13 2011 @@ -14,12 +14,12 @@ package org.apache.tapestry5.internal.plastic; +import org.apache.tapestry5.internal.plastic.asm.Label; +import org.apache.tapestry5.internal.plastic.asm.Opcodes; import org.apache.tapestry5.plastic.InstructionBuilder; import org.apache.tapestry5.plastic.InstructionBuilderCallback; import org.apache.tapestry5.plastic.SwitchBlock; import org.apache.tapestry5.plastic.SwitchCallback; -import org.objectweb.asm.Label; -import org.objectweb.asm.Opcodes; public class SwitchBlockImpl extends Lockable implements SwitchBlock, Opcodes { Modified: tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java?rev=1089585&r1=1089584&r2=1089585&view=diff ============================================================================== --- tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java (original) +++ tapestry/tapestry5/trunk/plastic/src/main/java/org/apache/tapestry5/internal/plastic/TryCatchBlockImpl.java Wed Apr 6 19:12:13 2011 @@ -14,10 +14,10 @@ package org.apache.tapestry5.internal.plastic; +import org.apache.tapestry5.internal.plastic.asm.Label; import org.apache.tapestry5.plastic.InstructionBuilderCallback; import org.apache.tapestry5.plastic.TryCatchBlock; import org.apache.tapestry5.plastic.TryCatchCallback; -import org.objectweb.asm.Label; public class TryCatchBlockImpl extends Lockable implements TryCatchBlock {
