fix #5043: preserve encoding while copy and pasting in maintable

JabRef · Jun 12, 2019 · cad3aac · cad3aac
1 parent eb42850
commit cad3aac
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 39 deletions.
diff --git a/src/main/java/org/jabref/gui/ClipBoardManager.java b/src/main/java/org/jabref/gui/ClipBoardManager.java
@@ -1,14 +1,15 @@
 package org.jabref.gui;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
 import javafx.scene.input.Clipboard;
 import javafx.scene.input.ClipboardContent;
 import javafx.scene.input.DataFormat;
-
 import org.jabref.Globals;
 import org.jabref.logic.bibtex.BibEntryWriter;
 import org.jabref.logic.bibtex.LatexFieldFormatter;
@@ -23,18 +24,15 @@
 import org.jabref.model.entry.BibEntry;
 import org.jabref.model.entry.identifier.DOI;
 import org.jabref.model.util.OptionalUtil;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class ClipBoardManager {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ClipBoardManager.class);
 
     public static final DataFormat XML = new DataFormat("application/xml");
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(ClipBoardManager.class);
 
     private final Clipboard clipboard;
-
     private final ImportFormatReader importFormatReader;
 
     public ClipBoardManager() {
@@ -63,9 +61,8 @@ public String getContents() {
         String result = clipboard.getString();
         if (result == null) {
             return "";
-        } else {
-            return result;
         }
+        return result;
     }
 
     public void setHtmlContent(String html) {
@@ -89,40 +86,55 @@ public void setContent(List<BibEntry> entries) throws IOException {
         clipboard.setContent(content);
     }
 
-    public List<BibEntry> extractEntries() {
+    public List<BibEntry> extractData() {
         Object entries = clipboard.getContent(DragAndDropDataFormats.ENTRIES);
 
+        if (entries == null) {
+            return handleStringData(clipboard.getString());
+        }
+        return handleBibTeXData((String) entries);
+    }
+
+    private List<BibEntry> handleBibTeXData(String entries) {
         BibtexParser parser = new BibtexParser(Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
-        if (entries != null) {
-            // We have determined that the clipboard data is a set of entries (serialized as a string).
-            try {
-                return parser.parseEntries((String) entries);
-            } catch (ParseException ex) {
-                LOGGER.error("Could not paste", ex);
-            }
-        } else {
-            String data = clipboard.getString();
-            if (data != null) {
-                try {
-                    // fetch from doi
-                    Optional<DOI> doi = DOI.parse(data);
-                    if (doi.isPresent()) {
-                        LOGGER.info("Found DOI in clipboard");
-                        Optional<BibEntry> entry = new DoiFetcher(Globals.prefs.getImportFormatPreferences()).performSearchById(doi.get().getDOI());
-                        return OptionalUtil.toList(entry);
-                    } else {
-                        try {
-                            UnknownFormatImport unknownFormatImport = importFormatReader.importUnknownFormat(data);
-                            return unknownFormatImport.parserResult.getDatabase().getEntries();
-                        } catch (ImportException e) {
-                            // import failed and result will be empty
-                        }
-                    }
-                } catch (FetcherException ex) {
-                    LOGGER.error("Error while fetching", ex);
-                }
-            }
+        try {
+            return parser.parseEntries(new ByteArrayInputStream(entries.getBytes(StandardCharsets.UTF_8)));
+        } catch (ParseException ex) {
+            LOGGER.error("Could not paste", ex);
+            return Collections.emptyList();
+        }
+    }
+
+    private List<BibEntry> handleStringData(String data) {
+        if (data == null || data.isEmpty()) {
+            return Collections.emptyList();
+        }
+
+        Optional<DOI> doi = DOI.parse(data);
+        if (doi.isPresent()) {
+            return fetchByDOI(doi.get());
+        }
+
+        return tryImportFormats(data);
+    }
+
+    private List<BibEntry> tryImportFormats(String data) {
+        try {
+            UnknownFormatImport unknownFormatImport = importFormatReader.importUnknownFormat(data);
+            return unknownFormatImport.parserResult.getDatabase().getEntries();
+        } catch (ImportException ignored) {
+            return Collections.emptyList();
+        }
+    }
+
+    private List<BibEntry> fetchByDOI(DOI doi) {
+        LOGGER.info("Found DOI in clipboard");
+        try {
+            Optional<BibEntry> entry = new DoiFetcher(Globals.prefs.getImportFormatPreferences()).performSearchById(doi.getDOI());
+            return OptionalUtil.toList(entry);
+        } catch (FetcherException ex) {
+            LOGGER.error("Error while fetching", ex);
+            return Collections.emptyList();
         }
-        return Collections.emptyList();
     }
 }
diff --git a/src/main/java/org/jabref/gui/maintable/MainTable.java b/src/main/java/org/jabref/gui/maintable/MainTable.java
@@ -209,7 +209,7 @@ private void clearAndSelectLast() {
 
     public void paste() {
         // Find entries in clipboard
-        List<BibEntry> entriesToAdd = Globals.clipboardManager.extractEntries();
+        List<BibEntry> entriesToAdd = Globals.clipboardManager.extractData();
 
         if (!entriesToAdd.isEmpty()) {
             // Add new entries