Skip to content

Commit 6d102ae

Browse files
committedDec 12, 2024·
Further improvement in optimize(TreeSet<UMLClassRenameDiff> diffSet)
checkstyle/checkstyle@8faa81a
1 parent 7545313 commit 6d102ae

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed
 

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,7 +1124,18 @@ private TreeSet<UMLClassRenameDiff> optimize(TreeSet<UMLClassRenameDiff> diffSet
11241124
TreeSet<UMLClassRenameDiff> identicalBodyDiffSet = new TreeSet<UMLClassRenameDiff>(new ClassRenameComparator());
11251125
TreeSet<UMLClassRenameDiff> identicalStatementDiffSet = new TreeSet<UMLClassRenameDiff>(new ClassRenameComparator());
11261126
TreeSet<UMLClassRenameDiff> identicalSignatureDiffSet = new TreeSet<UMLClassRenameDiff>(new ClassRenameComparator());
1127+
TreeSet<UMLClassRenameDiff> identicalPackageDeclarationDocDiffSet = new TreeSet<UMLClassRenameDiff>(new ClassRenameComparator());
11271128
for(UMLClassRenameDiff diff : diffSet) {
1129+
if(diff.getOriginalClass().getPackageDeclarationJavadoc() != null && diff.getNextClass().getPackageDeclarationJavadoc() != null) {
1130+
if(diff.getOriginalClass().getPackageDeclarationJavadoc().getFullText().equals(diff.getNextClass().getPackageDeclarationJavadoc().getFullText())) {
1131+
identicalPackageDeclarationDocDiffSet.add(diff);
1132+
}
1133+
}
1134+
if(diff.getOriginalClass().getPackageDeclarationComments().size() > 0 && diff.getNextClass().getPackageDeclarationComments().size() > 0) {
1135+
if(diff.getOriginalClass().getPackageDeclarationComments().get(0).getFullText().equals(diff.getNextClass().getPackageDeclarationComments().get(0).getFullText())) {
1136+
identicalPackageDeclarationDocDiffSet.add(diff);
1137+
}
1138+
}
11281139
List<UMLOperation> operations1 = diff.getOriginalClass().getOperations();
11291140
List<UMLOperation> operations2 = diff.getNextClass().getOperations();
11301141
int identicalBodies = 0;
@@ -1180,6 +1191,9 @@ else if(identicalBodyDiffSet.size() < diffSet.size() && identicalStatementDiffSe
11801191
if(identicalSignatureDiffSet.size() == 1) {
11811192
return identicalSignatureDiffSet;
11821193
}
1194+
if(identicalPackageDeclarationDocDiffSet.size() == 1) {
1195+
return identicalPackageDeclarationDocDiffSet;
1196+
}
11831197
}
11841198
return diffSet;
11851199
}

0 commit comments

Comments
 (0)
Please sign in to comment.