Add block multi-mappings

jodavimehran · May 5, 2024 · 3fe07a9 · 3fe07a9
1 parent c5b8c3e
commit 3fe07a9
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/main/java/org/codetracker/BlockTrackerChangeHistory.java b/src/main/java/org/codetracker/BlockTrackerChangeHistory.java
@@ -118,7 +118,8 @@ public boolean checkClassDiffForBlockChange(ArrayDeque<Block> blocks, Version cu
     }
 
     public boolean checkForExtractionOrInline(ArrayDeque<Block> blocks, Version currentVersion, Version parentVersion, Predicate<Method> equalMethod, Block rightBlock, List<Refactoring> refactorings) throws RefactoringMinerTimedOutException {
-        for (Refactoring refactoring : refactorings) {
+        int extractMatches = 0;
+    	for (Refactoring refactoring : refactorings) {
             switch (refactoring.getRefactoringType()) {
                 case EXTRACT_AND_MOVE_OPERATION:
                 case EXTRACT_OPERATION: {
@@ -161,7 +162,7 @@ public boolean checkForExtractionOrInline(ArrayDeque<Block> blocks, Version curr
                             blocks.add(leftBlock);
                         }
                         blockChangeHistory.connectRelatedNodes();
-                        return true;
+                        extractMatches++;
                     }
                     break;
                 }
@@ -252,6 +253,9 @@ public boolean checkForExtractionOrInline(ArrayDeque<Block> blocks, Version curr
                 }
             }
         }
+    	if(extractMatches > 0) {
+    		return true;
+    	}
         return false;
     }
 
@@ -443,7 +447,8 @@ private Set<Block> analyseBlockRefactorings(Collection<Refactoring> refactorings
     }
 
     public boolean isMatched(UMLOperationBodyMapper umlOperationBodyMapper, Queue<Block> blocks, Version currentVersion, Version parentVersion, Predicate<Block> equalOperator) {
-        for (AbstractCodeMapping mapping : umlOperationBodyMapper.getMappings()) {
+    	int matches = 0;
+    	for (AbstractCodeMapping mapping : umlOperationBodyMapper.getMappings()) {
             if (mapping instanceof CompositeStatementObjectMapping) {
                 Block blockAfter = Block.of((CompositeStatementObject) mapping.getFragment2(), umlOperationBodyMapper.getContainer2(), currentVersion);
                 if (equalOperator.test(blockAfter)) {
@@ -541,7 +546,7 @@ else if (tryBefore.getFinallyClause() != null && tryAfter.getFinallyClause() ==
                     }
                     blocks.add(blockBefore);
                     blockChangeHistory.connectRelatedNodes();
-                    return true;
+                    matches++;
                 }
             }
             else if (mapping instanceof LeafMapping && mapping.getFragment2() instanceof StatementObject) {
@@ -556,10 +561,13 @@ else if (mapping instanceof LeafMapping && mapping.getFragment2() instanceof Sta
                     }
                     blocks.add(blockBefore);
                     blockChangeHistory.connectRelatedNodes();
-                    return true;
+                    matches++;
                 }
             }
         }
+    	if(matches > 0) {
+    		return true;
+    	}
         return false;
     }