moved annotated methods

Author: francastagna

…java/instrumentation/AnnotatedLabel.java …rumentation/dynamosa/AnnotatedLabel.javaclient-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/AnnotatedLabel.java renamed to client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/AnnotatedLabel.java client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/AnnotatedLabel.java renamed to client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/AnnotatedLabel.java

@@ -1,33 +1,14 @@
 /*
- * Copyright (C) 2010-2018 Gordon Fraser, Andrea Arcuri and EvoSuite
- * contributors
- *
- * This file is part of EvoSuite.
- *
- * EvoSuite is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation, either version 3.0 of the License, or
- * (at your option) any later version.
- *
- * EvoSuite is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with EvoSuite. If not, see <http://www.gnu.org/licenses/>.
+ * Adapted from the EvoSuite project (https://github.com/EvoSuite/evosuite)
+ * and modified for use in EvoMaster's Dynamosa module.
  */
-
-package org.evomaster.client.java.instrumentation;
+package org.evomaster.client.java.instrumentation.dynamosa;
 
 import org.objectweb.asm.Label;
 import org.objectweb.asm.tree.LabelNode;
 
 /**
  * Annotated labels are used to identify instrumented code
- * such that EvoSuite knows how to deal with
- *
- * @author fraser
  */
 public class AnnotatedLabel extends Label {
 

…instrumentation/AnnotatedMethodNode.java …tation/dynamosa/AnnotatedMethodNode.javaclient-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/AnnotatedMethodNode.java renamed to client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/AnnotatedMethodNode.java client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/AnnotatedMethodNode.java renamed to client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/AnnotatedMethodNode.java

@@ -1,34 +1,16 @@
 /*
- * Copyright (C) 2010-2018 Gordon Fraser, Andrea Arcuri and EvoSuite
- * contributors
- *
- * This file is part of EvoSuite.
- *
- * EvoSuite is free software: you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation, either version 3.0 of the License, or
- * (at your option) any later version.
- *
- * EvoSuite is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with EvoSuite. If not, see <http://www.gnu.org/licenses/>.
+ * Adapted from the EvoSuite project (https://github.com/EvoSuite/evosuite)
+ * and modified for use in EvoMaster's Dynamosa module.
  */
-
-package org.evomaster.client.java.instrumentation;
+package org.evomaster.client.java.instrumentation.dynamosa;
 
 import org.objectweb.asm.Label;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.LabelNode;
 import org.objectweb.asm.tree.MethodNode;
 
 /**
- * <p>AnnotatedMethodNode class.</p>
- *
- * @author fraser
+ * AnnotatedMethodNode wraps ASM's MethodNode to support Dynamosa-specific metadata.
  */
 public class AnnotatedMethodNode extends MethodNode {
 

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/graphs/cfg/BytecodeInstructionPool.java

@@ -4,8 +4,8 @@
  */
 package org.evomaster.client.java.instrumentation.dynamosa.graphs.cfg;
 
+import org.evomaster.client.java.instrumentation.dynamosa.AnnotatedLabel;
 import org.evomaster.client.java.instrumentation.dynamosa.graphs.cfg.branch.BranchPool;
-import org.evomaster.client.java.instrumentation.AnnotatedLabel;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.*;
 import org.evomaster.client.java.utils.SimpleLogger;

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/visitor/CFGMethodVisitor.java

@@ -4,9 +4,8 @@
  */
 package org.evomaster.client.java.instrumentation.dynamosa.visitor;
 
+import org.evomaster.client.java.instrumentation.dynamosa.AnnotatedMethodNode;
 import org.evomaster.client.java.instrumentation.dynamosa.graphs.cfg.CFGGenerator;
-
-import org.evomaster.client.java.instrumentation.AnnotatedMethodNode;
 import org.objectweb.asm.*;
 import org.objectweb.asm.tree.MethodNode;
 import org.objectweb.asm.tree.analysis.Analyzer;