JabRef · tobiasdiez · Mar 5, 2018 · Mar 2, 2018 · Mar 2, 2018 · Mar 2, 2018
diff --git a/src/main/java/org/jabref/gui/DialogService.java b/src/main/java/org/jabref/gui/DialogService.java
@@ -130,7 +130,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.
@@ -142,8 +142,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
@@ -153,7 +153,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}
@@ -236,5 +236,4 @@ Optional<ButtonType> showCustomButtonDialogAndWait(Alert.AlertType type, String
      */
     boolean showPrintDialog(PrinterJob job);
 
-
 }
diff --git a/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java b/src/main/java/org/jabref/gui/exporter/SaveDatabaseAction.java
@@ -9,8 +9,8 @@
 import javax.swing.JOptionPane;
 import javax.swing.JTextArea;
 
-import javafx.scene.control.ButtonType;
 import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.ButtonType;
 
 import org.jabref.Globals;
 import org.jabref.JabRefExecutorService;

diff --git a/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java b/src/main/java/org/jabref/gui/openoffice/OpenOfficePanel.java
@@ -637,14 +637,11 @@ private boolean checkThatEntriesHaveKeys(List<BibEntry> entries) {
         }
 
         // Ask if keys should be generated
-        String[] options = {Localization.lang("Generate keys"), Localization.lang("Cancel")};
-
         boolean citePressed = frame.getDialogService().showConfirmationDialogAndWait(Localization.lang("Cite"),
                 Localization.lang("Cannot cite entries without BibTeX keys. Generate keys now?"),
                 Localization.lang("Generate keys"),
                 Localization.lang("Cancel"));
 
-
         BasePanel panel = frame.getCurrentBasePanel();
         if (citePressed && (panel != null)) {
             // Generate keys
@@ -672,41 +669,30 @@ private boolean checkThatEntriesHaveKeys(List<BibEntry> entries) {
     private void showConnectionLostErrorMessage() {
         frame.getDialogService().showErrorDialogAndWait(Localization.lang("Connection lost"),
                 Localization.lang("Connection to OpenOffice/LibreOffice has been lost. "
-                + "Please make sure OpenOffice/LibreOffice is running, and try to reconnect."));
+                        + "Please make sure OpenOffice/LibreOffice is running, and try to reconnect."));
 
     }
 
     private void reportUndefinedParagraphFormat(UndefinedParagraphFormatException ex) {
         //TODO: Javafx does not support html as far as I know
-        JOptionPane
-                .showMessageDialog(
-                        null, "<html>"
-                                + Localization.lang(
-                                        "Your style file specifies the paragraph format '%0', "
-                                                + "which is undefined in your current OpenOffice/LibreOffice document.",
-                                        ex.getFormatName())
-                                + "<br>"
-                                + Localization
-                                        .lang("The paragraph format is controlled by the property 'ReferenceParagraphFormat' or 'ReferenceHeaderParagraphFormat' in the style file.")
-                                + "</html>",
-                        "", JOptionPane.ERROR_MESSAGE);
+
+        frame.getDialogService().showErrorDialogAndWait(Localization.lang("Undefined paragraph format"),
+                Localization.lang("Your style file specifies the paragraph format '%0' which is undefined in your current OpenOffice/LibreOffice document.",
+                        ex.getFormatName()) + "\n" +
+                        Localization.lang("The paragraph format is controlled by the property 'ReferenceParagraphFormat' or 'ReferenceHeaderParagraphFormat' in the style file."));
+
     }
 
     private void reportUndefinedCharacterFormat(UndefinedCharacterFormatException ex) {
         //TODO: Javafx does not support html as far as I know
 
-        JOptionPane
-                .showMessageDialog(
-                        null, "<html>"
-                                + Localization.lang(
-                                        "Your style file specifies the character format '%0', "
-                                                + "which is undefined in your current OpenOffice/LibreOffice document.",
-                                        ex.getFormatName())
-                                + "<br>"
-                                + Localization
-                                        .lang("The character format is controlled by the citation property 'CitationCharacterFormat' in the style file.")
-                                + "</html>",
-                        "", JOptionPane.ERROR_MESSAGE);
+        frame.getDialogService().showErrorDialogAndWait(Localization.lang("Undefined character format"),
+                Localization.lang(
+                        "Your style file specifies the character format '%0', which is undefined in your current OpenOffice/LibreOffice document.",
+                        ex.getFormatName()) + "\n"
+                        + Localization.lang("The character format is controlled by the citation property 'CitationCharacterFormat' in the style file.")
+
+        );
     }
 
     private void showSettingsPopup() {

diff --git a/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java b/src/main/java/org/jabref/gui/protectedterms/NewProtectedTermsFileDialog.java
@@ -63,7 +63,6 @@ private void setupDialog() {
                 .withDefaultExtension(FileType.TERMS)
                 .withInitialDirectory(Globals.prefs.get(JabRefPreferences.WORKING_DIRECTORY)).build();
 
-
         browse.addActionListener(e -> {
             Optional<Path> file = DefaultTaskExecutor
                     .runInJavaFXThread(() -> dialogService.showFileSaveDialog(fileDialogConfiguration));

diff --git a/src/main/java/org/jabref/logic/l10n/Encodings.java b/src/main/java/org/jabref/logic/l10n/Encodings.java
@@ -11,6 +11,9 @@ public class Encodings {
     private static List<Charset> encodingsList = Charset.availableCharsets().values().stream().distinct()
             .collect(Collectors.toList());
 
+    private Encodings() {
+    }
+
     static {
         List<String> encodingsStringList = encodingsList.stream().map(Charset::displayName).distinct()
                 .collect(Collectors.toList());
@@ -22,7 +25,4 @@ public static List<Charset> getCharsets() {
         return encodingsList;
     }
 
-    private Encodings() {
-    }
-
 }