Adapt trackers to RMiner API changes

jodavimehran · Dec 26, 2024 · 635a67e · 635a67e
1 parent 9f39879
commit 635a67e
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 10 deletions.
diff --git a/src/main/java/org/codetracker/AnnotationTrackerChangeHistory.java b/src/main/java/org/codetracker/AnnotationTrackerChangeHistory.java
@@ -22,7 +22,6 @@
 import gr.uom.java.xmi.UMLAnnotation;
 import gr.uom.java.xmi.UMLAttribute;
 import gr.uom.java.xmi.UMLEnumConstant;
-import gr.uom.java.xmi.UMLOperation;
 import gr.uom.java.xmi.VariableDeclarationContainer;
 import gr.uom.java.xmi.decomposition.UMLOperationBodyMapper;
 import gr.uom.java.xmi.diff.AddAttributeAnnotationRefactoring;
@@ -485,8 +484,8 @@ private boolean isAdded(Pair<VariableDeclarationContainer, VariableDeclarationCo
 
     public boolean checkRefactoredMethod(Version currentVersion, Version parentVersion, Predicate<Method> equalMethod, Annotation rightAnnotation, List<Refactoring> refactorings) {
         for (Refactoring refactoring : refactorings) {
-            UMLOperation operationBefore = null;
-            UMLOperation operationAfter = null;
+        	VariableDeclarationContainer operationBefore = null;
+            VariableDeclarationContainer operationAfter = null;
             UMLOperationBodyMapper umlOperationBodyMapper = null;
             switch (refactoring.getRefactoringType()) {
                 case PULL_UP_OPERATION: {

diff --git a/src/main/java/org/codetracker/BlockTrackerChangeHistory.java b/src/main/java/org/codetracker/BlockTrackerChangeHistory.java
@@ -1311,8 +1311,8 @@ private boolean isAdded(UMLOperationBodyMapper umlOperationBodyMapper, Version c
 
     public boolean checkRefactoredMethod(Version currentVersion, Version parentVersion, Predicate<Method> equalMethod, Block rightBlock, List<Refactoring> refactorings) {
         for (Refactoring refactoring : refactorings) {
-            UMLOperation operationBefore = null;
-            UMLOperation operationAfter = null;
+        	VariableDeclarationContainer operationBefore = null;
+        	VariableDeclarationContainer operationAfter = null;
             UMLOperationBodyMapper umlOperationBodyMapper = null;
             switch (refactoring.getRefactoringType()) {
                 case PULL_UP_OPERATION: {

diff --git a/src/main/java/org/codetracker/CommentTrackerChangeHistory.java b/src/main/java/org/codetracker/CommentTrackerChangeHistory.java
@@ -32,7 +32,6 @@
 import com.github.difflib.patch.InsertDelta;
 import com.github.difflib.patch.Patch;
 
-import gr.uom.java.xmi.UMLOperation;
 import gr.uom.java.xmi.VariableDeclarationContainer;
 import gr.uom.java.xmi.LocationInfo.CodeElementType;
 import gr.uom.java.xmi.UMLAnonymousClass;
@@ -806,8 +805,8 @@ private boolean isAdded(UMLAbstractClassDiff classDiff, Version currentVersion,
 
     public boolean checkRefactoredMethod(Version currentVersion, Version parentVersion, Predicate<Method> equalMethod, Comment rightComment, List<Refactoring> refactorings) {
         for (Refactoring refactoring : refactorings) {
-            UMLOperation operationBefore = null;
-            UMLOperation operationAfter = null;
+            VariableDeclarationContainer operationBefore = null;
+            VariableDeclarationContainer operationAfter = null;
             UMLOperationBodyMapper umlOperationBodyMapper = null;
             switch (refactoring.getRefactoringType()) {
                 case PULL_UP_OPERATION: {

diff --git a/src/main/java/org/codetracker/VariableTrackerChangeHistory.java b/src/main/java/org/codetracker/VariableTrackerChangeHistory.java
@@ -512,7 +512,7 @@ private Set<Variable> analyseVariableRefactorings(Collection<Refactoring> refact
 
     public boolean checkRefactoredMethod(Version currentVersion, Version parentVersion, Predicate<Method> equalMethod, Variable rightVariable, List<Refactoring> refactorings) {
         for (Refactoring refactoring : refactorings) {
-            UMLOperation operationAfter = null;
+            VariableDeclarationContainer operationAfter = null;
             UMLOperationBodyMapper umlOperationBodyMapper = null;
             switch (refactoring.getRefactoringType()) {
                 case PULL_UP_OPERATION: {

diff --git a/src/test/resources/blame/blameTestWithLocalRepo21.txt b/src/test/resources/blame/blameTestWithLocalRepo21.txt
@@ -1305,7 +1305,7 @@ e0a5913f8 pmd/src/net/sourceforge/pmd/lang/java/typeresolution/ClassTypeResolver
 6215d97b9 pmd/src/net/sourceforge/pmd/typeresolution/ClassTypeResolver.java                          (Allan Caplan              2006-10-26 02:35:38 +0000 1305)             }
 6215d97b9 pmd/src/net/sourceforge/pmd/typeresolution/ClassTypeResolver.java                          (Allan Caplan              2006-10-26 02:35:38 +0000 1306)             if (qualifiedName != null) {
 6215d97b9 pmd/src/net/sourceforge/pmd/typeresolution/ClassTypeResolver.java                          (Allan Caplan              2006-10-26 02:35:38 +0000 1307)                 try {
-6215d97b9 pmd/src/net/sourceforge/pmd/typeresolution/ClassTypeResolver.java                          (Allan Caplan              2006-10-26 02:35:38 +0000 1308)                     /*
+881218544 pmd/src/net/sourceforge/pmd/typeresolution/ClassTypeResolver.java                          (Allan Caplan              2007-02-03 12:48:12 +0000 1308)                     /*
 881218544 pmd/src/net/sourceforge/pmd/typeresolution/ClassTypeResolver.java                          (Allan Caplan              2007-02-03 12:48:12 +0000 1309)                      * TODO - the map right now contains just class names. if we
 881218544 pmd/src/net/sourceforge/pmd/typeresolution/ClassTypeResolver.java                          (Allan Caplan              2007-02-03 12:48:12 +0000 1310)                      * use a map of classname/class then we don't have to hit
 881218544 pmd/src/net/sourceforge/pmd/typeresolution/ClassTypeResolver.java                          (Allan Caplan              2007-02-03 12:48:12 +0000 1311)                      * the class loader for every type - much faster