Fix distribution of comments between package declaration and top-level

type declaration
tsantalis · Dec 9, 2024 · 84d6bf3 · 84d6bf3
1 parent f79c2df
commit 84d6bf3
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/main/java/gr/uom/java/xmi/UMLModelASTReader.java b/src/main/java/gr/uom/java/xmi/UMLModelASTReader.java
@@ -373,7 +373,10 @@ private void processRecordDeclaration(CompilationUnit cu, RecordDeclaration reco
 			umlClass.setPackageDeclaration(umlPackage);
 			umlClass.setPackageDeclarationJavadoc(packageDoc);
 			for(UMLComment comment : comments) {
-				if(comment.getLocationInfo().before(locationInfo)) {
+				if(comment.getLocationInfo().before(umlPackage.getLocationInfo())) {
+					umlClass.getPackageDeclarationComments().add(comment);
+				}
+				else if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
 			}
@@ -473,7 +476,10 @@ private void processAnnotationTypeDeclaration(CompilationUnit cu, AnnotationType
 			umlClass.setPackageDeclaration(umlPackage);
 			umlClass.setPackageDeclarationJavadoc(packageDoc);
 			for(UMLComment comment : comments) {
-				if(comment.getLocationInfo().before(locationInfo)) {
+				if(comment.getLocationInfo().before(umlPackage.getLocationInfo())) {
+					umlClass.getPackageDeclarationComments().add(comment);
+				}
+				else if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
 			}
@@ -530,7 +536,10 @@ private void processEnumDeclaration(CompilationUnit cu, EnumDeclaration enumDecl
 			umlClass.setPackageDeclaration(umlPackage);
 			umlClass.setPackageDeclarationJavadoc(packageDoc);
 			for(UMLComment comment : comments) {
-				if(comment.getLocationInfo().before(locationInfo)) {
+				if(comment.getLocationInfo().before(umlPackage.getLocationInfo())) {
+					umlClass.getPackageDeclarationComments().add(comment);
+				}
+				else if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
 			}
@@ -661,6 +670,9 @@ private void processTypeDeclaration(CompilationUnit cu, TypeDeclaration typeDecl
 				if(comment.getLocationInfo().before(umlPackage.getLocationInfo())) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
+				else if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {
+					umlClass.getPackageDeclarationComments().add(comment);
+				}
 			}
 			comments.removeAll(umlClass.getPackageDeclarationComments());
 		}