Fix failing test (#976)

tsantalis · tsantalis · commit 3ad6ee1a1cd7 · 2025-08-21T10:59:44.000-04:00
diff --git a/src/main/java/gr/uom/java/xmi/UMLModelASTReader.java b/src/main/java/gr/uom/java/xmi/UMLModelASTReader.java
@@ -466,11 +466,12 @@ private void processRecordDeclaration(CompilationUnit cu, RecordDeclaration reco
 		if(recordDeclaration.isPackageMemberTypeDeclaration()) {
 			umlClass.setPackageDeclaration(umlPackage);
 			umlClass.setPackageDeclarationJavadoc(packageDoc);
+			boolean isLastType = cu.types().get(cu.types().size()-1).equals(recordDeclaration);
 			for(UMLComment comment : comments) {
 				if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
-				else if(locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {
+				else if(isLastType && locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
 			}
@@ -572,11 +573,12 @@ private void processAnnotationTypeDeclaration(CompilationUnit cu, AnnotationType
 		if(annotationDeclaration.isPackageMemberTypeDeclaration()) {
 			umlClass.setPackageDeclaration(umlPackage);
 			umlClass.setPackageDeclarationJavadoc(packageDoc);
+			boolean isLastType = cu.types().get(cu.types().size()-1).equals(annotationDeclaration);
 			for(UMLComment comment : comments) {
 				if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
-				else if(locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {
+				else if(isLastType && locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
 			}
@@ -635,11 +637,12 @@ private void processEnumDeclaration(CompilationUnit cu, EnumDeclaration enumDecl
 		if(enumDeclaration.isPackageMemberTypeDeclaration()) {
 			umlClass.setPackageDeclaration(umlPackage);
 			umlClass.setPackageDeclarationJavadoc(packageDoc);
+			boolean isLastType = cu.types().get(cu.types().size()-1).equals(enumDeclaration);
 			for(UMLComment comment : comments) {
 				if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
-				else if(locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {
+				else if(isLastType && locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
 			}
@@ -769,11 +772,12 @@ private void processTypeDeclaration(CompilationUnit cu, TypeDeclaration typeDecl
 		if(typeDeclaration.isPackageMemberTypeDeclaration()) {
 			umlClass.setPackageDeclaration(umlPackage);
 			umlClass.setPackageDeclarationJavadoc(packageDoc);
+			boolean isLastType = cu.types().get(cu.types().size()-1).equals(typeDeclaration);
 			for(UMLComment comment : comments) {
 				if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
-				else if(locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {
+				else if(isLastType && locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
 			}

Original file line number	Diff line number	Diff line change
`@@ -466,11 +466,12 @@ private void processRecordDeclaration(CompilationUnit cu, RecordDeclaration reco`
`466`	`466`	`if(recordDeclaration.isPackageMemberTypeDeclaration()) {`
`467`	`467`	`umlClass.setPackageDeclaration(umlPackage);`
`468`	`468`	`umlClass.setPackageDeclarationJavadoc(packageDoc);`
	`469`	`+ boolean isLastType = cu.types().get(cu.types().size()-1).equals(recordDeclaration);`
`469`	`470`	`for(UMLComment comment : comments) {`
`470`	`471`	`if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {`
`471`	`472`	`umlClass.getPackageDeclarationComments().add(comment);`
`472`	`473`	`}`
`473`		`- else if(locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {`
	`474`	`+ else if(isLastType && locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {`
`474`	`475`	`umlClass.getPackageDeclarationComments().add(comment);`
`475`	`476`	`}`
`476`	`477`	`}`
`@@ -572,11 +573,12 @@ private void processAnnotationTypeDeclaration(CompilationUnit cu, AnnotationType`
`572`	`573`	`if(annotationDeclaration.isPackageMemberTypeDeclaration()) {`
`573`	`574`	`umlClass.setPackageDeclaration(umlPackage);`
`574`	`575`	`umlClass.setPackageDeclarationJavadoc(packageDoc);`
	`576`	`+ boolean isLastType = cu.types().get(cu.types().size()-1).equals(annotationDeclaration);`
`575`	`577`	`for(UMLComment comment : comments) {`
`576`	`578`	`if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {`
`577`	`579`	`umlClass.getPackageDeclarationComments().add(comment);`
`578`	`580`	`}`
`579`		`- else if(locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {`
	`581`	`+ else if(isLastType && locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {`
`580`	`582`	`umlClass.getPackageDeclarationComments().add(comment);`
`581`	`583`	`}`
`582`	`584`	`}`
`@@ -635,11 +637,12 @@ private void processEnumDeclaration(CompilationUnit cu, EnumDeclaration enumDecl`
`635`	`637`	`if(enumDeclaration.isPackageMemberTypeDeclaration()) {`
`636`	`638`	`umlClass.setPackageDeclaration(umlPackage);`
`637`	`639`	`umlClass.setPackageDeclarationJavadoc(packageDoc);`
	`640`	`+ boolean isLastType = cu.types().get(cu.types().size()-1).equals(enumDeclaration);`
`638`	`641`	`for(UMLComment comment : comments) {`
`639`	`642`	`if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {`
`640`	`643`	`umlClass.getPackageDeclarationComments().add(comment);`
`641`	`644`	`}`
`642`		`- else if(locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {`
	`645`	`+ else if(isLastType && locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {`
`643`	`646`	`umlClass.getPackageDeclarationComments().add(comment);`
`644`	`647`	`}`
`645`	`648`	`}`
`@@ -769,11 +772,12 @@ private void processTypeDeclaration(CompilationUnit cu, TypeDeclaration typeDecl`
`769`	`772`	`if(typeDeclaration.isPackageMemberTypeDeclaration()) {`
`770`	`773`	`umlClass.setPackageDeclaration(umlPackage);`
`771`	`774`	`umlClass.setPackageDeclarationJavadoc(packageDoc);`
	`775`	`+ boolean isLastType = cu.types().get(cu.types().size()-1).equals(typeDeclaration);`
`772`	`776`	`for(UMLComment comment : comments) {`
`773`	`777`	`if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {`
`774`	`778`	`umlClass.getPackageDeclarationComments().add(comment);`
`775`	`779`	`}`
`776`		`- else if(locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {`
	`780`	`+ else if(isLastType && locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {`
`777`	`781`	`umlClass.getPackageDeclarationComments().add(comment);`
`778`	`782`	`}`
`779`	`783`	`}`