Skip to content

Commit

Permalink
Support matching the contents of link/code nested tags that break in
Browse files Browse the repository at this point in the history
multiple lines
  • Loading branch information
tsantalis committed Sep 14, 2024
1 parent a69cd62 commit 645dcf3
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions src/main/java/gr/uom/java/xmi/diff/UMLJavadocDiff.java
Original file line number Diff line number Diff line change
Expand Up @@ -214,10 +214,26 @@ else if(deletedNestedTag.getTagName() != null && addedNestedTag.getTagName() !=
UMLDocElement fragment2 = addedNestedTag.getFragments().get(0);
String trimmed1 = fragment1.getText().trim();
String trimmed2 = fragment2.getText().trim();
StringBuilder concatenated1 = new StringBuilder();
for(UMLDocElement f1 : deletedNestedTag.getFragments()) {
concatenated1.append(f1.getText().trim());
}
StringBuilder concatenated2 = new StringBuilder();
for(UMLDocElement f2 : addedNestedTag.getFragments()) {
concatenated2.append(f2.getText().trim());
}
if(trimmed1.contains(trimmed2) || trimmed2.contains(trimmed1)) {
Pair<UMLTagElement, UMLTagElement> pair = Pair.of(deletedNestedTag, addedNestedTag);
commonNestedTags.add(pair);
}
if(concatenated1.toString().replaceAll("\\s", "").equals(concatenated2.toString().replaceAll("\\s", ""))) {
for(UMLDocElement deletedDocElement : deletedNestedTag.getFragments()) {
for(UMLDocElement addedDocElement : addedNestedTag.getFragments()) {
Pair<UMLDocElement, UMLDocElement> pair = Pair.of(deletedDocElement, addedDocElement);
commonDocElements.add(pair);
}
}
}
}
}
}
Expand Down

0 comments on commit 645dcf3

Please sign in to comment.