Merge remote-tracking branch 'upstream/master' into importerbackgroundtask

* upstream/master:
  Output java error on console, too (#7222)
  Speedup processResources (#7221)
  Fix ClipboardManager <-> Prefs ordering (#7224)

Author: Siedlerchr

build.gradle

@@ -50,10 +50,6 @@ modularity.patchModule("test", "fastparse_2.12-1.0.0.jar")
 modularity.patchModule("test2", "fastparse-utils_2.12-1.0.0.jar")
 modularity.patchModule("test3", "sourcecode_2.12-0.1.4.jar")
 
-// These are the Java version requirements we will check on each start of JabRef
-ext.minRequiredJavaVersion = "1.8.0_171"
-ext.allowJava9 = true
-
 sourceSets {
     main {
         java {
@@ -271,15 +267,12 @@ processResources {
                 "azureInstrumentationKey": System.getenv('AzureInstrumentationKey'),
                 "springerNatureAPIKey": System.getenv('SpringerNatureAPIKey'),
                 "astrophysicsDataSystemAPIKey": System.getenv('AstrophysicsDataSystemAPIKey'),
-                "ieeeAPIKey": System.getenv('IEEEAPIKey'),
-                "minRequiredJavaVersion": minRequiredJavaVersion,
-                "allowJava9": allowJava9
-
+                "ieeeAPIKey": System.getenv('IEEEAPIKey')
         )
         filteringCharset = 'UTF-8'
     }
 
-    filesMatching("resource/**/meta.xml") {
+    filesMatching(["resources/resource/ods/meta.xml", "resources/resource/openoffice/meta.xml"]) {
         expand version: project.version
     }
 }

gradle.properties

@@ -0,0 +1 @@
+org.gradle.vs.watch=true

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

@@ -44,7 +44,7 @@ private static Object createDependency(Class<?> clazz) {
         } else if (clazz == ProtectedTermsLoader.class) {
             return Globals.protectedTermsLoader;
         } else if (clazz == ClipBoardManager.class) {
-            return Globals.clipboardManager;
+            return Globals.getClipboardManager();
         } else if (clazz == UndoManager.class) {
             return Globals.undoManager;
         } else if (clazz == BibEntryTypesManager.class) {

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

@@ -73,7 +73,8 @@ public class Globals {
     public static ExporterFactory exportFactory;
     public static CountingUndoManager undoManager = new CountingUndoManager();
     public static BibEntryTypesManager entryTypesManager = new BibEntryTypesManager();
-    public static ClipBoardManager clipboardManager = new ClipBoardManager(prefs);
+
+    private static ClipBoardManager clipBoardManager = null;
 
     // Key binding preferences
     private static KeyBindingRepository keyBindingRepository;
@@ -92,6 +93,13 @@ public static synchronized KeyBindingRepository getKeyPrefs() {
         return keyBindingRepository;
     }
 
+    public static synchronized ClipBoardManager getClipboardManager() {
+        if (clipBoardManager == null) {
+            clipBoardManager = new ClipBoardManager(prefs);
+        }
+        return clipBoardManager;
+    }
+
     // Background tasks
     public static void startBackgroundTasks() {
         Globals.fileUpdateMonitor = new DefaultFileUpdateMonitor();

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

@@ -716,13 +716,13 @@ private MenuBar createMenu() {
 
                 factory.createMenuItem(StandardActions.COPY, new EditAction(StandardActions.COPY, this, stateManager)),
                 factory.createSubMenu(StandardActions.COPY_MORE,
-                        factory.createMenuItem(StandardActions.COPY_TITLE, new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, Globals.clipboardManager, prefs)),
-                        factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, Globals.clipboardManager, prefs)),
-                        factory.createMenuItem(StandardActions.COPY_CITE_KEY, new CopyMoreAction(StandardActions.COPY_CITE_KEY, dialogService, stateManager, Globals.clipboardManager, prefs)),
-                        factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new CopyMoreAction(StandardActions.COPY_KEY_AND_TITLE, dialogService, stateManager, Globals.clipboardManager, prefs)),
-                        factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new CopyMoreAction(StandardActions.COPY_KEY_AND_LINK, dialogService, stateManager, Globals.clipboardManager, prefs)),
-                        factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, Globals.clipboardManager, prefs.getPreviewPreferences())),
-                        factory.createMenuItem(StandardActions.EXPORT_SELECTED_TO_CLIPBOARD, new ExportToClipboardAction(this, dialogService, Globals.exportFactory, Globals.clipboardManager, Globals.TASK_EXECUTOR))),
+                        factory.createMenuItem(StandardActions.COPY_TITLE, new CopyMoreAction(StandardActions.COPY_TITLE, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
+                        factory.createMenuItem(StandardActions.COPY_KEY, new CopyMoreAction(StandardActions.COPY_KEY, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
+                        factory.createMenuItem(StandardActions.COPY_CITE_KEY, new CopyMoreAction(StandardActions.COPY_CITE_KEY, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
+                        factory.createMenuItem(StandardActions.COPY_KEY_AND_TITLE, new CopyMoreAction(StandardActions.COPY_KEY_AND_TITLE, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
+                        factory.createMenuItem(StandardActions.COPY_KEY_AND_LINK, new CopyMoreAction(StandardActions.COPY_KEY_AND_LINK, dialogService, stateManager, Globals.getClipboardManager(), prefs)),
+                        factory.createMenuItem(StandardActions.COPY_CITATION_PREVIEW, new CopyCitationAction(CitationStyleOutputFormat.HTML, dialogService, stateManager, Globals.getClipboardManager(), prefs.getPreviewPreferences())),
+                        factory.createMenuItem(StandardActions.EXPORT_SELECTED_TO_CLIPBOARD, new ExportToClipboardAction(this, dialogService, Globals.exportFactory, Globals.getClipboardManager(), Globals.TASK_EXECUTOR))),
 
                 factory.createMenuItem(StandardActions.PASTE, new EditAction(StandardActions.PASTE, this, stateManager)),
 

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

@@ -4,7 +4,6 @@
 
 import javafx.application.Application;
 import javafx.application.Platform;
-import javafx.scene.control.Alert;
 import javafx.stage.Stage;
 
 import org.jabref.cli.ArgumentProcessor;
@@ -19,8 +18,6 @@
 import org.jabref.logic.protectedterms.ProtectedTermsLoader;
 import org.jabref.logic.remote.RemotePreferences;
 import org.jabref.logic.remote.client.RemoteClient;
-import org.jabref.logic.util.BuildInfo;
-import org.jabref.logic.util.JavaVersion;
 import org.jabref.logic.util.OS;
 import org.jabref.migrations.PreferencesMigrations;
 import org.jabref.model.database.BibDatabaseMode;
@@ -48,8 +45,6 @@ public static void main(String[] args) {
     @Override
     public void start(Stage mainStage) {
         try {
-            // Fail on unsupported Java versions
-            ensureCorrectJavaVersion();
             FallbackExceptionHandler.installExceptionHandler();
 
             // Init preferences
@@ -93,51 +88,6 @@ public void stop() {
         Globals.shutdownThreadPools();
     }
 
-    /**
-     * 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
-     * define a minimum version including the built number and to indicate whether Java 9 can be used (which it currently
-     * can't). It tries to compare this version number to the version of the currently running JVM. The check is
-     * optimistic and will rather return true even if we could not exactly determine the version.
-     * <p>
-     * Note: Users with a very old version like 1.6 will not profit from this since class versions are incompatible and
-     * JabRef won't even start. Currently, JabRef won't start with Java 9 either, but the warning that it cannot be used
-     * with this version is helpful anyway to prevent users to update from an old 1.8 directly to version 9. Additionally,
-     * we soon might have a JabRef that does start with Java 9 but is not perfectly compatible. Therefore, we should leave
-     * the Java 9 check alive.
-     */
-    private static void ensureCorrectJavaVersion() {
-        // Check if we are running an acceptable version of Java
-        final BuildInfo buildInfo = Globals.BUILD_INFO;
-        JavaVersion checker = new JavaVersion();
-        final boolean java9Fail = !buildInfo.allowJava9 && checker.isJava9();
-        final boolean versionFail = !checker.isAtLeast(buildInfo.minRequiredJavaVersion);
-
-        if (java9Fail || versionFail) {
-            StringBuilder versionError = new StringBuilder(
-                    Localization.lang("Your current Java version (%0) is not supported. Please install version %1 or higher.",
-                            checker.getJavaVersion(),
-                            buildInfo.minRequiredJavaVersion));
-
-            versionError.append("\n");
-            versionError.append(Localization.lang("Your Java Runtime Environment is located at %0.", checker.getJavaInstallationDirectory()));
-
-            if (!buildInfo.allowJava9) {
-                versionError.append("\n");
-                versionError.append(Localization.lang("Note that currently, JabRef does not run with Java 9."));
-            }
-
-            FXDialog alert = new FXDialog(Alert.AlertType.ERROR, Localization.lang("Error"), true);
-            alert.setHeaderText(null);
-            alert.setContentText(versionError.toString());
-
-            // We exit on Java 9 error since this will definitely not work
-            if (java9Fail) {
-                System.exit(0);
-            }
-        }
-    }
-
     private static boolean handleMultipleAppInstances(String[] args) {
         RemotePreferences remotePreferences = Globals.prefs.getRemotePreferences();
         if (remotePreferences.useRemoteServer()) {

src/main/java/org/jabref/gui/desktop/JabRefDesktop.java

@@ -212,7 +212,7 @@ public static void openBrowserShowPopup(String url) {
         try {
             openBrowser(url);
         } catch (IOException exception) {
-            Globals.clipboardManager.setContent(url);
+            Globals.getClipboardManager().setContent(url);
             LOGGER.error("Could not open browser", exception);
             String couldNotOpenBrowser = Localization.lang("Could not open browser.");
             String openManually = Localization.lang("Please open %0 manually.", url);

src/main/java/org/jabref/gui/edit/CopyDoiUrlAction.java

@@ -27,7 +27,7 @@ public void execute() {
 
         Optional<String> urlOptional = DOI.parse(identifier).map(DOI::getURIAsASCIIString);
         if (urlOptional.isPresent()) {
-            Globals.clipboardManager.setContent(urlOptional.get());
+            Globals.getClipboardManager().setContent(urlOptional.get());
             JabRefGUI.getMainFrame().getDialogService().notify(Localization.lang("The link has been copied to the clipboard."));
         } else {
             JabRefGUI.getMainFrame().getDialogService().notify(Localization.lang("Invalid DOI: '%0'.", identifier));

src/main/java/org/jabref/gui/entryeditor/fileannotationtab/FileAnnotationTabViewModel.java

@@ -123,7 +123,7 @@ public void copyCurrentAnnotation() {
         sj.add(Localization.lang("Content") + ": " + getCurrentAnnotation().getContent());
         sj.add(Localization.lang("Marking") + ": " + getCurrentAnnotation().markingProperty().get());
 
-        Globals.clipboardManager.setContent(sj.toString());
+        Globals.getClipboardManager().setContent(sj.toString());
     }
 
     private FileAnnotationViewModel getCurrentAnnotation() {

src/main/java/org/jabref/gui/maintable/MainTable.java

@@ -115,7 +115,7 @@ public MainTable(MainTableDataModel model,
                         stateManager,
                         preferencesService,
                         undoManager,
-                        Globals.clipboardManager))
+                        Globals.getClipboardManager()))
                 .setOnDragDetected(this::handleOnDragDetected)
                 .setOnDragDropped(this::handleOnDragDropped)
                 .setOnDragOver(this::handleOnDragOver)
@@ -224,7 +224,7 @@ public void copy() {
 
         if (!selectedEntries.isEmpty()) {
             try {
-                Globals.clipboardManager.setContent(selectedEntries);
+                Globals.getClipboardManager().setContent(selectedEntries);
                 dialogService.notify(libraryTab.formatOutputMessage(Localization.lang("Copied"), selectedEntries.size()));
             } catch (IOException e) {
                 LOGGER.error("Error while copying selected entries to clipboard", e);
@@ -293,7 +293,7 @@ private void clearAndSelectLast() {
 
     public void paste(BibDatabaseMode bibDatabaseMode) {
         // Find entries in clipboard
-        List<BibEntry> entriesToAdd = Globals.clipboardManager.extractData();
+        List<BibEntry> entriesToAdd = Globals.getClipboardManager().extractData();
         ImportCleanup cleanup = new ImportCleanup(bibDatabaseMode);
         cleanup.doPostCleanup(entriesToAdd);
         libraryTab.insertEntries(entriesToAdd);