More updated files

jodavimehran · Nov 27, 2024 · 61c88b3 · 61c88b3
1 parent 6b08fa5
commit 61c88b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/main/java/org/codetracker/BlockTrackerImpl.java b/src/main/java/org/codetracker/BlockTrackerImpl.java
@@ -80,6 +80,7 @@ public History<Block> track() throws Exception {
                         continue;
                     }
                     String rightMethodClassName = rightMethod.getUmlOperation().getClassName();
+                    String rightMethodSourceFolder = rightMethod.getUmlOperation().getLocationInfo().getSourceFolder();
                     Block rightBlock = rightMethod.findBlock(currentBlock::equalIdentifierIgnoringVersion);
                     if (rightBlock == null) {
                         continue;
@@ -294,7 +295,7 @@ else if (leftOperation instanceof UMLInitializer && rightOperation instanceof UM
                             }
 
 
-                            UMLAbstractClassDiff umlClassDiff = getUMLClassDiff(umlModelDiffAll, rightMethodClassName);
+                            UMLAbstractClassDiff umlClassDiff = getUMLClassDiff(umlModelDiffAll, rightMethodSourceFolder, rightMethodClassName);
                             if (umlClassDiff != null) {
                                 found = changeHistory.checkClassDiffForBlockChange(currentVersion, parentVersion, equalMethod, equalBlock, umlClassDiff);
 
@@ -374,6 +375,7 @@ public History.HistoryInfo<Block> blame() throws Exception {
                         continue;
                     }
                     String rightMethodClassName = rightMethod.getUmlOperation().getClassName();
+                    String rightMethodSourceFolder = rightMethod.getUmlOperation().getLocationInfo().getSourceFolder();
                     Block rightBlock = rightMethod.findBlock(currentBlock::equalIdentifierIgnoringVersion);
                     if (rightBlock == null) {
                         continue;
@@ -588,7 +590,7 @@ else if (leftOperation instanceof UMLInitializer && rightOperation instanceof UM
                             }
 
 
-                            UMLAbstractClassDiff umlClassDiff = getUMLClassDiff(umlModelDiffAll, rightMethodClassName);
+                            UMLAbstractClassDiff umlClassDiff = getUMLClassDiff(umlModelDiffAll, rightMethodSourceFolder, rightMethodClassName);
                             if (umlClassDiff != null) {
                                 found = changeHistory.checkClassDiffForBlockChange(currentVersion, parentVersion, equalMethod, equalBlock, umlClassDiff);
 

diff --git a/src/main/java/org/codetracker/BlockTrackerWithLocalFiles.java b/src/main/java/org/codetracker/BlockTrackerWithLocalFiles.java
@@ -110,6 +110,7 @@ public History<Block> track() throws Exception {
                     continue;
                 }
                 String rightMethodClassName = rightMethod.getUmlOperation().getClassName();
+                String rightMethodSourceFolder = rightMethod.getUmlOperation().getLocationInfo().getSourceFolder();
                 Block rightBlock = rightMethod.findBlock(currentBlock::equalIdentifierIgnoringVersion);
                 if (rightBlock == null) {
                     continue;
@@ -323,7 +324,7 @@ else if (leftOperation instanceof UMLInitializer && rightOperation instanceof UM
                         }
 
 
-                        UMLAbstractClassDiff umlClassDiff = getUMLClassDiff(umlModelDiffAll, rightMethodClassName);
+                        UMLAbstractClassDiff umlClassDiff = getUMLClassDiff(umlModelDiffAll, rightMethodSourceFolder, rightMethodClassName);
                         if (umlClassDiff != null) {
                             found = changeHistory.checkClassDiffForBlockChange(currentVersion, parentVersion, equalMethod, equalBlock, umlClassDiff);