JabRef · koppor · Jun 3, 2018 · Jan 29, 2018 · Jan 30, 2018 · Jan 30, 2018
diff --git a/.travis.yml b/.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

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,10 +19,12 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - Reorganised annotation information on the right side of the "File annotations" tab. [#3109](https://github.com/JabRef/jabref/issues/3109)
 - We now show a small notification icon in the entry editor when we detect data inconsistency or other problems. [#3145](https://github.com/JabRef/jabref/issues/3145)
 - We added [oaDOI](https://oadoi.org/) as a fulltext provider, so that JabRef is now able to provide fulltexts for more than 90 million open-access articles.
+- We completely reworked and redesigned the main table.
 - We changed one default of [Cleanup entries dialog](http://help.jabref.org/en/CleanupEntries): Per default, the PDF are not moved to the default file directory anymore. [#3619](https://github.com/JabRef/jabref/issues/3619)
 - We added a new type of group that shows all items referenced in a given LaTeX file (actually the generated AUX file). [#1664](https://github.com/JabRef/jabref/issues/1664)
 - We added an importer for the EndNote XML format. [Feature request in the forum](http://discourse.jabref.org/t/import-from-bookends-or-endnote/1048)
 - We added the export of the `translator` field to the according MS-Office XML field. [#1750, comment](https://github.com/JabRef/jabref/issues/1750#issuecomment-357350986)
+- We added the export of the the `translator` field to the according MS-Office XML field. [#1750, comment](https://github.com/JabRef/jabref/issues/1750#issuecomment-357350986)
 - We changed the import of the MS-Office XML fields `bookauthor` and `translator`. Both are now imported to their corresponding bibtex/biblatex fields.
 - We improved the export of the `address` and `location` field to the MS-Office XML fields. If the address field does not contain a comma, it is treated as single value and exported to the field `city`. [#1750, comment](https://github.com/JabRef/jabref/issues/1750#issuecomment-357539167)
 For more details refer to the [field mapping help page](http://help.jabref.org/en/MsOfficeBibFieldMapping)

diff --git a/build.gradle b/build.gradle
@@ -127,9 +127,12 @@ dependencies {
     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'
     compile 'org.fxmisc.richtext:richtextfx:0.8.2'
+    compile 'com.sibvisions.external.jvxfx:dndtabpane:0.1'
+
 
     // Cannot be updated to 9.*.* until Jabref works with Java 9
     compile 'org.controlsfx:controlsfx:8.40.15-SNAPSHOT'
@@ -169,7 +172,7 @@ dependencies {
     testCompile 'org.xmlunit:xmlunit-matchers:2.5.1'
     testCompile 'com.tngtech.archunit:archunit-junit:0.5.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.8'
 }

diff --git a/external-libraries.txt b/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/

diff --git a/lib/customjfx-1.0.0.jar b/lib/customjfx-1.0.0.jar
diff --git a/src/main/java/org/jabref/Globals.java b/src/main/java/org/jabref/Globals.java
@@ -5,6 +5,7 @@
 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;
@@ -50,6 +51,9 @@ 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
@@ -70,7 +74,6 @@ public static synchronized KeyBindingRepository getKeyPrefs() {
         return keyBindingRepository;
     }
 
-
     // Background tasks
     public static void startBackgroundTasks() {
         Globals.focusListener = new GlobalFocusListener();

diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
@@ -1,6 +1,5 @@
 package org.jabref;
 
-import java.awt.Frame;
 import java.io.File;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -15,8 +14,16 @@
 import javax.swing.UnsupportedLookAndFeelException;
 import javax.swing.plaf.FontUIResource;
 
+import javafx.application.Platform;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+import org.jabref.gui.AbstractView;
 import org.jabref.gui.BasePanel;
+import org.jabref.gui.DialogService;
+import org.jabref.gui.FXDialogService;
 import org.jabref.gui.GUIGlobals;
+import org.jabref.gui.IconTheme;
 import org.jabref.gui.JabRefFrame;
 import org.jabref.gui.dialogs.BackupUIManager;
 import org.jabref.gui.importer.ParserResultWarningDialog;
@@ -29,7 +36,6 @@
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.shared.exception.InvalidDBMSConnectionPropertiesException;
 import org.jabref.logic.shared.exception.NotASharedDatabaseException;
-import org.jabref.logic.util.OS;
 import org.jabref.logic.util.Version;
 import org.jabref.model.database.shared.DatabaseNotSupportedException;
 import org.jabref.preferences.JabRefPreferences;
@@ -46,18 +52,20 @@ public class JabRefGUI {
     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));
 
-        openWindow();
+        openWindow(mainStage);
         JabRefGUI.checkForNewVersion(false);
     }
 
@@ -67,13 +75,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 )
@@ -94,7 +96,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;
@@ -118,7 +120,7 @@ private void openWindow() {
                         pr.getDatabase().clearSharedDatabaseID();
 
                         LOGGER.error("Connection error", e);
-                        JOptionPane.showMessageDialog(mainFrame,
+                        JOptionPane.showMessageDialog(null,
                                 e.getMessage() + "\n\n" + Localization.lang("A local copy will be opened."),
                                 Localization.lang("Connection error"), JOptionPane.WARNING_MESSAGE);
                     }
@@ -144,18 +146,27 @@ 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);
+        scene.getStylesheets().add(AbstractView.class.getResource("Main.css").toExternalForm());
+        mainStage.setTitle(JabRefFrame.FRAME_TITLE);
+        mainStage.getIcons().addAll(IconTheme.getLogoSetFX());
+        mainStage.setScene(scene);
+        mainStage.show();
+
+        mainStage.setOnCloseRequest(event -> {
+            mainFrame.quit();
+            Platform.exit();
+        });
 
         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
@@ -180,10 +191,6 @@ private void openWindow() {
         }
 
         LOGGER.debug("Finished adding panels");
-
-        if (!bibDatabases.isEmpty()) {
-            JabRefGUI.getMainFrame().getCurrentBasePanel().getMainTable().requestFocus();
-        }
     }
 
     private void openLastEditedDatabases() {
@@ -201,7 +208,7 @@ private void openLastEditedDatabases() {
             }
 
             if (BackupManager.checkForBackupFile(dbFile.toPath())) {
-                BackupUIManager.showRestoreBackupDialog(mainFrame, dbFile.toPath());
+                BackupUIManager.showRestoreBackupDialog(dialogService, dbFile.toPath());
             }
 
             ParserResult parsedDatabase = OpenDatabase.loadDatabase(fileName,
@@ -259,11 +266,11 @@ private void setLookAndFeel() {
                     // 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);
+                    dialogService.showWarningDialogAndWait(Localization.lang("Warning"),
+                            Localization.lang("Unable to find the requested look and feel and thus the default one is used."));
+
                 }
             }
 

diff --git a/src/main/java/org/jabref/JabRefMain.java b/src/main/java/org/jabref/JabRefMain.java
@@ -4,7 +4,6 @@
 
 import javax.swing.JFrame;
 import javax.swing.JOptionPane;
-import javax.swing.SwingUtilities;
 
 import javafx.application.Application;
 import javafx.application.Platform;
@@ -46,12 +45,6 @@ public static void main(String[] args) {
         launch(arguments);
     }
 
-    @Override
-    public void start(Stage mainStage) throws Exception {
-        Platform.setImplicitExit(false);
-        SwingUtilities.invokeLater(() -> start(arguments));
-    }
-
     /**
      * Tests if we are running an acceptable Java and terminates JabRef when we are sure the version is not supported.
      * This test uses the requirements for the Java version as specified in <code>gradle.build</code>. It is possible to
@@ -88,7 +81,7 @@ private static void ensureCorrectJavaVersion() {
                 versionError.append(Localization.lang("Note that currently, JabRef does not run with Java 9."));
             }
             final JFrame frame = new JFrame();
-            JOptionPane.showMessageDialog(frame, versionError, Localization.lang("Error"), JOptionPane.ERROR_MESSAGE);
+            JOptionPane.showMessageDialog(null, versionError, Localization.lang("Error"), JOptionPane.ERROR_MESSAGE);
             frame.dispose();
 
             // We exit on Java 9 error since this will definitely not work
@@ -98,7 +91,8 @@ private static void ensureCorrectJavaVersion() {
         }
     }
 
-    private static void start(String[] args) {
+    @Override
+    public void start(Stage mainStage) throws Exception {
         FallbackExceptionHandler.installExceptionHandler();
 
         JabRefPreferences preferences = JabRefPreferences.getInstance();
@@ -158,7 +152,7 @@ private static void start(String[] args) {
 
             if (!Globals.REMOTE_LISTENER.isOpen()) {
                 // we are not alone, there is already a server out there, try to contact already running JabRef:
-                if (RemoteListenerClient.sendToActiveJabRefInstance(args, remotePreferences.getPort())) {
+                if (RemoteListenerClient.sendToActiveJabRefInstance(arguments, remotePreferences.getPort())) {
                     // We have successfully sent our command line options through the socket to another JabRef instance.
                     // So we assume it's all taken care of, and quit.
                     LOGGER.info(Localization.lang("Arguments passed on to running JabRef instance. Shutting down."));
@@ -177,7 +171,7 @@ private static void start(String[] args) {
         OS.NEWLINE = Globals.prefs.get(JabRefPreferences.NEWLINE);
 
         // Process arguments
-        ArgumentProcessor argumentProcessor = new ArgumentProcessor(args, ArgumentProcessor.Mode.INITIAL_START);
+        ArgumentProcessor argumentProcessor = new ArgumentProcessor(arguments, ArgumentProcessor.Mode.INITIAL_START);
 
         // See if we should shut down now
         if (argumentProcessor.shouldShutDown()) {
@@ -187,8 +181,7 @@ private static void start(String[] args) {
         }
 
         // If not, start GUI
-        SwingUtilities
-                .invokeLater(() -> new JabRefGUI(argumentProcessor.getParserResults(),
-                        argumentProcessor.isBlank()));
+        new JabRefGUI(mainStage, argumentProcessor.getParserResults(), argumentProcessor.isBlank());
     }
+
 }