Fixed missed refactoring in commit

javaparser/javaparser@b08e662 Move Class com.github.javaparser.printer.PrettyPrinterConfiguration.IndentType moved to com.github.javaparser.printer.configuration.Indentation.IndentType
tsantalis · Feb 13, 2024 · 151935f · 151935f
1 parent 493423a
commit 151935f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/main/java/gr/uom/java/xmi/diff/UMLModelDiff.java b/src/main/java/gr/uom/java/xmi/diff/UMLModelDiff.java
@@ -691,9 +691,10 @@ private boolean conflictingMoveOfTopLevelClass(UMLClass removedClass, UMLClass a
 						!diff.getMovedClass().getName().startsWith(addedClass.getPackageName() + ".")) ||
 						(!diff.getOriginalClass().getName().startsWith(removedClass.getPackageName() + ".") &&
 								diff.getMovedClass().getName().startsWith(addedClass.getPackageName() + "."))) {
-					return true;
+					if(!diff.getMovedClass().isInnerClass(addedClass))
+						return true;
 				}
-				if((diff.getOriginalClass().getName().equals(removedClass.getPackageName()) &&
+				else if((diff.getOriginalClass().getName().equals(removedClass.getPackageName()) &&
 						!diff.getMovedClass().getName().equals(addedClass.getPackageName())) ||
 						(!diff.getOriginalClass().getName().equals(removedClass.getPackageName()) &&
 								diff.getMovedClass().getName().equals(addedClass.getPackageName()))) {