Add comments after top-level type declaration in the package declaration

JabRef/jabref-koppor#716
jabgui/src/main/java/org/jabref/gui/openoffice/Bootstrap.java
(#976)

Author: tsantalis

src/main/java/gr/uom/java/xmi/UMLModelASTReader.java

@@ -470,6 +470,9 @@ private void processRecordDeclaration(CompilationUnit cu, RecordDeclaration reco
 				if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
+				else if(locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {
+					umlClass.getPackageDeclarationComments().add(comment);
+				}
 			}
 			comments.removeAll(umlClass.getPackageDeclarationComments());
 		}
@@ -573,6 +576,9 @@ private void processAnnotationTypeDeclaration(CompilationUnit cu, AnnotationType
 				if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
+				else if(locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {
+					umlClass.getPackageDeclarationComments().add(comment);
+				}
 			}
 			comments.removeAll(umlClass.getPackageDeclarationComments());
 		}
@@ -633,6 +639,9 @@ private void processEnumDeclaration(CompilationUnit cu, EnumDeclaration enumDecl
 				if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
+				else if(locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {
+					umlClass.getPackageDeclarationComments().add(comment);
+				}
 			}
 			comments.removeAll(umlClass.getPackageDeclarationComments());
 		}
@@ -764,6 +773,9 @@ private void processTypeDeclaration(CompilationUnit cu, TypeDeclaration typeDecl
 				if(comment.getLocationInfo().before(locationInfo) && !locationInfo.nextLine(comment.getLocationInfo())) {
 					umlClass.getPackageDeclarationComments().add(comment);
 				}
+				else if(locationInfo.getEndLine() < comment.getLocationInfo().getStartLine()) {
+					umlClass.getPackageDeclarationComments().add(comment);
+				}
 			}
 			comments.removeAll(umlClass.getPackageDeclarationComments());
 		}