Convert OO/LO SidePanel to javafx

src/main/java/org/jabref/gui/DialogService.java

@@ -139,7 +139,7 @@ default void showErrorDialogAndWait(Exception exception) {
      * @return true if the use clicked "YES" otherwise false
      */
     boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
-            String optOutMessage, Consumer<Boolean> optOutAction);
+                                                    String optOutMessage, Consumer<Boolean> optOutAction);
 
     /**
      * Create and display a new confirmation dialog.
@@ -151,8 +151,8 @@ boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
      * @return true if the use clicked "YES" otherwise false
      */
     boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
-            String okButtonLabel, String cancelButtonLabel,
-            String optOutMessage, Consumer<Boolean> optOutAction);
+                                                    String okButtonLabel, String cancelButtonLabel,
+                                                    String optOutMessage, Consumer<Boolean> optOutAction);
 
     /**
      * This will create and display a new dialog of the specified
@@ -162,7 +162,7 @@ boolean showConfirmationDialogWithOptOutAndWait(String title, String content,
      * @return Optional with the pressed Button as ButtonType
      */
     Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String title, String content,
-            ButtonType... buttonTypes);
+                                                       ButtonType... buttonTypes);
 
     /**
      * This will create and display a new dialog showing a custom {@link DialogPane}
@@ -172,6 +172,14 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      */
     Optional<ButtonType> showCustomDialogAndWait(String title, DialogPane contentPane, ButtonType... buttonTypes);
 
+    /**
+     * This will create and display a new dialog showing a custom {@link DialogPane}
+     * and using custom {@link ButtonType}s.
+     *
+     * @return The created {@link FXDialog}
+     */
+    FXDialog showCustomDialog(String title, DialogPane contentPane, ButtonType... buttonTypes);
+
     /**
      * Shows a custom dialog and returns the result.
      *
@@ -185,7 +193,7 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      *
      * @param task The {@link Task} which executes the work and for which to show the dialog
      */
-    <V> void showCanceableProgressDialogAndWait(Task<V> task);
+    <V> void showCanceableProgressDialogAndWait(Task<V> task, String title);
 
     /**
      * Notify the user in an non-blocking way (i.e., in form of toast in a snackbar).

src/main/java/org/jabref/gui/FXDialogService.java

@@ -220,14 +220,26 @@ public Optional<ButtonType> showCustomDialogAndWait(String title, DialogPane con
         return alert.showAndWait();
     }
 
+    @Override
+    public FXDialog showCustomDialog(String title, DialogPane contentPane,
+            ButtonType... buttonTypes) {
+        FXDialog alert = new FXDialog(AlertType.NONE, title);
+        alert.setDialogPane(contentPane);
+        alert.getButtonTypes().setAll(buttonTypes);
+        alert.getDialogPane().setMinHeight(Region.USE_PREF_SIZE);
+        alert.setResizable(true);
+        return alert;
+    }
+
     @Override
     public <R> Optional<R> showCustomDialogAndWait(Dialog<R> dialog) {
         return dialog.showAndWait();
     }
 
     @Override
-    public <V> void showCanceableProgressDialogAndWait(Task<V> task) {
+    public <V> void showCanceableProgressDialogAndWait(Task<V> task, String title) {
         ProgressDialog progressDialog = new ProgressDialog(task);
+        progressDialog.setTitle(title);
         progressDialog.setOnCloseRequest(evt -> task.cancel());
         DialogPane dialogPane = progressDialog.getDialogPane();
         dialogPane.getButtonTypes().add(ButtonType.CANCEL);

src/main/java/org/jabref/gui/SidePaneManager.java

@@ -33,8 +33,8 @@ public SidePaneManager(JabRefPreferences preferences, JabRefFrame frame) {
         Stream.of(
                   new FileUpdatePanel(this),
                   new GroupSidePane(this, preferences, frame.getDialogService()),
-                new WebSearchPane(this, preferences, frame),
-                  new OpenOfficeSidePanel(this, openOfficePreferences, frame))
+                  new WebSearchPane(this, preferences, frame),
+                  new OpenOfficeSidePanel(this, preferences, frame))
               .forEach(pane -> components.put(pane.getType(), pane));
 
         if (preferences.getBoolean(JabRefPreferences.GROUP_SIDEPANE_VISIBLE)) {

src/main/java/org/jabref/gui/actions/CopyFilesAction.java

@@ -34,7 +34,7 @@ public CopyFilesAction(JabRefFrame frame) {
 
     private void startServiceAndshowProgessDialog(Task<List<CopyFilesResultItemViewModel>> exportService) {
 
-        dialogService.showCanceableProgressDialogAndWait(exportService);
+        dialogService.showCanceableProgressDialogAndWait(exportService, Localization.lang("Copy linked files to folder..."));
 
         exportService.run();
         exportService.setOnSucceeded((e) -> {

src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialog.fxml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.ButtonType?>
+<?import javafx.scene.control.DialogPane?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.RadioButton?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.control.ToggleGroup?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<DialogPane prefHeight="182.0" prefWidth="390.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.openoffice.AdvancedCiteDialogView">
+   <content>
+      <VBox>
+         <fx:define>
+              <ToggleGroup fx:id="citeToggleGroup" />
+         </fx:define>
+         <children>
+            <RadioButton fx:id="inPar" minWidth="-Infinity" mnemonicParsing="false" text="%Cite selected entries between parenthesis">
+               <toggleGroup>
+                  <ToggleGroup fx:id="citeToggleGroup" />
+               </toggleGroup>
+            </RadioButton>
+            <RadioButton fx:id="inText" minWidth="-Infinity" mnemonicParsing="false" text="%Cite selected entries with in-text citation" toggleGroup="$citeToggleGroup" />
+            <Label minWidth="-Infinity" text="%Extra information (e.g. page number)" />
+            <TextField fx:id="pageInfo" />
+         </children>
+      </VBox>
+   </content>
+  <buttonTypes>
+    <ButtonType fx:constant="CANCEL" />
+    <ButtonType fx:constant="OK" />
+  </buttonTypes>
+</DialogPane>

src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogView.java

@@ -0,0 +1,46 @@
+package org.jabref.gui.openoffice;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.ButtonType;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
+
+import org.jabref.gui.util.BaseDialog;
+import org.jabref.logic.l10n.Localization;
+
+import com.airhacks.afterburner.views.ViewLoader;
+
+public class AdvancedCiteDialogView extends BaseDialog<AdvancedCiteDialogViewModel> {
+
+    @FXML private TextField pageInfo;
+    @FXML private RadioButton inPar;
+    @FXML private RadioButton inText;
+    @FXML private ToggleGroup citeToggleGroup;
+    private AdvancedCiteDialogViewModel viewModel;
+
+    public AdvancedCiteDialogView() {
+
+        ViewLoader.view(this)
+                  .load()
+                  .setAsDialogPane(this);
+        setResultConverter(btn -> {
+            if (btn == ButtonType.OK) {
+                return viewModel;
+            }
+            return null;
+        });
+
+        setTitle(Localization.lang("Cite special"));
+    }
+
+    @FXML
+    private void initialize() {
+        viewModel = new AdvancedCiteDialogViewModel();
+
+        inPar.selectedProperty().bindBidirectional(viewModel.citeInParProperty());
+        inText.selectedProperty().bindBidirectional(viewModel.citeInTextProperty());
+        pageInfo.textProperty().bindBidirectional(viewModel.pageInfoProperty());
+
+    }
+}

src/main/java/org/jabref/gui/openoffice/AdvancedCiteDialogViewModel.java

@@ -0,0 +1,25 @@
+package org.jabref.gui.openoffice;
+
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+public class AdvancedCiteDialogViewModel {
+
+    private final StringProperty pageInfo = new SimpleStringProperty("");
+    private final BooleanProperty citeInPar = new SimpleBooleanProperty();
+    private final BooleanProperty citeInText = new SimpleBooleanProperty();
+
+    public StringProperty pageInfoProperty() {
+        return pageInfo;
+    }
+
+    public BooleanProperty citeInParProperty() {
+        return citeInPar;
+    }
+
+    public BooleanProperty citeInTextProperty() {
+        return citeInText;
+    }
+}

src/main/java/org/jabref/gui/openoffice/BibEntryNotFoundException.java

@@ -4,7 +4,6 @@ class BibEntryNotFoundException extends Exception {
 
     private final String bibtexKey;
 
-
     public BibEntryNotFoundException(String bibtexKey, String message) {
         super(message);
 

src/main/java/org/jabref/gui/openoffice/CitationEntryViewModel.java

@@ -0,0 +1,40 @@
+package org.jabref.gui.openoffice;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.logic.openoffice.CitationEntry;
+
+public class CitationEntryViewModel {
+
+    private final StringProperty citation = new SimpleStringProperty("");
+    private final StringProperty extraInformation = new SimpleStringProperty("");
+    private final String refMarkName;
+
+    public CitationEntryViewModel(String refMarkName, String citation, String extraInfo) {
+        this.refMarkName = refMarkName;
+        this.citation.setValue(citation);
+        this.extraInformation.setValue(extraInfo);
+    }
+
+    public CitationEntryViewModel(CitationEntry citationEntry) {
+        this(citationEntry.getRefMarkName(), citationEntry.getContext(), citationEntry.getPageInfo().orElse(""));
+    }
+
+    public CitationEntry toCitationEntry() {
+        return new CitationEntry(refMarkName, citation.getValue(), extraInformation.getValue());
+    }
+
+    public StringProperty citationProperty() {
+        return citation;
+    }
+
+    public StringProperty extraInformationProperty() {
+        return extraInformation;
+    }
+
+    public void setExtraInfo(String extraInfo) {
+        extraInformation.setValue(extraInfo);
+    }
+
+}