Skip to content

Commit a60ac8f

Browse files
committed
Fix comment mappings for commit
AsyncHttpClient/async-http-client@f01d861
1 parent a445497 commit a60ac8f

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,14 @@ private void init(List<UMLComment> commentsBefore, List<UMLComment> commentsAfte
108108
}
109109
groupsBefore.removeAll(groupsBeforeToBeRemoved);
110110
groupsAfter.removeAll(groupsAfterToBeRemoved);
111-
if(!(allRemainingCommentsBelongToGroups(deletedComments, groupsBefore) && allRemainingCommentsBelongToGroups(addedComments, groupsAfter)) ||
111+
boolean allRemainingCommentsBelongToGroups = allRemainingCommentsBelongToGroups(deletedComments, groupsBefore) && allRemainingCommentsBelongToGroups(addedComments, groupsAfter);
112+
if(!allRemainingCommentsBelongToGroups ||
112113
(groupsBeforeSize <= 1 && groupsAfterSize <= 1)) {
113114
processRemainingComments(deletedComments, addedComments);
114115
}
116+
else if(allRemainingCommentsBelongToGroups && groupsBeforeSize != groupsAfterSize && (groupsBeforeSize <= 1 || groupsAfterSize <= 1)) {
117+
processRemainingComments(deletedComments, addedComments);
118+
}
115119
else {
116120
this.deletedComments.addAll(deletedComments);
117121
this.addedComments.addAll(addedComments);

0 commit comments

Comments
 (0)