Enable PdfCommentImporter to import multiple files

Author: Braunch

src/main/java/net/sf/jabref/gui/entryeditor/PdfCommentsTab.java

@@ -2,6 +2,8 @@
 
 import java.awt.BorderLayout;
 import java.awt.Dimension;
+import java.io.IOException;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Optional;
 
@@ -15,6 +17,7 @@
 import net.sf.jabref.gui.BasePanel;
 import net.sf.jabref.gui.JabRefFrame;
 import net.sf.jabref.logic.pdf.PdfCommentImporter;
+import net.sf.jabref.model.entry.BibEntry;
 import net.sf.jabref.model.entry.FieldName;
 
 public class PdfCommentsTab extends JPanel {
@@ -43,6 +46,8 @@ public class PdfCommentsTab extends JPanel {
 
     private JScrollPane siteScrollPane = new JScrollPane(siteArea);
 
+    DefaultListModel<String> listModel;
+
     private final EntryEditor parent;
 
     private final String tabTitle;
@@ -57,18 +62,27 @@ public PdfCommentsTab(EntryEditor parent, JabRefFrame frame, BasePanel basePanel
         this.basePanel = basePanel;
         this.tabTitle = "PDF comments";
         this.setUpInformationPanel();
-        this.setUpPdfCommentsTab();
+        listModel  = new DefaultListModel<>();
+        try {
+            this.setUpPdfCommentsTab();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
-    private void setUpPdfCommentsTab() {
+    private void setUpPdfCommentsTab() throws IOException {
         Optional<String> field = parent.getEntry().getField(FieldName.FILE);
         if (field.isPresent()) {
-            DefaultListModel<String> listModel = new DefaultListModel<>();
+
             commentList.setModel(listModel);
             PdfCommentImporter commentImporter = new PdfCommentImporter();
-            String pdfPath = field.get().replaceFirst(".*?:", System.getProperty("file.separator")).replaceAll(":PDF", "");
-            HashMap<String, String> importedNotes = commentImporter.importNotes(pdfPath);
-            importedNotes.values().stream().forEach((note) -> listModel.addElement(note));
+            ArrayList<BibEntry> entries = new ArrayList<>();
+            entries.add(parent.getEntry());
+            commentImporter.importPdfFile(entries, basePanel.getBibDatabaseContext());
+
+            HashMap<String, String> importedNotes = commentImporter.importNotes(commentImporter.importPdfFile(entries,
+                    basePanel.getBibDatabaseContext()).get(0));
+            updateShownComments(importedNotes);
         }
 
         commentScrollPane.setPreferredSize(new Dimension(450,200));
@@ -77,6 +91,10 @@ private void setUpPdfCommentsTab() {
         this.add(informationPanel,BorderLayout.WEST);
     }
 
+    private void updateShownComments(HashMap<String, String> importedNotes){
+        importedNotes.values().stream().forEach((note) -> listModel.addElement(note));
+    }
+
 
     private void setUpInformationPanel(){
         authorArea.setEditable(false);

src/main/java/net/sf/jabref/logic/pdf/PdfCommentImporter.java

@@ -44,6 +44,7 @@ public HashMap<String, String> importNotes(final PDDocument document) {
             try {
                 for (PDAnnotation annotation : page.getAnnotations()) {
                     annotationsMap.put(annotation.getAnnotationName(), annotation.getContents());
+                    annotation.get
                 }
             } catch (IOException e1) {
                 e1.printStackTrace();
@@ -52,7 +53,7 @@ public HashMap<String, String> importNotes(final PDDocument document) {
         return annotationsMap;
     }
 
-    private List<PDDocument> importPdfFile(final List<BibEntry> entryList, final BibDatabaseContext bibDatabaseContext) throws IOException {
+    public List<PDDocument> importPdfFile(final List<BibEntry> entryList, final BibDatabaseContext bibDatabaseContext) throws IOException {
 
         final List<File> files = FileUtil.getListOfLinkedFiles(entryList,
                 bibDatabaseContext.getFileDirectory(Globals.prefs.getFileDirectoryPreferences()));