[WIP] Main table JavaFX migration

.travis.yml

@@ -60,6 +60,7 @@ after_failure:
 branches:
   only:
     - master
+    - maintable-beta
 
 # cache gradle dependencies
 # https://docs.travis-ci.com/user/languages/java#Caching

build.gradle

@@ -81,6 +81,7 @@ configurations {
 }
 
 dependencies {
+    // Include all jar-files in the 'lib' folder as dependencies
     compile fileTree(dir: 'lib', includes: ['*.jar'])
 
     compile 'com.jgoodies:jgoodies-common:1.8.1'
@@ -112,20 +113,21 @@ dependencies {
     // VersionEye states that 6.0.5 is the most recent version, but http://dev.mysql.com/downloads/connector/j/ shows that as "Development Release"
     compile 'mysql:mysql-connector-java:5.1.46'
 
-    compile 'com.impossibl.pgjdbc-ng:pgjdbc-ng:0.7.1'
+    compile 'org.postgresql:postgresql:42.2.2'
 
     compile 'net.java.dev.glazedlists:glazedlists_java15:1.9.1'
 
     compile 'com.google.guava:guava:25.1-jre'
 
     // JavaFX stuff
-    compile 'com.airhacks:afterburner.fx:1.7.0'
-    compile 'de.codecentric.centerdevice:javafxsvg:1.3.0'
     compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4'
     compile 'de.saxsys:mvvmfx-validation:1.7.0'
+    compile 'de.saxsys:mvvmfx:1.7.0'
     compile 'org.fxmisc.easybind:easybind:1.0.3'
     compile 'org.fxmisc.flowless:flowless:0.6.1'
     compile 'org.fxmisc.richtext:richtextfx:0.9.0'
+    compile 'com.sibvisions.external.jvxfx:dndtabpane:0.1'
+    compile 'javax.inject:javax.inject:1'
 
     // Cannot be updated to 9.*.* until Jabref works with Java 9
     compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT'
@@ -165,7 +167,7 @@ dependencies {
     testCompile 'org.xmlunit:xmlunit-matchers:2.6.0'
     testCompile 'com.tngtech.archunit:archunit-junit:0.8.0'
     testCompile "org.testfx:testfx-core:4.0.+"
-    testCompile "org.testfx:testfx-junit:4.0.+"
+    testCompile "org.testfx:testfx-junit5:4.0.+"
 
     checkstyle 'com.puppycrawl.tools:checkstyle:8.10.1'
 }

config/README.md

@@ -15,3 +15,16 @@ Style-checks are done for each pull request and installing this cody style confi
 10. Press "OK"
 
 * Please let `.editorconfig` override the settings of IntelliJ
+
+
+# Eclipse:
+
+The Eclipse code formatter style is stored in the `eclipse.gradle` file and gets imported automatically.
+In case the formatter style needs to be adapted, configure it and export in in eclipse.
+
+1. Right click on the eclipse project "JabRef"
+2. Select "Export > General > Preferences"
+3. Select "Java Code Style preferences"
+4. Choose output file
+5. Compare the formatter settings in the epf file with the ones in the eclipse.gradle file (`org.eclipse.jdt.core.formatter.`)
+6. Replace the Eclipse Code Style.epf with the exported epf file

external-libraries.txt

@@ -80,6 +80,11 @@ Project: Application Insights SDK for Java
 URL:     https://github.com/Microsoft/ApplicationInsights-Java
 License: MIT
 
+Id:      com.sibvisions.external.jvxfx:DnDTabPane
+Project: Drag'n'Drop TabPane
+URL:     https://github.com/sibvisions/javafx.DndTabPane
+License: EPL-1.0
+
 Id:      commons-cli:commons-cli
 Project: Apache Commons CLI
 URL:     http://commons.apache.org/cli/

javafx/scene/control/annotations.xml

@@ -0,0 +1,5 @@
+<root>
+    <item name='javafx.scene.control.Dialog dialogPane'>
+        <annotation name='javafx.fxml.FXML'/>
+    </item>
+</root>

src/main/java/org/jabref/Globals.java

@@ -5,12 +5,14 @@
 import java.util.Optional;
 import java.util.UUID;
 
+import org.jabref.gui.ClipBoardManager;
 import org.jabref.gui.GlobalFocusListener;
 import org.jabref.gui.StateManager;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.util.DefaultFileUpdateMonitor;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.gui.util.TaskExecutor;
+import org.jabref.gui.util.ThemeLoader;
 import org.jabref.logic.exporter.ExporterFactory;
 import org.jabref.logic.importer.ImportFormatReader;
 import org.jabref.logic.journals.JournalAbbreviationLoader;
@@ -49,13 +51,17 @@ public class Globals {
     /**
      * Manager for the state of the GUI.
      */
+
+    public static ClipBoardManager clipboardManager = new ClipBoardManager();
+
     public static StateManager stateManager = new StateManager();
     public static ExporterFactory exportFactory;
     // Key binding preferences
     private static KeyBindingRepository keyBindingRepository;
     // Background tasks
     private static GlobalFocusListener focusListener;
     private static DefaultFileUpdateMonitor fileUpdateMonitor;
+    private static ThemeLoader themeLoader;
     private static TelemetryClient telemetryClient;
 
     private Globals() {
@@ -69,14 +75,15 @@ public static synchronized KeyBindingRepository getKeyPrefs() {
         return keyBindingRepository;
     }
 
-
     // Background tasks
     public static void startBackgroundTasks() {
         Globals.focusListener = new GlobalFocusListener();
 
         Globals.fileUpdateMonitor = new DefaultFileUpdateMonitor();
         JabRefExecutorService.INSTANCE.executeInterruptableTask(Globals.fileUpdateMonitor, "FileUpdateMonitor");
 
+        themeLoader = new ThemeLoader(fileUpdateMonitor);
+
         if (Globals.prefs.shouldCollectTelemetry() && !GraphicsEnvironment.isHeadless()) {
             startTelemetryClient();
         }
@@ -126,4 +133,8 @@ public static void stopBackgroundTasks() {
     public static Optional<TelemetryClient> getTelemetryClient() {
         return Optional.ofNullable(telemetryClient);
     }
+
+    public static ThemeLoader getThemeLoader() {
+        return themeLoader;
+    }
 }

src/main/java/org/jabref/JabRefExecutorService.java

@@ -140,7 +140,7 @@ public void shutdownEverything() {
         this.lowPriorityExecutorService.shutdownNow();
         // kill the remote thread
         stopRemoteThread();
-        // timer doesn't need to be canceled as it is run in daemon mode, which ensures that it is stopped if the application is shut down
+        timer.cancel();
     }
 
     private class NamedRunnable implements Runnable {

src/main/java/org/jabref/JabRefGUI.java

@@ -1,7 +1,6 @@
 package org.jabref;
 
 import java.awt.Font;
-import java.awt.Frame;
 import java.io.File;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -10,16 +9,21 @@
 import java.util.Iterator;
 import java.util.List;
 
-import javax.swing.JOptionPane;
 import javax.swing.UIDefaults;
 import javax.swing.UIManager;
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.plaf.FontUIResource;
 
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
 import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.FXDialogService;
 import org.jabref.gui.GUIGlobals;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.dialogs.BackupUIManager;
+import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.importer.ParserResultWarningDialog;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
 import org.jabref.gui.shared.SharedDatabaseUIManager;
@@ -41,30 +45,34 @@
 public class JabRefGUI {
 
     private static final String NIMBUS_LOOK_AND_FEEL = "javax.swing.plaf.nimbus.NimbusLookAndFeel";
+    private static final String WINDOWS_LOOK_AND_FEEL = "com.sun.java.swing.plaf.windows.WindowsLookAndFeel";
+    private static final String OSX_AQUA_LOOk_AND_FEEL = "apple.laf.AquaLookAndFeel";
+
     private static final Logger LOGGER = LoggerFactory.getLogger(JabRefGUI.class);
-    private static final String GTK_LF_CLASSNAME = "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
 
     private static JabRefFrame mainFrame;
 
     private final List<ParserResult> bibDatabases;
     private final boolean isBlank;
     private final List<ParserResult> failed = new ArrayList<>();
     private final List<ParserResult> toOpenTab = new ArrayList<>();
+    private final DialogService dialogService;
 
     private final String focusedFile;
 
-    public JabRefGUI(List<ParserResult> argsDatabases, boolean isBlank) {
+    public JabRefGUI(Stage mainStage, List<ParserResult> argsDatabases, boolean isBlank) {
         this.bibDatabases = argsDatabases;
         this.isBlank = isBlank;
+        this.dialogService = new FXDialogService(mainStage);
 
         // passed file (we take the first one) should be focused
         focusedFile = argsDatabases.stream()
-                .findFirst()
-                .flatMap(ParserResult::getFile)
-                .map(File::getAbsolutePath)
-                .orElse(Globals.prefs.get(JabRefPreferences.LAST_FOCUSED));
+                                   .findFirst()
+                                   .flatMap(ParserResult::getFile)
+                                   .map(File::getAbsolutePath)
+                                   .orElse(Globals.prefs.get(JabRefPreferences.LAST_FOCUSED));
 
-        openWindow();
+        openWindow(mainStage);
         JabRefGUI.checkForNewVersion(false);
     }
 
@@ -74,13 +82,7 @@ public static void checkForNewVersion(boolean manualExecution) {
         new VersionWorker(JabRefGUI.getMainFrame(), manualExecution, currentVersion, toBeIgnored).execute();
     }
 
-    private void openWindow() {
-
-        // This property is set to make the Mac OSX Java VM move the menu bar to the top of the screen
-        if (OS.OS_X) {
-            System.setProperty("apple.laf.useScreenMenuBar", "true");
-        }
-
+    private void openWindow(Stage mainStage) {
         // Set antialiasing on everywhere. This only works in JRE >= 1.5.
         // Or... it doesn't work, period.
         // TODO test and maybe remove this! I found this commented out with no additional info ( payload@lavabit.com )
@@ -101,7 +103,7 @@ private void openWindow() {
         GUIGlobals.init();
 
         LOGGER.debug("Initializing frame");
-        JabRefGUI.mainFrame = new JabRefFrame();
+        JabRefGUI.mainFrame = new JabRefFrame(mainStage);
 
         // Add all bibDatabases databases to the frame:
         boolean first = false;
@@ -120,14 +122,15 @@ private void openWindow() {
                     try {
                         new SharedDatabaseUIManager(mainFrame).openSharedDatabaseFromParserResult(pr);
                     } catch (SQLException | DatabaseNotSupportedException | InvalidDBMSConnectionPropertiesException |
-                            NotASharedDatabaseException e) {
+                             NotASharedDatabaseException e) {
                         pr.getDatabaseContext().clearDatabaseFile(); // do not open the original file
                         pr.getDatabase().clearSharedDatabaseID();
 
                         LOGGER.error("Connection error", e);
-                        JOptionPane.showMessageDialog(mainFrame,
-                                e.getMessage() + "\n\n" + Localization.lang("A local copy will be opened."),
-                                Localization.lang("Connection error"), JOptionPane.WARNING_MESSAGE);
+                        dialogService.showErrorDialogAndWait(
+                                                             Localization.lang("Connection error"),
+                                                             Localization.lang("A local copy will be opened."),
+                                                             e);
                     }
                     toOpenTab.add(pr);
                 } else if (pr.toOpenTab()) {
@@ -151,18 +154,29 @@ private void openWindow() {
         // state. This needs to be set after the window has been made visible, so we
         // do it here:
         if (Globals.prefs.getBoolean(JabRefPreferences.WINDOW_MAXIMISED)) {
-            JabRefGUI.getMainFrame().setExtendedState(Frame.MAXIMIZED_BOTH);
+            mainStage.setMaximized(true);
         }
 
-        JabRefGUI.getMainFrame().setVisible(true);
+        Scene scene = new Scene(JabRefGUI.mainFrame, 800, 800);
+        Globals.getThemeLoader().installBaseCss(scene);
+        mainStage.setTitle(JabRefFrame.FRAME_TITLE);
+        mainStage.getIcons().addAll(IconTheme.getLogoSetFX());
+        mainStage.setScene(scene);
+        mainStage.show();
+
+        mainStage.setOnCloseRequest(event -> {
+            boolean reallyQuit = mainFrame.quit();
+            if (!reallyQuit) {
+                event.consume();
+            }
+        });
 
         for (ParserResult pr : failed) {
-            String message = "<html>" + Localization.lang("Error opening file '%0'.", pr.getFile().get().getName())
-                    + "<p>"
-                    + pr.getErrorMessage() + "</html>";
+            String message = Localization.lang("Error opening file '%0'.", pr.getFile().get().getName()) + "\n"
+                             + pr.getErrorMessage();
+
+            dialogService.showErrorDialogAndWait(Localization.lang("Error opening file"), message);
 
-            JOptionPane.showMessageDialog(JabRefGUI.getMainFrame(), message, Localization.lang("Error opening file"),
-                    JOptionPane.ERROR_MESSAGE);
         }
 
         // Display warnings, if any
@@ -187,10 +201,6 @@ private void openWindow() {
         }
 
         LOGGER.debug("Finished adding panels");
-
-        if (!bibDatabases.isEmpty()) {
-            JabRefGUI.getMainFrame().getCurrentBasePanel().getMainTable().requestFocus();
-        }
     }
 
     private void openLastEditedDatabases() {
@@ -208,11 +218,11 @@ private void openLastEditedDatabases() {
             }
 
             if (BackupManager.checkForBackupFile(dbFile.toPath())) {
-                BackupUIManager.showRestoreBackupDialog(mainFrame, dbFile.toPath());
+                BackupUIManager.showRestoreBackupDialog(dialogService, dbFile.toPath());
             }
 
             ParserResult parsedDatabase = OpenDatabase.loadDatabase(fileName,
-                    Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
+                                                                    Globals.prefs.getImportFormatPreferences(), Globals.getFileUpdateMonitor());
 
             if (parsedDatabase.isEmpty()) {
                 LOGGER.error(Localization.lang("Error opening file") + " '" + dbFile.getPath() + "'");
@@ -233,50 +243,30 @@ private boolean isLoaded(File fileToOpen) {
 
     private void setLookAndFeel() {
         try {
-            String lookFeel;
-            String systemLookFeel = UIManager.getSystemLookAndFeelClassName();
-
-            if (Globals.prefs.getBoolean(JabRefPreferences.USE_DEFAULT_LOOK_AND_FEEL)) {
-                // FIXME: Problems with GTK L&F on Linux and Mac. Needs reevaluation for Java9
-                if (GTK_LF_CLASSNAME.equals(systemLookFeel)) {
-                    lookFeel = NIMBUS_LOOK_AND_FEEL;
-                    LOGGER.warn("There seems to be problems with GTK Look&Feel. Using Nimbus L&F instead. Change to another L&F with caution.");
-                } else {
-                    lookFeel = systemLookFeel;
-                }
-            } else {
-                lookFeel = Globals.prefs.get(JabRefPreferences.WIN_LOOK_AND_FEEL);
-            }
 
-            //Prevent metal l&f
-            if (UIManager.getCrossPlatformLookAndFeelClassName().equals(lookFeel)) {
-                UIManager.setLookAndFeel(NIMBUS_LOOK_AND_FEEL);
+            if (OS.WINDOWS) {
+                UIManager.setLookAndFeel(WINDOWS_LOOK_AND_FEEL);
+            }
+            if (OS.OS_X) {
+                UIManager.setLookAndFeel(OSX_AQUA_LOOk_AND_FEEL);
             } else {
-                try {
-                    UIManager.setLookAndFeel(lookFeel);
-                } catch (ClassNotFoundException | InstantiationException | IllegalAccessException |
-                        UnsupportedLookAndFeelException e) {
-                    // specified look and feel does not exist on the classpath, so use system l&f
-                    UIManager.setLookAndFeel(systemLookFeel);
-                    // also set system l&f as default
-                    Globals.prefs.put(JabRefPreferences.WIN_LOOK_AND_FEEL, systemLookFeel);
-                    // notify the user
-                    JOptionPane.showMessageDialog(JabRefGUI.getMainFrame(),
-                            Localization
-                                    .lang("Unable to find the requested look and feel and thus the default one is used."),
-                            Localization.lang("Warning"), JOptionPane.WARNING_MESSAGE);
-                    LOGGER.warn("Unable to find requested look and feel", e);
-                }
+                UIManager.setLookAndFeel(NIMBUS_LOOK_AND_FEEL);
             }
-
             // On Linux, Java FX fonts look blurry per default. This can be improved by using a non-default rendering
             // setting. See https://github.com/woky/javafx-hates-linux
             if (Globals.prefs.getBoolean(JabRefPreferences.FX_FONT_RENDERING_TWEAK)) {
                 System.setProperty("prism.text", "t2k");
                 System.setProperty("prism.lcdtext", "true");
             }
-        } catch (Exception e) {
-            LOGGER.warn("Look and feel could not be set", e);
+        } catch (UnsupportedLookAndFeelException | ClassNotFoundException | InstantiationException | IllegalAccessException e) {
+            try {
+                LOGGER.warn("Setting Look and Feel to Nimbus", e);
+
+                UIManager.setLookAndFeel(NIMBUS_LOOK_AND_FEEL);
+            } catch (Exception ex) {
+                LOGGER.warn("Look and feel could not be set", e);
+            }
+
         }
 
         // In JabRef v2.8, we did it only on NON-Mac. Now, we try on all platforms