Migrate to the new visitor (Part1)

src/main/java/gr/uom/java/xmi/UMLModelASTReader.java

@@ -16,6 +16,7 @@
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeNode;
 
+import com.github.gumtreediff.gen.jdt.AbstractJdtVisitor;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jdt.core.ToolFactory;
 import org.eclipse.jdt.core.compiler.IProblem;
@@ -62,17 +63,17 @@
 import org.eclipse.jdt.core.dom.VariableDeclarationFragment;
 import org.eclipse.jdt.core.dom.VariableDeclarationStatement;
 
-import com.github.gumtreediff.gen.jdt.JdtVisitor;
 import com.github.gumtreediff.tree.TreeContext;
 
 import gr.uom.java.xmi.LocationInfo.CodeElementType;
 import gr.uom.java.xmi.decomposition.AbstractExpression;
 import gr.uom.java.xmi.decomposition.OperationBody;
 import gr.uom.java.xmi.decomposition.VariableDeclaration;
+import org.refactoringminer.astDiff.visitors.JdtVisitor;
 import org.refactoringminer.astDiff.visitors.JdtWithCommentsVisitor;
 
 public class UMLModelASTReader {
-	private static final boolean VISIT_JDT_COMMENTS = Boolean.parseBoolean(System.getProperty("rm.jdt.comments", "true"));
+	private boolean VISIT_JDT_COMMENTS = Boolean.parseBoolean(System.getProperty("rm.jdt.comments", "true"));
 	private static final String FREE_MARKER_GENERATED = "generated using freemarker";
 	private static final String FREE_MARKER_GENERATED_2 = "generated using FreeMarker";
 	private static final String ANTLR_GENERATED = "// $ANTLR";
@@ -137,7 +138,10 @@ private void processJavaFileContents(Map<String, String> javaFileContents, boole
 				if(astDiff) {
 					IScanner scanner = ToolFactory.createScanner(true, false, false, false);
 					scanner.setSource(charArray);
-					JdtVisitor visitor = (VISIT_JDT_COMMENTS) ? new JdtWithCommentsVisitor(scanner) : new JdtVisitor(scanner);
+					AbstractJdtVisitor visitor = (VISIT_JDT_COMMENTS) ?
+							new JdtWithCommentsVisitor(scanner) :
+							new com.github.gumtreediff.gen.jdt.JdtVisitor(scanner);
+//					JdtVisitor visitor = new JdtWithCommentsVisitor(scanner);
 					compilationUnit.accept(visitor);
 					TreeContext treeContext = visitor.getTreeContext();
 					this.umlModel.getTreeContextMap().put(filePath, treeContext);

src/main/java/org/refactoringminer/astDiff/matchers/statement/GeneralMatcher.java

@@ -22,6 +22,7 @@ public GeneralMatcher(AbstractCodeFragment st1, AbstractCodeFragment st2) {
     }
     @Override
     public void match(Tree src, Tree dst, ExtendedMultiMappingStore mappingStore) {
+        if (src == null || dst == null) return;
         if ((st1 instanceof CompositeStatementObject) &&  (st2 instanceof CompositeStatementObject)) {
             new CompositeMatcher((CompositeStatementObject) st1, (CompositeStatementObject) st2)
                     .match(src, dst, mappingStore);

src/main/java/org/refactoringminer/astDiff/matchers/wrappers/ASTDiffMappingOptimizer.java

@@ -67,6 +67,12 @@ private static void processOptimization(ASTDiff input, OptimizationData optimiza
             }
             else {
                 //Inter-file optimizations
+                TreeContext tc1 = parentContextMap.get(lastStepMapping.getFragment1().getLocationInfo().getFilePath());
+                Tree t1 = TreeUtilFunctions.findByLocationInfo(tc1.getRoot(), lastStepMapping.getFragment1().getLocationInfo());
+                TreeContext tc2 = childContextMap.get(lastStepMapping.getFragment2().getLocationInfo().getFilePath());
+                Tree t2 = TreeUtilFunctions.findByLocationInfo(tc2.getRoot(), lastStepMapping.getFragment2().getLocationInfo());
+                if (t1 == null || t2 == null) continue;
+                new LeafMatcher().match(t1, t2, input.getAllMappings());
             }
         }
         ExtendedMultiMappingStore allMappings = input.getAllMappings();

src/main/java/org/refactoringminer/astDiff/matchers/wrappers/FieldDeclarationMatcher.java

@@ -5,6 +5,7 @@
 import gr.uom.java.xmi.UMLEnumConstant;
 import gr.uom.java.xmi.diff.UMLCommentListDiff;
 import gr.uom.java.xmi.diff.UMLJavadocDiff;
+import org.apache.commons.lang3.tuple.Pair;
 import org.refactoringminer.astDiff.models.OptimizationData;
 import org.refactoringminer.astDiff.utils.Constants;
 import org.refactoringminer.astDiff.models.ExtendedMultiMappingStore;
@@ -113,9 +114,16 @@ private void matchFieldAllModifiers(Tree srcFieldDeclaration, Tree dstFieldDecla
     }
 
     private void matchFieldAnnotations(Tree srcFieldDeclaration, Tree dstFieldDeclaration, ExtendedMultiMappingStore mappingStore) {
-        Tree srcField = TreeUtilFunctions.findFirstByType(srcFieldDeclaration, Constants.MARKER_ANNOTATION);
-        Tree dstField = TreeUtilFunctions.findFirstByType(dstFieldDeclaration, Constants.MARKER_ANNOTATION);
-        new LeafMatcher().match(srcField, dstField, mappingStore);
+        //TODO: add test for all the annotations
+        Pair<Tree, Tree> srcAndDst = TreeUtilFunctions.populateLeftAndRightBasedOnTheFirstChildOfType(
+                srcFieldDeclaration, dstFieldDeclaration,
+                new String[]{
+                        Constants.MARKER_ANNOTATION,
+                        Constants.SINGLE_MEMBER_ANNOTATION,
+                        Constants.NORMAL_ANNOTATION,
+                }
+        );
+        new LeafMatcher().match(srcAndDst.getLeft(), srcAndDst.getRight(), mappingStore);
     }
 
     private void matchModifiersForField(Tree srcFieldDeclaration, Tree dstFieldDeclaration, String srcModifier, String dstModifier, ExtendedMultiMappingStore mappingStore) {

src/main/java/org/refactoringminer/astDiff/matchers/wrappers/RefactoringMatcher.java

@@ -250,10 +250,11 @@ private void processRefactorings(Tree srcTree, Tree dstTree, List<Refactoring> r
                         eligible = !renameVariableRefactoring.isInsideExtractedOrInlinedMethod();
                         if (!eligible)
                             break;
-                        while (!TreeUtilFunctions.isStatement(dstInput.getType().name)) {
+                        while (dstInput != null && !TreeUtilFunctions.isStatement(dstInput.getType().name) ) {
                             if (dstInput.getType() == null) break;
                             dstInput = dstInput.getParent();
                         }
+                        if (dstInput == null) return;
                         if (TreeUtilFunctions.isStatement(dstInput.getType().name)){
                             new LeafMatcher().match(srcInput,dstInput,mappingStore);
                         }
@@ -391,7 +392,7 @@ private List<Refactoring> getClassDiffRefactorings(UMLClassBaseDiff classDiff) {
             ImmutablePair<String, String> refactoringClassBefore = involvedClassesBeforeRefactoring.iterator().next();
             ImmutablePair<String, String> refactoringClassAfter = involvedClassesAfterRefactoring.iterator().next();
             if (umlClassBefore.getLocationInfo().getFilePath().equals(refactoringClassBefore.getLeft())
-                    && umlClassAfter.getLocationInfo().getFilePath().equals(refactoringClassAfter.getLeft())) {
+                    || umlClassAfter.getLocationInfo().getFilePath().equals(refactoringClassAfter.getLeft())) {
                 String refactoringClassNameBefore = refactoringClassBefore.getRight();
                 String refactoringClassNameAfter = refactoringClassAfter.getRight();
                 // Relied on || in order to ascertain at least one class involves (handling move to anonymous and vice versa)

src/main/java/org/refactoringminer/astDiff/utils/Constants.java

@@ -74,8 +74,9 @@ public class Constants {
 	public static final String NUMBER_LITERAL = "NumberLiteral";
 	public static final String BOOLEAN_LITERAL = "BooleanLiteral";
 
-	public static final String SINGLE_MEMBER_ANNOTATION = "SingleMemberAnnotation";
-	public static final String MARKER_ANNOTATION = "MarkerAnnotation";
+	public static final String SINGLE_MEMBER_ANNOTATION = "SingleMemberAnnotation"; //@type(Expression), for instance
+	public static final String MARKER_ANNOTATION = "MarkerAnnotation"; //@Deprecated for instance
+	public static final String NORMAL_ANNOTATION = "NormalAnnotation"; //@Author("John Doe", "") for instance
 
 	public static final String COMPILATION_UNIT = "CompilationUnit";
 

src/main/java/org/refactoringminer/astDiff/utils/TreeUtilFunctions.java

@@ -28,7 +28,8 @@ public class TreeUtilFunctions {
 
 	public static Tree findByLocationInfo(Tree tree, LocationInfo locationInfo){
 		int start_offset = locationInfo.getStartOffset();
-		if (tree.getPos() > start_offset)  return (tree.getParent() != null) ? findByLocationInfo(tree.getParent(),locationInfo) : null;
+		int end_offset = locationInfo.getEndOffset();
+		if (tree.getPos() > start_offset || tree.getEndPos() < end_offset)  return (tree.getParent() != null) ? findByLocationInfo(tree.getParent(),locationInfo) : null;
 		return findByLocationInfoNoLookAhead(tree, locationInfo);
 	}
 
@@ -152,6 +153,23 @@ public static Tree deepCopyWithMap(Tree tree,Map<Tree,Tree> cpyMap) {
 		return copy;
 	}
 
+	public static org.apache.commons.lang3.tuple.Pair<Tree, Tree> populateLeftAndRightBasedOnTheFirstChildOfType(Tree srcTree, Tree dstTree, String[] types)
+	{
+		Tree srcRes = null;
+		Tree dstRes = null;
+		for (String type : types) {
+			srcRes = TreeUtilFunctions.findFirstByType(srcTree, type);
+			dstRes = TreeUtilFunctions.findFirstByType(dstTree, type);
+			if (srcRes != null && dstRes != null)
+				break;
+			else {
+				//In case, only one of them is null. We want to avoid this scenario (unless we get more examples)
+				srcRes = null;
+				dstRes = null;
+			}
+		}
+		return org.apache.commons.lang3.tuple.Pair.of(srcRes,dstRes);
+	}
 	public static FakeTree getFakeTreeInstance()
 	{
 		if (_instance == null)