Support the detection of moved enum constants

pmd/pmd@96bc9ef

Author: tsantalis

src/main/java/gr/uom/java/xmi/UMLAttribute.java

@@ -462,7 +462,19 @@ public String toQualifiedString() {
 		sb.append(" ");
 		sb.append(name);
 		sb.append(" : ");
-		sb.append(type.toQualifiedString());
+		if(this instanceof UMLEnumConstant) {
+			String string = type.toString();
+			if(string.contains(".")) {
+				String suffix = string.substring(string.lastIndexOf(".")+1, string.length());
+				sb.append(suffix);
+			}
+			else {
+				sb.append(type);
+			}
+		}
+		else {
+			sb.append(type.toQualifiedString());
+		}
 		return sb.toString();
 	}
 

src/main/java/gr/uom/java/xmi/diff/UMLAttributeDiff.java

@@ -14,6 +14,7 @@
 
 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.UMLParameter;
 import gr.uom.java.xmi.VariableDeclarationContainer;
@@ -373,6 +374,9 @@ public boolean encapsulated() {
 	}
 
 	private boolean changeTypeCondition() {
+		if(removedAttribute instanceof UMLEnumConstant && addedAttribute instanceof UMLEnumConstant) {
+			return false;
+		}
 		return (isTypeChanged() || isQualifiedTypeChanged()) && !enumConstantsDeclaredInTheSameEnumDeclarationType();
 	}
 

src/main/java/gr/uom/java/xmi/diff/UMLModelDiff.java

@@ -1617,7 +1617,7 @@ private MoveAttributeRefactoring processPairOfAttributes(UMLAttribute addedAttri
 			return null;
 		}
 		if(addedAttribute.getName().equals(removedAttribute.getName()) &&
-				addedAttribute.getType().equals(removedAttribute.getType())) {
+				(addedAttribute.getType().equals(removedAttribute.getType()) || (removedAttribute instanceof UMLEnumConstant && addedAttribute instanceof UMLEnumConstant))) {
 			if(isSubclassOf(removedAttribute.getClassName(), addedAttribute.getClassName())) {
 				UMLAttributeDiff attributeDiff = new UMLAttributeDiff(removedAttribute, addedAttribute, Collections.emptyList()); 
 				if(!movedAttributeDiffList.contains(attributeDiff)) {
@@ -1944,12 +1944,15 @@ public List<UMLAttribute> getAddedAttributesInCommonClasses() {
 		List<UMLAttribute> addedAttributes = new ArrayList<UMLAttribute>();
 		for(UMLClassDiff classDiff : commonClassDiffList) {
 			addedAttributes.addAll(classDiff.getAddedAttributes());
+			addedAttributes.addAll(classDiff.getAddedEnumConstants());
 		}
 		for(UMLClassMoveDiff classDiff : classMoveDiffList) {
 			addedAttributes.addAll(classDiff.getAddedAttributes());
+			addedAttributes.addAll(classDiff.getAddedEnumConstants());
 		}
 		for(UMLClassRenameDiff classDiff : classRenameDiffList) {
 			addedAttributes.addAll(classDiff.getAddedAttributes());
+			addedAttributes.addAll(classDiff.getAddedEnumConstants());
 		}
 		return addedAttributes;
 	}
@@ -1958,12 +1961,15 @@ public List<UMLAttribute> getRemovedAttributesInCommonClasses() {
 		List<UMLAttribute> removedAttributes = new ArrayList<UMLAttribute>();
 		for(UMLClassDiff classDiff : commonClassDiffList) {
 			removedAttributes.addAll(classDiff.getRemovedAttributes());
+			removedAttributes.addAll(classDiff.getRemovedEnumConstants());
 		}
 		for(UMLClassMoveDiff classDiff : classMoveDiffList) {
 			removedAttributes.addAll(classDiff.getRemovedAttributes());
+			removedAttributes.addAll(classDiff.getRemovedEnumConstants());
 		}
 		for(UMLClassRenameDiff classDiff : classRenameDiffList) {
 			removedAttributes.addAll(classDiff.getRemovedAttributes());
+			removedAttributes.addAll(classDiff.getRemovedEnumConstants());
 		}
 		return removedAttributes;
 	}