Fix for failing tests. Improve comment mappings (#976)

JabRef/jabref-koppor#716
jabgui/src/main/java/org/jabref/gui/groups/GroupTreeViewModel.java
within method addSelectedEntries()

Author: tsantalis

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

@@ -74,7 +74,7 @@ public UMLCommentListDiff modifiedMatchingText(UMLCommentGroup other) {
 		}
 		else if(this.group.size() != other.group.size() && this.group.size() > 1) {
 			UMLCommentListDiff diff = new UMLCommentListDiff(this, other);
-			if(diff.isManyToManyReformat()) {
+			if(diff.isManyToManyReformat() && diff.getDeletedComments().isEmpty() && diff.getAddedComments().isEmpty()) {
 				return diff;
 			}
 		}

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

@@ -280,10 +280,16 @@ private void processRemainingComments(List<UMLComment> commentsBefore, List<UMLC
 				List<Integer> matchingIndices = findAllMatchingIndices(commentsAfter, comment);
 				List<Boolean> mappedParent = new ArrayList<Boolean>();
 				List<Boolean> mappedPreviousStatement = new ArrayList<Boolean>();
+				List<Boolean> identicalNextComment = new ArrayList<Boolean>();
 				if(matchingIndices.size() > 1) {
 					for(Integer index : matchingIndices) {
 						mappedParent.add(mappedParent(comment, commentsAfter.get(index)));
 						mappedPreviousStatement.add(mappedPreviousStatement(comment, commentsAfter.get(index)));
+						if(commentsBefore.indexOf(comment) < commentsBefore.size() - 1 && index < commentsAfter.size() - 1) {
+							UMLComment commentAfterLeft = commentsBefore.get(commentsBefore.indexOf(comment)+1);
+							UMLComment commentAfterRight = commentsAfter.get(index + 1);
+							identicalNextComment.add(commentAfterLeft.getFullText().equals(commentAfterRight.getFullText()));
+						}
 					}
 				}
 				int i = -1;
@@ -296,6 +302,9 @@ private void processRemainingComments(List<UMLComment> commentsBefore, List<UMLC
 						if(mappedPreviousStatement.contains(true) && mappedPreviousStatement.get(i) == false) {
 							continue;
 						}
+						if(identicalNextComment.contains(true) && identicalNextComment.get(i) == false) {
+							continue;
+						}
 						Pair<UMLComment, UMLComment> pair = Pair.of(comment, commentsAfter.get(index));
 						commonComments.add(pair);
 						deletedComments.remove(comment);
@@ -310,10 +319,16 @@ private void processRemainingComments(List<UMLComment> commentsBefore, List<UMLC
 				List<Integer> matchingIndices = findAllMatchingIndices(commentsBefore, comment);
 				List<Boolean> mappedParent = new ArrayList<Boolean>();
 				List<Boolean> mappedPreviousStatement = new ArrayList<Boolean>();
+				List<Boolean> identicalNextComment = new ArrayList<Boolean>();
 				if(matchingIndices.size() > 1) {
 					for(Integer index : matchingIndices) {
 						mappedParent.add(mappedParent(commentsBefore.get(index), comment));
 						mappedPreviousStatement.add(mappedPreviousStatement(commentsBefore.get(index), comment));
+						if(commentsAfter.indexOf(comment) < commentsAfter.size() - 1 && index < commentsBefore.size() - 1) {
+							UMLComment commentAfterLeft = commentsBefore.get(index + 1);
+							UMLComment commentAfterRight = commentsAfter.get(commentsAfter.indexOf(comment)+1);
+							identicalNextComment.add(commentAfterLeft.getFullText().equals(commentAfterRight.getFullText()));
+						}
 					}
 				}
 				int i = -1;
@@ -326,6 +341,9 @@ private void processRemainingComments(List<UMLComment> commentsBefore, List<UMLC
 						if(mappedPreviousStatement.contains(true) && mappedPreviousStatement.get(i) == false) {
 							continue;
 						}
+						if(identicalNextComment.contains(true) && identicalNextComment.get(i) == false) {
+							continue;
+						}
 						Pair<UMLComment, UMLComment> pair = Pair.of(commentsBefore.get(index), comment);
 						commonComments.add(pair);
 						deletedComments.remove(commentsBefore.get(index));