Marker package merged

.classpath

@@ -19,6 +19,7 @@
 	<classpathentry kind="src" path="disl-server/src"/>
 	<classpathentry kind="src" path="disl/src/src-staticcontext"/>
 	<classpathentry kind="src" path="disl/src/src-staticcontext-uid"/>
+	<classpathentry kind="src" path="disl/src/src-marker"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="lib" path="output/lib/disl-bypass.jar"/>
 	<classpathentry kind="lib" path="lib/disl/log4j.jar" sourcepath="lib/devel/log4j-source.jar"/>

build.properties

@@ -18,6 +18,7 @@ src.disl.guard=src-guard
 src.disl.localvar=src-localvar
 src.disl.exception=src-exception
 src.disl.scope=src-scope
+src.disl.marker=src-marker
 src.disl.staticcontext=src-staticcontext
 src.disl.staticcontext-uid=src-staticcontext-uid
 src.disl.bypass=src-disl-bypass

build.xml

@@ -484,6 +484,7 @@
 			<src path="${src.disl.prefix}/src/${src.disl.processor}"/>
 			<src path="${src.disl.prefix}/src/${src.disl.guard}"/>
 			<src path="${src.disl.prefix}/src/${src.disl.scope}"/>
+			<src path="${src.disl.prefix}/src/${src.disl.marker}"/>
 			<src path="${src.disl.prefix}/src/${src.disl.localvar}"/>
 			<src path="${src.disl.prefix}/src/${src.disl.staticcontext}"/>
 			<src path="${src.disl.prefix}/src/${src.disl.staticcontext-uid}"/>

disl/src/src-classparser/ch/usi/dag/disl/SnippetParser.java

@@ -8,8 +8,6 @@ import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AnnotationNode;
 import org.objectweb.asm.tree.MethodNode;
 
-import ch.usi.dag.disl.marker.Marker;
-import ch.usi.dag.disl.marker.Parameter;
 import ch.usi.dag.util.logging.Logger;
 
 

disl/src/src-guard/ch/usi/dag/disl/ArgumentContextImpl.java

 package ch.usi.dag.disl;
 
-import ch.usi.dag.disl.processor.generator.ProcMethodInstance;
 import ch.usi.dag.disl.processorcontext.ArgumentContext;
 
 // used for guard invocation - reduced visibility

disl/src/src-guard/ch/usi/dag/disl/GuardHelper.java

@@ -7,7 +7,6 @@ import java.util.HashSet;
 import java.util.Set;
 
 import ch.usi.dag.disl.guardcontext.GuardContext;
-import ch.usi.dag.disl.processor.generator.ProcMethodInstance;
 import ch.usi.dag.disl.processorcontext.ArgumentContext;
 
 

disl/src/src-main/ch/usi/dag/disl/DiSL.java

 package ch.usi.dag.disl;
 
-import ch.usi.dag.disl.processor.generator.PIResolver;
-import ch.usi.dag.disl.processor.generator.ProcGenerator;
-import ch.usi.dag.disl.processor.generator.ProcInstance;
-import ch.usi.dag.disl.processor.generator.ProcMethodInstance;
 import ch.usi.dag.disl.weaver.Weaver;
 import ch.usi.dag.util.asm.ClassNodeHelper;
 import ch.usi.dag.util.logging.Logger;

src-disl/ch/usi/dag/disl/marker/AbstractDWRMarker.java → disl/src/src-marker/ch/usi/dag/disl/AbstractDWRMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.List;
 

src-disl/ch/usi/dag/disl/marker/AbstractInsnMarker.java → disl/src/src-marker/ch/usi/dag/disl/AbstractInsnMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.LinkedList;
 import java.util.List;

src-disl/ch/usi/dag/disl/marker/AbstractMarker.java → disl/src/src-marker/ch/usi/dag/disl/AbstractMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -11,10 +11,7 @@ import org.objectweb.asm.tree.LabelNode;
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.TryCatchBlockNode;
 
-import ch.usi.dag.disl.MarkerException;
-import ch.usi.dag.disl.Shadow;
 import ch.usi.dag.disl.Shadow.WeavingRegion;
-import ch.usi.dag.disl.Snippet;
 
 
 /**

src-disl/ch/usi/dag/disl/marker/AfterInitBodyMarker.java → disl/src/src-marker/ch/usi/dag/disl/AfterInitBodyMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -12,9 +12,7 @@ import org.objectweb.asm.tree.MethodNode;
 
 import ch.usi.dag.disl.annotation.Before;
 import ch.usi.dag.disl.Shadow.WeavingRegion;
-import ch.usi.dag.disl.AsmHelper;
 import ch.usi.dag.disl.AsmHelper.Insns;
-import ch.usi.dag.disl.JavaNames;
 
 
 /**

src-disl/ch/usi/dag/disl/marker/BasicBlockMarker.java → disl/src/src-marker/ch/usi/dag/disl/BasicBlockMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -7,7 +7,6 @@ import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
 import ch.usi.dag.disl.AsmHelper.Insns;
-import ch.usi.dag.disl.BasicBlockCalc;
 
 
 /**

src-disl/ch/usi/dag/disl/marker/BodyMarker.java → disl/src/src-marker/ch/usi/dag/disl/BodyMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -7,7 +7,6 @@ import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
 import ch.usi.dag.disl.Shadow.WeavingRegion;
-import ch.usi.dag.disl.AsmHelper;
 import ch.usi.dag.disl.AsmHelper.Insns;
 
 

src-disl/ch/usi/dag/disl/marker/BytecodeMarker.java → disl/src/src-marker/ch/usi/dag/disl/BytecodeMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -8,9 +8,7 @@ import java.util.Set;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
-import ch.usi.dag.disl.MarkerException;
 import ch.usi.dag.disl.AsmHelper.Insns;
-import ch.usi.dag.disl.AsmOpcodes;
 
 
 /**

src-disl/ch/usi/dag/disl/marker/EmptyMarker.java → disl/src/src-marker/ch/usi/dag/disl/EmptyMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.LinkedList;
 import java.util.List;

src-disl/ch/usi/dag/disl/marker/ExceptionHandlerMarker.java → disl/src/src-marker/ch/usi/dag/disl/ExceptionHandlerMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -8,7 +8,7 @@ import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.TryCatchBlockNode;
 
 import ch.usi.dag.disl.AsmHelper.Insns;
-import ch.usi.dag.disl.CtrlFlowGraph;
+
 
 /**
  * Marks an exception handler.

src-disl/ch/usi/dag/disl/marker/InsnNodeMarker.java → disl/src/src-marker/ch/usi/dag/disl/InsnNodeMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -8,7 +8,6 @@ import java.util.Set;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
-import ch.usi.dag.disl.MarkerException;
 import ch.usi.dag.disl.AsmHelper.Insns;
 
 /**

src-disl/ch/usi/dag/disl/marker/Marker.java → disl/src/src-marker/ch/usi/dag/disl/Marker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.List;
 
 import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 
-import ch.usi.dag.disl.MarkerException;
-import ch.usi.dag.disl.Shadow;
-import ch.usi.dag.disl.Snippet;
 
 /**
  * <p>
@@ -19,37 +16,37 @@ import ch.usi.dag.disl.Snippet;
  * scoped methods.
  * <ul>
  * <li>
- * {@link ch.usi.dag.disl.marker.AfterInitBodyMarker
+ * {@link AfterInitBodyMarker
  * AfterInitBodyMarker}</li>
  * <li>
- * {@link ch.usi.dag.disl.marker.BasicBlockMarker
+ * {@link BasicBlockMarker
  * BasicBlockMarker}</li>
  * <li>
- * {@link ch.usi.dag.disl.marker.BodyMarker
+ * {@link BodyMarker
  * BodyMarker}</li>
  * <li>
- * {@link ch.usi.dag.disl.marker.BytecodeMarker
+ * {@link BytecodeMarker
  * BytcodeMarker}</li>
  * <li>
- * {@link ch.usi.dag.disl.marker.EmptyMarker
+ * {@link EmptyMarker
  * EmptyMarker}</li>
  * <li>
- * {@link ch.usi.dag.disl.marker.ExceptionHandlerMarker
+ * {@link ExceptionHandlerMarker
  * ExceptionHandlerMarker}</li>
  * <li>
- * {@link ch.usi.dag.disl.marker.InsnNodeMarker
+ * {@link InsnNodeMarker
  * InsnNodeMarker - experimental}</li>
  * <li>
- * {@link ch.usi.dag.disl.marker.NewObjMarker
+ * {@link NewObjMarker
  * NewObjMarker - experimental}</li>
  * <li>
- * {@link ch.usi.dag.disl.marker.PreciseBasicBlockMarker
+ * {@link PreciseBasicBlockMarker
  * PreciseBasicBlockMarker}</li>
  * <li>
- * {@link ch.usi.dag.disl.marker.StrictBytecodeMarker
+ * {@link StrictBytecodeMarker
  * StrictBytecodeMarker}</li>
  * <li>
- * {@link ch.usi.dag.disl.marker.TryClauseMarker
+ * {@link TryClauseMarker
  * TryClauseMarker}</li>
  * </ul>
  *
@@ -58,13 +55,13 @@ import ch.usi.dag.disl.Snippet;
  * be implemented directly or following abstract markers might be used.
  * <ul>
  * <li>
- * {@link ch.usi.dag.disl.marker.AbstractMarker
+ * {@link AbstractMarker
  * AbstractMarker}</li>
  * <li>
- * {@link ch.usi.dag.disl.marker.AbstractDWRMarker
+ * {@link AbstractDWRMarker
  * AbstractDWRMarker}</li>
  * <li>
- * {@link ch.usi.dag.disl.marker.AbstractInsnMarker
+ * {@link AbstractInsnMarker
  * AbstractInsnMarker}</li>
  * </ul>
  */

src-disl/ch/usi/dag/disl/marker/NewObjMarker.java → disl/src/src-marker/ch/usi/dag/disl/NewObjMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -9,7 +9,7 @@ import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
 import ch.usi.dag.disl.AsmHelper.Insns;
-import ch.usi.dag.disl.JavaNames;
+
 
 /**
  * Marks object creation.

src-disl/ch/usi/dag/disl/marker/Parameter.java → disl/src/src-marker/ch/usi/dag/disl/Parameter.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 /**
  * Used for marker parameter parsing.

src-disl/ch/usi/dag/disl/marker/PreciseBasicBlockMarker.java → disl/src/src-marker/ch/usi/dag/disl/PreciseBasicBlockMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 /**
  * <p>

src-disl/ch/usi/dag/disl/marker/StrictBytecodeMarker.java → disl/src/src-marker/ch/usi/dag/disl/StrictBytecodeMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.HashSet;
 import java.util.LinkedList;
@@ -8,8 +8,6 @@ import java.util.Set;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
-import ch.usi.dag.disl.MarkerException;
-import ch.usi.dag.disl.AsmOpcodes;
 
 /**
  * <p>

src-disl/ch/usi/dag/disl/marker/TryClauseMarker.java → disl/src/src-marker/ch/usi/dag/disl/TryClauseMarker.java

-package ch.usi.dag.disl.marker;
+package ch.usi.dag.disl;
 
 import java.util.LinkedList;
 import java.util.List;

src-disl/ch/usi/dag/disl/processor/generator/PIResolver.java → disl/src/src-processor/ch/usi/dag/disl/PIResolver.java

-package ch.usi.dag.disl.processor.generator;
+package ch.usi.dag.disl;
 
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
-import ch.usi.dag.disl.Shadow;
-
 
 public class PIResolver {
 

src-disl/ch/usi/dag/disl/processor/generator/ProcGenerator.java → disl/src/src-processor/ch/usi/dag/disl/ProcGenerator.java

-package ch.usi.dag.disl.processor.generator;
+package ch.usi.dag.disl;
 
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -9,16 +9,8 @@ import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.MethodInsnNode;
 
-import ch.usi.dag.disl.DiSLFatalException;
-import ch.usi.dag.disl.ProcessorException;
-import ch.usi.dag.disl.GuardHelper;
-import ch.usi.dag.disl.ArgProcessor;
-import ch.usi.dag.disl.ArgProcessorKind;
-import ch.usi.dag.disl.ArgProcessorMethod;
 import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
-import ch.usi.dag.disl.ProcInvocation;
-import ch.usi.dag.disl.Shadow;
-import ch.usi.dag.disl.Snippet;
+
 
 public class ProcGenerator {
 

src-disl/ch/usi/dag/disl/processor/generator/ProcInstance.java → disl/src/src-processor/ch/usi/dag/disl/ProcInstance.java

-package ch.usi.dag.disl.processor.generator;
+package ch.usi.dag.disl;
 
 import java.util.List;
 

src-disl/ch/usi/dag/disl/processor/generator/ProcMethodInstance.java → disl/src/src-processor/ch/usi/dag/disl/ProcMethodInstance.java

-package ch.usi.dag.disl.processor.generator;
+package ch.usi.dag.disl;
 
 import org.objectweb.asm.Type;
 

disl/src/src-snippet/ch/usi/dag/disl/Snippet.java

@@ -12,7 +12,6 @@ import org.objectweb.asm.tree.ClassNode;
 import org.objectweb.asm.tree.MethodNode;
 
 import ch.usi.dag.disl.DiSL.CodeOption;
-import ch.usi.dag.disl.marker.Marker;
 
 
 /**

disl/src/src-snippet/ch/usi/dag/disl/SnippetUnprocessedCode.java

@@ -16,8 +16,6 @@ import org.objectweb.asm.tree.MethodInsnNode;
 import org.objectweb.asm.tree.MethodNode;
 
 import ch.usi.dag.disl.DiSL.CodeOption;
-import ch.usi.dag.disl.marker.BytecodeMarker;
-import ch.usi.dag.disl.marker.Marker;
 import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
 import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
 import ch.usi.dag.disl.AsmHelper.Insns;

disl/src/src-staticcontext/ch/usi/dag/disl/FieldAccessStaticContext.java

@@ -2,8 +2,6 @@ package ch.usi.dag.disl;
 
 import org.objectweb.asm.tree.FieldInsnNode;
 
-import ch.usi.dag.disl.marker.BytecodeMarker;
-
 
 /**
  * Represents a field access static context. Provides field's name and type

disl/src/src-staticcontext/ch/usi/dag/disl/InvocationStaticContext.java

@@ -3,8 +3,6 @@ package ch.usi.dag.disl;
 import org.objectweb.asm.Type;
 import org.objectweb.asm.tree.MethodInsnNode;
 
-import ch.usi.dag.disl.marker.BytecodeMarker;
-
 
 /**
  * Represents a static context for method invocations. Provides information

src-disl/ch/usi/dag/disl/annotation/After.java

@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
 
 import ch.usi.dag.disl.classcontext.ClassContext;
 import ch.usi.dag.disl.dynamiccontext.DynamicContext;
-import ch.usi.dag.disl.marker.Marker;
+import ch.usi.dag.disl.Marker;
 import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
 import ch.usi.dag.disl.StaticContext;
 
@@ -62,7 +62,7 @@ public @interface After {
      * Selects the marker class. A marker determines the region of code within a
      * method where to apply the snippet.
      *
-     * @see ch.usi.dag.disl.marker.Marker Implementation details
+     * @see Marker Implementation details
      */
     Class <? extends Marker> marker();
 

src-disl/ch/usi/dag/disl/annotation/AfterReturning.java

@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
 
 import ch.usi.dag.disl.classcontext.ClassContext;
 import ch.usi.dag.disl.dynamiccontext.DynamicContext;
-import ch.usi.dag.disl.marker.Marker;
+import ch.usi.dag.disl.Marker;
 import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
 import ch.usi.dag.disl.StaticContext;
 
@@ -62,7 +62,7 @@ public @interface AfterReturning {
      * Selects the marker class. A marker determines the region of code within a
      * method where to apply the snippet.
      *
-     * @see ch.usi.dag.disl.marker.Marker Implementation details
+     * @see Marker Implementation details
      */
     Class <? extends Marker> marker();
 

src-disl/ch/usi/dag/disl/annotation/AfterThrowing.java

@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
 
 import ch.usi.dag.disl.classcontext.ClassContext;
 import ch.usi.dag.disl.dynamiccontext.DynamicContext;
-import ch.usi.dag.disl.marker.Marker;
+import ch.usi.dag.disl.Marker;
 import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
 import ch.usi.dag.disl.StaticContext;
 
@@ -61,7 +61,7 @@ public @interface AfterThrowing {
      * Selects the marker class. A marker determines the region of code within a
      * method where to apply the snippet.
      *
-     * @see ch.usi.dag.disl.marker.Marker Implementation details
+     * @see Marker Implementation details
      */
     Class <? extends Marker> marker();
 

src-disl/ch/usi/dag/disl/annotation/Before.java

@@ -6,7 +6,7 @@ import java.lang.annotation.Target;
 
 import ch.usi.dag.disl.classcontext.ClassContext;
 import ch.usi.dag.disl.dynamiccontext.DynamicContext;
-import ch.usi.dag.disl.marker.Marker;
+import ch.usi.dag.disl.Marker;
 import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
 import ch.usi.dag.disl.StaticContext;
 
@@ -61,7 +61,7 @@ public @interface Before {
      * Selects the marker class. A marker determines the region of code within a
      * method where to apply the snippet.
      *
-     * @see ch.usi.dag.disl.marker.Marker Implementation details
+     * @see Marker Implementation details
      */
     Class <? extends Marker> marker();
 

src-disl/ch/usi/dag/disl/weaver/Weaver.java

@@ -23,7 +23,7 @@ import ch.usi.dag.disl.annotation.SyntheticLocal.Initialize;
 import ch.usi.dag.disl.InvalidContextUsageException;
 import ch.usi.dag.disl.SyntheticLocalVar;
 import ch.usi.dag.disl.ThreadLocalVar;
-import ch.usi.dag.disl.processor.generator.PIResolver;
+import ch.usi.dag.disl.PIResolver;
 import ch.usi.dag.disl.Shadow;
 import ch.usi.dag.disl.Shadow.WeavingRegion;
 import ch.usi.dag.disl.Snippet;

src-disl/ch/usi/dag/disl/weaver/WeavingCode.java

@@ -24,9 +24,9 @@ import ch.usi.dag.disl.Code;
 import ch.usi.dag.disl.dynamiccontext.DynamicContext;
 import ch.usi.dag.disl.DiSLFatalException;
 import ch.usi.dag.disl.InvalidContextUsageException;
-import ch.usi.dag.disl.processor.generator.PIResolver;
-import ch.usi.dag.disl.processor.generator.ProcInstance;
-import ch.usi.dag.disl.processor.generator.ProcMethodInstance;
+import ch.usi.dag.disl.PIResolver;
+import ch.usi.dag.disl.ProcInstance;
+import ch.usi.dag.disl.ProcMethodInstance;
 import ch.usi.dag.disl.processorcontext.ArgumentContext;
 import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
 import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;

src-test/ch/usi/dag/disl/test/suite/after/instr/DiSLClass.java

@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.after.instr;
 
 import ch.usi.dag.disl.annotation.After;
 import ch.usi.dag.disl.annotation.AfterThrowing;
-import ch.usi.dag.disl.marker.BodyMarker;
+import ch.usi.dag.disl.BodyMarker;
 
 public class DiSLClass {
 

src-test/ch/usi/dag/disl/test/suite/after2/instr/DiSLClass.java

@@ -5,7 +5,7 @@ import java.util.Stack;
 import ch.usi.dag.disl.annotation.After;
 import ch.usi.dag.disl.annotation.Before;
 import ch.usi.dag.disl.annotation.ThreadLocal;
-import ch.usi.dag.disl.marker.BodyMarker;
+import ch.usi.dag.disl.BodyMarker;
 import ch.usi.dag.disl.RandomMethodUid;
 import ch.usi.dag.disl.test.suite.after2.instr.runtime.Analysis;
 

src-test/ch/usi/dag/disl/test/suite/after3/instr/DiSLClass.java

@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.after3.instr;
 
 import ch.usi.dag.disl.annotation.AfterReturning;
 import ch.usi.dag.disl.annotation.AfterThrowing;
-import ch.usi.dag.disl.marker.BodyMarker;
+import ch.usi.dag.disl.BodyMarker;
 import ch.usi.dag.disl.MethodStaticContext;
 
 public class DiSLClass {

src-test/ch/usi/dag/disl/test/suite/afterinit1/app/TargetClass.java

 package ch.usi.dag.disl.test.suite.afterinit1.app;
 
-import ch.usi.dag.disl.marker.AfterInitBodyMarker;
+import ch.usi.dag.disl.AfterInitBodyMarker;
 
 
 /**

src-test/ch/usi/dag/disl/test/suite/afterinit1/instr/DiSLClass.java

@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.afterinit1.instr;
 
 import ch.usi.dag.disl.annotation.After;
 import ch.usi.dag.disl.annotation.Before;
-import ch.usi.dag.disl.marker.AfterInitBodyMarker;
+import ch.usi.dag.disl.AfterInitBodyMarker;
 
 
 public class DiSLClass {

src-test/ch/usi/dag/disl/test/suite/afterinit2/app/TargetClass.java

@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.afterinit2.app;
 
 import ch.usi.dag.disl.annotation.After;
 import ch.usi.dag.disl.annotation.Before;
-import ch.usi.dag.disl.marker.AfterInitBodyMarker;
+import ch.usi.dag.disl.AfterInitBodyMarker;
 
 
 /**

src-test/ch/usi/dag/disl/test/suite/afterinit2/instr/DiSLClass.java

@@ -2,7 +2,7 @@ package ch.usi.dag.disl.test.suite.afterinit2.instr;
 
 import ch.usi.dag.disl.annotation.After;
 import ch.usi.dag.disl.annotation.Before;
-import ch.usi.dag.disl.marker.AfterInitBodyMarker;
+import ch.usi.dag.disl.AfterInitBodyMarker;
 import ch.usi.dag.disl.ClassStaticContext;
 import ch.usi.dag.disl.MethodStaticContext;
 

src-test/ch/usi/dag/disl/test/suite/args/instr/DiSLClass.java

 package ch.usi.dag.disl.test.suite.args.instr;
 
 import ch.usi.dag.disl.annotation.AfterReturning;
-import ch.usi.dag.disl.marker.BodyMarker;
+import ch.usi.dag.disl.BodyMarker;
 import ch.usi.dag.disl.processorcontext.ArgumentProcessorContext;
 import ch.usi.dag.disl.processorcontext.ArgumentProcessorMode;
 import ch.usi.dag.disl.MethodStaticContext;