Remove old code for PDF import (#4634)

* Remove old code for PDF import * Fix tests * Update Docbook5ExportFormat.xml * Fix tests * Fix checkstyle
JabRef · Feb 10, 2019 · 8520833 · 8520833
1 parent 8e7b1f9
commit 8520833
Show file tree

Hide file tree

Showing 96 changed files with 970 additions and 2,882 deletions.
diff --git a/src/main/java/org/jabref/gui/DuplicateResolverDialog.java b/src/main/java/org/jabref/gui/DuplicateResolverDialog.java
@@ -68,7 +68,7 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
                 second = new ButtonType(Localization.lang("Remove entry from import"), ButtonData.APPLY);
                 both = new ButtonType(Localization.lang("Keep both"), ButtonData.APPLY);
                 me = new MergeEntries(one, two, Localization.lang("Old entry"),
-                                      Localization.lang("From import"), frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
+                        Localization.lang("From import"), frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
                 break;
             case DUPLICATE_SEARCH_WITH_EXACT:
                 first = new ButtonType(Localization.lang("Keep left"), ButtonData.APPLY);
@@ -84,7 +84,7 @@ private void init(BibEntry one, BibEntry two, DuplicateResolverType type) {
                 second = new ButtonType(Localization.lang("Do not import entry"), ButtonData.APPLY);
                 both = new ButtonType(Localization.lang("Import and keep old entry"), ButtonData.APPLY);
                 me = new MergeEntries(one, two, Localization.lang("Old entry"),
-                                      Localization.lang("From import"), frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
+                        Localization.lang("From import"), frame.getCurrentBasePanel().getBibDatabaseContext().getMode());
                 break;
         }
         if (removeExactVisible) {

diff --git a/src/main/java/org/jabref/gui/DuplicateSearch.java b/src/main/java/org/jabref/gui/DuplicateSearch.java
@@ -127,7 +127,7 @@ private void askResolveStrategy(DuplicateSearchResult result, BibEntry first, Bi
         DuplicateResolverResult resolverResult = dialog.showAndWait().orElse(DuplicateResolverResult.BREAK);
 
         if ((resolverResult == DuplicateResolverResult.KEEP_LEFT)
-            || (resolverResult == DuplicateResolverResult.AUTOREMOVE_EXACT)) {
+                || (resolverResult == DuplicateResolverResult.AUTOREMOVE_EXACT)) {
             result.remove(second);
             if (resolverResult == DuplicateResolverResult.AUTOREMOVE_EXACT) {
                 autoRemoveExactDuplicates.set(true); // Remember choice
@@ -167,7 +167,7 @@ private void handleDuplicates(DuplicateSearchResult result) {
         }
 
         dialogService.notify(Localization.lang("Duplicates found") + ": " + duplicateCount.get() + ' '
-                             + Localization.lang("pairs processed") + ": " + result.getDuplicateCount());
+                + Localization.lang("pairs processed") + ": " + result.getDuplicateCount());
         compoundEdit.end();
         panel.getUndoManager().addEdit(compoundEdit);
 

diff --git a/src/main/java/org/jabref/gui/EntryType.fxml b/src/main/java/org/jabref/gui/EntryType.fxml
@@ -12,41 +12,43 @@
 <?import javafx.scene.layout.GridPane?>
 <?import javafx.scene.layout.RowConstraints?>
 <?import javafx.scene.layout.VBox?>
-
-<DialogPane prefWidth="476.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.EntryTypeView">
-      <buttonTypes>
-        <ButtonType fx:constant="CANCEL" />
-        <ButtonType fx:id="generateButton" buttonData="OK_DONE" text="%Generate" />
-      </buttonTypes>
+<DialogPane xmlns:fx="http://javafx.com/fxml/1" prefWidth="476.0" xmlns="http://javafx.com/javafx/8.0.171"
+            fx:controller="org.jabref.gui.EntryTypeView">
+    <buttonTypes>
+        <ButtonType fx:constant="CANCEL"/>
+        <ButtonType fx:id="generateButton" buttonData="OK_DONE" text="%Generate"/>
+    </buttonTypes>
    <content>
-      <VBox prefHeight="200.0" prefWidth="400.0">
-         <children>
-            <TitledPane fx:id="biblatexTitlePane" animated="false" collapsible="false" text="Biblatex">
-               <content>
-                  <FlowPane fx:id="biblatexPane" prefHeight="200.0" prefWidth="200.0" />
-               </content>
-            </TitledPane>
-            <TitledPane fx:id="bibTexTitlePane" animated="false" collapsible="false" text="BibTeX">
-               <content>
-                  <FlowPane fx:id="bibTexPane" prefHeight="200.0" prefWidth="200.0" />
-               </content>
-            </TitledPane>
-            <TitledPane fx:id="ieeeTranTitlePane" animated="false" collapsible="false" text="IEEETran">
-               <content>
-                  <FlowPane fx:id="ieeetranPane" prefHeight="200.0" prefWidth="200.0" />
-               </content>
-            </TitledPane>
-            <TitledPane fx:id="customTitlePane" animated="false" collapsible="false" text="%Custom">
-               <content>
-                  <FlowPane fx:id="customPane" prefHeight="200.0" prefWidth="200.0" />
-               </content>
-            </TitledPane>
-            <GridPane alignment="CENTER">
+       <VBox prefHeight="200.0" prefWidth="400.0">
+           <children>
+               <TitledPane fx:id="biblatexTitlePane" animated="false" collapsible="false" text="Biblatex">
+                   <content>
+                       <FlowPane fx:id="biblatexPane" prefHeight="200.0" prefWidth="200.0"/>
+                   </content>
+               </TitledPane>
+               <TitledPane fx:id="bibTexTitlePane" animated="false" collapsible="false" text="BibTeX">
+                   <content>
+                       <FlowPane fx:id="bibTexPane" prefHeight="200.0" prefWidth="200.0"/>
+                   </content>
+               </TitledPane>
+               <TitledPane fx:id="ieeeTranTitlePane" animated="false" collapsible="false" text="IEEETran">
+                   <content>
+                       <FlowPane fx:id="ieeetranPane" prefHeight="200.0" prefWidth="200.0"/>
+                   </content>
+               </TitledPane>
+               <TitledPane fx:id="customTitlePane" animated="false" collapsible="false" text="%Custom">
+                   <content>
+                       <FlowPane fx:id="customPane" prefHeight="200.0" prefWidth="200.0"/>
+                   </content>
+               </TitledPane>
+               <GridPane alignment="CENTER">
                <children>
-                  <Label text="%ID type"/>
-                  <ComboBox fx:id="idBasedFetchers" onAction="#focusTextField" prefHeight="30.0" prefWidth="300.0" GridPane.columnIndex="1" />            
-                  <Label text="%ID" GridPane.rowIndex="1" />
-                  <TextField fx:id="idTextField" onAction="#runFetcherWorker" prefHeight="30.0" prefWidth="300.0" GridPane.columnIndex="1" GridPane.rowIndex="1" />
+                   <Label text="%ID type"/>
+                   <ComboBox fx:id="idBasedFetchers" onAction="#focusTextField" prefHeight="30.0" prefWidth="300.0"
+                             GridPane.columnIndex="1"/>
+                   <Label text="%ID" GridPane.rowIndex="1" />
+                   <TextField fx:id="idTextField" onAction="#runFetcherWorker" prefHeight="30.0" prefWidth="300.0"
+                              GridPane.columnIndex="1" GridPane.rowIndex="1"/>
                </children>
                <columnConstraints>
                   <ColumnConstraints hgrow="SOMETIMES" maxWidth="122.0" minWidth="10.0" prefWidth="100.0" />
@@ -56,11 +58,11 @@
                   <Insets bottom="4.0" left="4.0" right="4.0" top="4.0" />
                </opaqueInsets>
                <rowConstraints>
-                  <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES" />
-                  <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES" />
+                   <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
+                   <RowConstraints minHeight="30.0" prefHeight="30.0" vgrow="SOMETIMES"/>
                </rowConstraints>
             </GridPane>
-         </children>
-      </VBox>
+           </children>
+       </VBox>
    </content>
 </DialogPane>
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -923,23 +923,23 @@ private MenuBar createMenu() {
         );
 
         options.getItems().addAll(
-                                  factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(this, Globals.TASK_EXECUTOR)),
+                factory.createMenuItem(StandardActions.SHOW_PREFS, new ShowPreferencesAction(this, Globals.TASK_EXECUTOR)),
 
-                                  new SeparatorMenuItem(),
+                new SeparatorMenuItem(),
 
-                                  factory.createMenuItem(StandardActions.SETUP_GENERAL_FIELDS, new SetupGeneralFieldsAction()),
-                                  factory.createMenuItem(StandardActions.MANAGE_CUSTOM_IMPORTS, new ManageCustomImportsAction()),
-                                  factory.createMenuItem(StandardActions.MANAGE_CUSTOM_EXPORTS, new ManageCustomExportsAction()),
-                                  factory.createMenuItem(StandardActions.MANAGE_EXTERNAL_FILETYPES, new EditExternalFileTypesAction()),
-                                  factory.createMenuItem(StandardActions.MANAGE_JOURNALS, new ManageJournalsAction()),
-                                  factory.createMenuItem(StandardActions.CUSTOMIZE_KEYBINDING, new CustomizeKeyBindingAction()),
-                                  factory.createMenuItem(StandardActions.MANAGE_PROTECTED_TERMS, new ManageProtectedTermsAction(this, Globals.protectedTermsLoader)),
+                factory.createMenuItem(StandardActions.SETUP_GENERAL_FIELDS, new SetupGeneralFieldsAction()),
+                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_IMPORTS, new ManageCustomImportsAction()),
+                factory.createMenuItem(StandardActions.MANAGE_CUSTOM_EXPORTS, new ManageCustomExportsAction()),
+                factory.createMenuItem(StandardActions.MANAGE_EXTERNAL_FILETYPES, new EditExternalFileTypesAction()),
+                factory.createMenuItem(StandardActions.MANAGE_JOURNALS, new ManageJournalsAction()),
+                factory.createMenuItem(StandardActions.CUSTOMIZE_KEYBINDING, new CustomizeKeyBindingAction()),
+                factory.createMenuItem(StandardActions.MANAGE_PROTECTED_TERMS, new ManageProtectedTermsAction(this, Globals.protectedTermsLoader)),
 
-                                  new SeparatorMenuItem(),
+                new SeparatorMenuItem(),
 
-                                  factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new OldDatabaseCommandWrapper(Actions.MANAGE_SELECTORS, this, Globals.stateManager)),
-                                  factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(this)),
-                                  factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this)));
+                factory.createMenuItem(StandardActions.MANAGE_CONTENT_SELECTORS, new OldDatabaseCommandWrapper(Actions.MANAGE_SELECTORS, this, Globals.stateManager)),
+                factory.createMenuItem(StandardActions.CUSTOMIZE_ENTRY_TYPES, new CustomizeEntryAction(this)),
+                factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this)));
 
         help.getItems().addAll(
                 factory.createMenuItem(StandardActions.HELP, HelpAction.getMainHelpPageCommand()),

diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java
@@ -24,7 +24,7 @@
 import javafx.scene.web.WebView;
 
 import org.jabref.Globals;
-import org.jabref.gui.externalfiles.NewDroppedFileHandler;
+import org.jabref.gui.externalfiles.ExternalFilesEntryLinker;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.keyboard.KeyBinding;
@@ -61,9 +61,9 @@ public class PreviewPanel extends ScrollPane implements SearchQueryHighlightList
     private final DialogService dialogService;
     private final KeyBindingRepository keyBindingRepository;
 
+    private final String defaultPreviewStyle = "Preview";
     private String previewStyle;
     private CitationStyle citationStyle;
-    private final String defaultPreviewStyle = "Preview";
     private Optional<BasePanel> basePanel = Optional.empty();
 
     private boolean fixedLayout;
@@ -80,7 +80,7 @@ public class PreviewPanel extends ScrollPane implements SearchQueryHighlightList
     private final WebView previewView;
     private Optional<Future<?>> citationStyleFuture = Optional.empty();
 
-    private final NewDroppedFileHandler fileHandler;
+    private final ExternalFilesEntryLinker fileLinker;
 
     /**
      * @param panel           (may be null) Only set this if the preview is associated to the main window.
@@ -93,11 +93,7 @@ public PreviewPanel(BasePanel panel, BibDatabaseContext databaseContext, KeyBind
         this.clipBoardManager = Globals.clipboardManager;
         this.keyBindingRepository = keyBindingRepository;
 
-        fileHandler = new NewDroppedFileHandler(dialogService, databaseContext, externalFileTypes,
-                                                Globals.prefs.getFilePreferences(),
-                                                Globals.prefs.getImportFormatPreferences(),
-                                                Globals.prefs.getUpdateFieldPreferences(),
-                                                Globals.getFileUpdateMonitor());
+        fileLinker = new ExternalFilesEntryLinker(externalFileTypes, Globals.prefs.getFilePreferences(), databaseContext);
 
         // Set up scroll pane for preview pane
         setFitToHeight(true);
@@ -135,19 +131,18 @@ public PreviewPanel(BasePanel panel, BibDatabaseContext databaseContext, KeyBind
                 List<Path> files = event.getDragboard().getFiles().stream().map(File::toPath).collect(Collectors.toList());
 
                 if (event.getTransferMode() == TransferMode.MOVE) {
-
                     LOGGER.debug("Mode MOVE"); //shift on win or no modifier
-                    fileHandler.addToEntryRenameAndMoveToFileDir(entry, files);
+                    fileLinker.moveFilesToFileDirAndAddToEntry(entry, files);
                 }
                 if (event.getTransferMode() == TransferMode.LINK) {
                     LOGGER.debug("Node LINK"); //alt on win
-                    fileHandler.addToEntry(entry, files);
-
+                    fileLinker.addFilesToEntry(entry, files);
                 }
                 if (event.getTransferMode() == TransferMode.COPY) {
                     LOGGER.debug("Mode Copy"); //ctrl on win, no modifier on Xubuntu
-                    fileHandler.copyFilesToFileDirAndAddToEntry(entry, files);
+                    fileLinker.copyFilesToFileDirAndAddToEntry(entry, files);
                 }
+                success = true;
             }
 
             event.setDropCompleted(success);

diff --git a/src/main/java/org/jabref/gui/SidePaneManager.java b/src/main/java/org/jabref/gui/SidePaneManager.java
@@ -31,10 +31,10 @@ public SidePaneManager(JabRefPreferences preferences, JabRefFrame frame) {
 
         OpenOfficePreferences openOfficePreferences = preferences.getOpenOfficePreferences();
         Stream.of(
-                  new FileUpdatePanel(this),
-                  new GroupSidePane(this, preferences, frame.getDialogService()),
-                  new WebSearchPane(this, preferences, frame),
-                  new OpenOfficeSidePanel(this, preferences, frame))
+                new FileUpdatePanel(this),
+                new GroupSidePane(this, preferences, frame.getDialogService()),
+                new WebSearchPane(this, preferences, frame),
+                new OpenOfficeSidePanel(this, preferences, frame))
               .forEach(pane -> components.put(pane.getType(), pane));
 
         if (preferences.getBoolean(JabRefPreferences.GROUP_SIDEPANE_VISIBLE)) {

diff --git a/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java b/src/main/java/org/jabref/gui/bibtexkeypattern/ResolveDuplicateLabelDialog.java
@@ -48,7 +48,7 @@ public ResolveDuplicateLabelDialog(BasePanel panel, String key, List<BibEntry> e
         diag = new JDialog((JFrame) null, Localization.lang("Duplicate BibTeX key"), true);
 
         FormBuilder b = FormBuilder.create().layout(new FormLayout(
-                                                                   "left:pref, 4dlu, fill:pref", "p"));
+                "left:pref, 4dlu, fill:pref", "p"));
         b.add(new JLabel(Localization.lang("Duplicate BibTeX key") + ": " + key)).xyw(1, 1, 3);
         b.getPanel().setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
 

diff --git a/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java b/src/main/java/org/jabref/gui/copyfiles/CopyFilesTask.java
@@ -112,7 +112,6 @@ protected List<CopyFilesResultItemViewModel> call() throws InterruptedException,
                             writeLogMessage(newFile, bw, localizedErrorMessage);
                             addResultToList(newFile, success, localizedErrorMessage);
                         }
-
                     }
 
                 }