Avoid NPE

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