split out code into better named file

Author: lexicalscope

svm-partition-trace/src/main/java/com/lexicalscope/svm/partition/trace/PartitionInstrumentation.java

@@ -1,7 +1,7 @@
 package com.lexicalscope.svm.partition.trace;
 
 import static com.lexicalscope.svm.partition.trace.ops.CheckPartitionAtMethodEntryExit.checkPartitionAtMethodEntryExit;
-import static com.lexicalscope.svm.partition.trace.ops.TrackPartitionAtNew.constructionOf;
+import static com.lexicalscope.svm.partition.trace.ops.TrackPartitionAtConstruction.constructionOf;
 import static com.lexicalscope.svm.vm.j.klass.SMethodDescriptorMatchers.anyMethod;
 
 import org.hamcrest.Matcher;

svm-partition-trace/src/main/java/com/lexicalscope/svm/partition/trace/ops/TrackPartitionAtConstruction.java

@@ -0,0 +1,52 @@
+package com.lexicalscope.svm.partition.trace.ops;
+
+import static org.hamcrest.Matchers.any;
+
+import org.hamcrest.Matcher;
+
+import com.lexicalscope.svm.j.instruction.InstructionInternal;
+import com.lexicalscope.svm.j.instruction.LinearOp;
+import com.lexicalscope.svm.j.instruction.instrumentation.CompositeMethodInstrumentor;
+import com.lexicalscope.svm.j.instruction.instrumentation.InstructionInstrumentor;
+import com.lexicalscope.svm.j.instruction.instrumentation.MethodInstrumentor;
+import com.lexicalscope.svm.j.instruction.instrumentation.finders.FindConstructorCall;
+import com.lexicalscope.svm.partition.spec.CallContext;
+import com.lexicalscope.svm.vm.j.Instruction;
+import com.lexicalscope.svm.vm.j.InstructionCode;
+import com.lexicalscope.svm.vm.j.InstructionQueryAdapter;
+import com.lexicalscope.svm.vm.j.KlassInternalName;
+import com.lexicalscope.svm.vm.j.Vop;
+import com.lexicalscope.svm.vm.j.klass.SMethodDescriptor;
+
+public class TrackPartitionAtConstruction {
+   private final static Object aPart = new Object(){ @Override public String toString() { return "aPart"; }};
+   private final static Object uPart = new Object(){ @Override public String toString() { return "uPart"; }};
+
+   private static MatcherPartition matcherPartition(final Matcher<? super CallContext> aPartNewInstanceMatcher, final Matcher<? super CallContext> uPartNewInstanceMatcher) {
+      return new MatcherPartition(
+            aPartNewInstanceMatcher,
+            uPartNewInstanceMatcher,
+            aPart,
+            uPart);
+   }
+
+   public static MethodInstrumentor constructionOf(
+         final Matcher<? super CallContext> aPartNewInstanceMatcher,
+         final Matcher<? super CallContext> uPartNewInstanceMatcher) {
+      final MatcherPartition partition = matcherPartition(aPartNewInstanceMatcher, uPartNewInstanceMatcher);
+      return new CompositeMethodInstrumentor(
+               new FindConstructorCall(any(KlassInternalName.class)),
+               new InstructionInstrumentor(){
+                  @Override public void candidate(final Instruction instruction) {
+                     final Vop tagger = instruction.query(new InstructionQueryAdapter<Vop>(){
+                        @Override public Vop invokespecial(final SMethodDescriptor methodName, final MethodArguments methodArguments) {
+                           return new TagConstructorRecieverWithPartition(methodName, methodArguments, partition);
+                        }
+                     });
+                     // TODO[tim]:make it easier to manufacture instructions
+                     assert tagger != null;
+                     instruction.insertHere(new InstructionInternal(new LinearOp(tagger), InstructionCode.synthetic));
+                  }
+               });
+   }
+}

svm-partition-trace/src/main/java/com/lexicalscope/svm/partition/trace/ops/TrackPartitionAtNew.java

@@ -1,19 +1,11 @@
 package com.lexicalscope.svm.partition.trace.ops;
 
-import static org.hamcrest.Matchers.any;
-
 import org.hamcrest.Matcher;
 
-import com.lexicalscope.svm.j.instruction.InstructionInternal;
-import com.lexicalscope.svm.j.instruction.LinearOp;
 import com.lexicalscope.svm.j.instruction.factory.InstructionSource;
-import com.lexicalscope.svm.j.instruction.instrumentation.CompositeMethodInstrumentor;
-import com.lexicalscope.svm.j.instruction.instrumentation.InstructionInstrumentor;
 import com.lexicalscope.svm.j.instruction.instrumentation.MethodInstrumentor;
-import com.lexicalscope.svm.j.instruction.instrumentation.finders.FindConstructorCall;
 import com.lexicalscope.svm.partition.spec.CallContext;
 import com.lexicalscope.svm.vm.j.Instruction;
-import com.lexicalscope.svm.vm.j.InstructionCode;
 import com.lexicalscope.svm.vm.j.InstructionQueryAdapter;
 import com.lexicalscope.svm.vm.j.KlassInternalName;
 import com.lexicalscope.svm.vm.j.Vop;
@@ -42,27 +34,6 @@ private static MatcherPartition matcherPartition(final Matcher<? super CallConte
             aPart,
             uPart);
    }
-
-   public static MethodInstrumentor constructionOf(
-         final Matcher<? super CallContext> aPartNewInstanceMatcher,
-         final Matcher<? super CallContext> uPartNewInstanceMatcher) {
-      final MatcherPartition partition = matcherPartition(aPartNewInstanceMatcher, uPartNewInstanceMatcher);
-      return new CompositeMethodInstrumentor(
-               new FindConstructorCall(any(KlassInternalName.class)),
-               new InstructionInstrumentor(){
-                  @Override public void candidate(final Instruction instruction) {
-                     final Vop tagger = instruction.query(new InstructionQueryAdapter<Vop>(){
-                        @Override public Vop invokespecial(final SMethodDescriptor methodName, final MethodArguments methodArguments) {
-                           return new TagConstructorRecieverWithPartition(methodName, methodArguments, partition);
-                        }
-                     });
-                     // TODO[tim]:make it easier to manufacture instructions
-                     assert tagger != null;
-                     instruction.insertHere(new InstructionInternal(new LinearOp(tagger), InstructionCode.synthetic));
-                  }
-               });
-   }
-
    @Override public Instruction instrument(
          final InstructionSource instructions,
          final SMethodDescriptor method,