File tree Expand file tree Collapse file tree 1 file changed +14
-0
lines changed
src/main/java/gr/uom/java/xmi/diff Expand file tree Collapse file tree 1 file changed +14
-0
lines changed Original file line number Diff line number Diff line change @@ -1124,7 +1124,18 @@ private TreeSet<UMLClassRenameDiff> optimize(TreeSet<UMLClassRenameDiff> diffSet
1124
1124
TreeSet <UMLClassRenameDiff > identicalBodyDiffSet = new TreeSet <UMLClassRenameDiff >(new ClassRenameComparator ());
1125
1125
TreeSet <UMLClassRenameDiff > identicalStatementDiffSet = new TreeSet <UMLClassRenameDiff >(new ClassRenameComparator ());
1126
1126
TreeSet <UMLClassRenameDiff > identicalSignatureDiffSet = new TreeSet <UMLClassRenameDiff >(new ClassRenameComparator ());
1127
+ TreeSet <UMLClassRenameDiff > identicalPackageDeclarationDocDiffSet = new TreeSet <UMLClassRenameDiff >(new ClassRenameComparator ());
1127
1128
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
+ }
1128
1139
List <UMLOperation > operations1 = diff .getOriginalClass ().getOperations ();
1129
1140
List <UMLOperation > operations2 = diff .getNextClass ().getOperations ();
1130
1141
int identicalBodies = 0 ;
@@ -1180,6 +1191,9 @@ else if(identicalBodyDiffSet.size() < diffSet.size() && identicalStatementDiffSe
1180
1191
if (identicalSignatureDiffSet .size () == 1 ) {
1181
1192
return identicalSignatureDiffSet ;
1182
1193
}
1194
+ if (identicalPackageDeclarationDocDiffSet .size () == 1 ) {
1195
+ return identicalPackageDeclarationDocDiffSet ;
1196
+ }
1183
1197
}
1184
1198
return diffSet ;
1185
1199
}
You can’t perform that action at this time.
0 commit comments