Improved matching of re-formatted group-comments (#976)

JabRef/jabref-koppor#716
jabgui/src/main/java/org/jabref/gui/groups/GroupNodeViewModel.java
jabgui/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java

Author: tsantalis

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

@@ -65,13 +65,19 @@ else if(other.group.size() < this.group.size() && other.group.size() > 1) {
 		return false;
 	}
 
-	public boolean modifiedMatchingText(UMLCommentGroup other) {
+	public UMLCommentListDiff modifiedMatchingText(UMLCommentGroup other) {
 		if(this.group.size() == other.group.size() && this.group.size() > 1) {
 			UMLCommentListDiff diff = new UMLCommentListDiff(this, other);
 			if(diff.getCommonComments().size() == this.group.size()) {
-				return true;
+				return diff;
 			}
 		}
-		return false;
+		else if(this.group.size() != other.group.size() && this.group.size() > 1) {
+			UMLCommentListDiff diff = new UMLCommentListDiff(this, other);
+			if(diff.isManyToManyReformat()) {
+				return diff;
+			}
+		}
+		return null;
 	}
 }

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

@@ -102,18 +102,18 @@ private void init(List<UMLComment> commentsBefore, List<UMLComment> commentsAfte
 		groupsAfter.removeAll(groupsAfterToBeRemoved);
 		for(UMLCommentGroup groupBefore : groupsBefore) {
 			for(UMLCommentGroup groupAfter : groupsAfter) {
-				if(groupBefore.modifiedMatchingText(groupAfter) && !groupsAfterToBeRemoved.contains(groupAfter)) {
-					for(int i=0; i<groupBefore.getGroup().size(); i++) {
-						UMLComment commentBefore = groupBefore.getGroup().get(i);
-						UMLComment commentAfter = groupAfter.getGroup().get(i);
-						Pair<UMLComment, UMLComment> pair = Pair.of(commentBefore, commentAfter);
-						commonComments.add(pair);
-						deletedComments.remove(commentBefore);
-						addedComments.remove(commentAfter);
+				if(!groupsAfterToBeRemoved.contains(groupAfter)) {
+					UMLCommentListDiff diff = groupBefore.modifiedMatchingText(groupAfter);
+					if(diff != null) {
+						for(Pair<UMLComment, UMLComment> pair : diff.getCommonComments()) {
+							commonComments.add(pair);
+							deletedComments.remove(pair.getLeft());
+							addedComments.remove(pair.getRight());
+						}
+						groupsBeforeToBeRemoved.add(groupBefore);
+						groupsAfterToBeRemoved.add(groupAfter);
+						break;
 					}
-					groupsBeforeToBeRemoved.add(groupBefore);
-					groupsAfterToBeRemoved.add(groupAfter);
-					break;
 				}
 			}
 		}