Fix for issue

tsantalis#765 (comment)
pouryafard75 · Aug 30, 2024 · 8e982de · 8e982de
1 parent 67589bc
commit 8e982de
Showing 1 changed file with 17 additions and 1 deletion.
diff --git a/src/main/java/gr/uom/java/xmi/diff/UMLAbstractClassDiff.java b/src/main/java/gr/uom/java/xmi/diff/UMLAbstractClassDiff.java
@@ -730,6 +730,7 @@ public Set<CandidateSplitVariableRefactoring> getCandidateAttributeSplits() {
 	}
 
 	public List<Refactoring> getRefactorings() throws RefactoringMinerTimedOutException {
+		List<Refactoring> originalRefactorings = new ArrayList<Refactoring>(this.refactorings);
 		List<Refactoring> refactorings = new ArrayList<Refactoring>(this.refactorings);
 		if(!originalClass.getTypeDeclarationKind().equals(nextClass.getTypeDeclarationKind())) {
 			boolean anonymousToClass = originalClass.getTypeDeclarationKind().endsWith("class") && nextClass.getTypeDeclarationKind().endsWith("class");
@@ -815,7 +816,7 @@ public List<Refactoring> getRefactorings() throws RefactoringMinerTimedOutExcept
 						if((!originalClass.containsAttributeWithName(pattern.getAfter()) || cyclicRename(renameMap, pattern)) &&
 								(!nextClass.containsAttributeWithName(pattern.getBefore()) || cyclicRename(renameMap, pattern)) &&
 								!inconsistentAttributeRename(pattern, aliasedAttributesInOriginalClass, aliasedAttributesInNextClass) &&
-								!attributeMerged(a1, a2, refactorings) && !attributeSplit(a1, a2, refactorings)) {
+								!attributeMerged(a1, a2, refactorings) && !attributeSplit(a1, a2, refactorings) && !attributeWithConflictingRename(a1, a2, originalRefactorings)) {
 							if(a1 instanceof UMLEnumConstant && a2 instanceof UMLEnumConstant) {
 								UMLEnumConstantDiff enumConstantDiff = new UMLEnumConstantDiff((UMLEnumConstant)a1, (UMLEnumConstant)a2, this, modelDiff);
 								if(!enumConstantDiffList.contains(enumConstantDiff)) {
@@ -1237,6 +1238,21 @@ else if(refactoring instanceof SplitVariableRefactoring) {
 		return newRefactorings;
 	}
 
+	private boolean attributeWithConflictingRename(UMLAttribute a1, UMLAttribute a2, List<Refactoring> refactorings) {
+		for(Refactoring refactoring : refactorings) {
+			if(refactoring instanceof RenameAttributeRefactoring) {
+				RenameAttributeRefactoring rename = (RenameAttributeRefactoring)refactoring;
+				if(rename.getOriginalAttribute().equals(a1) && !rename.getRenamedAttribute().equals(a2)) {
+					return true;
+				}
+				else if(!rename.getOriginalAttribute().equals(a1) && rename.getRenamedAttribute().equals(a2)) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
 	private boolean attributeMerged(UMLAttribute a1, UMLAttribute a2, List<Refactoring> refactorings) {
 		for(Refactoring refactoring : refactorings) {
 			if(refactoring instanceof MergeAttributeRefactoring) {