[WIP] First attempt for JDK11 compilation - #Java11

build.gradle

@@ -21,8 +21,9 @@ plugins {
     id "de.sebastianboegl.shadow.transformer.log4j" version "2.1.1"
     id "com.simonharrer.modernizer" version '1.6.0-1'
     id 'me.champeau.gradle.jmh' version '0.4.3'
-    id 'net.ltgt.errorprone' version '0.0.13'
     id 'com.github.ben-manes.versions' version '0.17.0'
+    id 'com.zyxist.chainsaw' version '0.3.1'
+    //id 'net.ltgt.errorprone' version '0.0.13'
 }
 
 // use the gradle build scan feature: https://scans.gradle.com/get-started
@@ -47,13 +48,15 @@ group = "org.jabref"
 version = "4.3-dev"
 project.ext.threeDotVersion = "4.2.0.1"
 project.ext.install4jDir = hasProperty("install4jDir") ? getProperty("install4jDir") : (OperatingSystem.current().isWindows() ? 'C:/Program Files/install4j7' : 'install4j7')
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
+sourceCompatibility = 9
+targetCompatibility = 9
 mainClassName = "org.jabref.JabRefMain"
+javaModule.name ="org.jabref"
+
 
 // These are the Java version requirements we will check on each start of JabRef
 ext.minRequiredJavaVersion = "1.8.0_144"
-ext.allowJava9 = false
+ext.allowJava9 = true
 
 sourceSets {
     main {
@@ -78,6 +81,10 @@ repositories {
 configurations {
     antlr3
     antlr4
+
+    compile {
+        exclude group: 'com.google.code.findbugs', module: 'jsr305'
+    }
 }
 
 dependencies {
@@ -96,10 +103,11 @@ dependencies {
 
     compile 'commons-cli:commons-cli:1.4'
 
-    compile "org.libreoffice:juh:5.4.2"
+    // TODO: LibreOffice has a split package, temporarily removed
+    /*compile "org.libreoffice:juh:5.4.2"
     compile "org.libreoffice:jurt:5.4.2"
     compile "org.libreoffice:ridl:5.4.2"
-    compile "org.libreoffice:unoil:5.4.2"
+    compile "org.libreoffice:unoil:5.4.2"*/
 
     compile 'com.github.bkromhout:java-diff-utils:2.1.1'
     compile 'info.debatty:java-string-similarity:1.1.0'
@@ -119,19 +127,23 @@ dependencies {
 
     compile 'com.google.guava:guava:25.0-jre'
 
+    compile group: 'javax.annotation', name: 'javax.annotation-api', version: '1.3.2'
+
     // JavaFX stuff
-    compile 'de.codecentric.centerdevice:javafxsvg:1.3.0'
+    // TODO: has an internal dependency exporting org.w3c.dom, temporarily removed
+    //compile 'de.codecentric.centerdevice:javafxsvg:1.3.0'
     compile 'de.jensd:fontawesomefx-materialdesignfont:1.7.22-4'
+    compile 'de.jensd:fontawesomefx-commons:9.1.2'
     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 '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'
+    compile 'org.controlsfx:controlsfx:9.0.0'
 
     compile 'org.jsoup:jsoup:1.11.3'
     compile 'com.mashape.unirest:unirest-java:1.4.9'
@@ -148,10 +160,16 @@ dependencies {
     compile 'org.citationstyles:locales:1.0.1-SNAPSHOT'
     compile 'de.undercouch:citeproc-java:1.0.1'
 
-    compile 'com.github.tomtung:latex2unicode_2.12:0.2.2'
+    // JAX-B is considered JavaEE API and is no longer part of JavaSE (JDK 9)
+    compile group: 'javax.xml.bind', name: 'jaxb-api', version: '2.3.0'
+    compile group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0'
 
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '2.0.2'
-    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '2.0.2'
+
+    // TODO: recognized as 'latex2unicode.2.12', which is an invalid module name, temporarily removed
+//    compile 'com.github.tomtung:latex2unicode_2.12:0.2.2'
+
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-core', version: '1.0.10'
+    compile group: 'com.microsoft.azure', name: 'applicationinsights-logging-log4j2', version: '1.0.10'
 
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.2.0-RC1'
     testCompile 'org.junit.jupiter:junit-jupiter-params:5.2.0-RC1'
@@ -166,7 +184,7 @@ dependencies {
     testCompile 'org.reflections:reflections:0.9.11'
     testCompile 'org.xmlunit:xmlunit-core:2.6.0'
     testCompile 'org.xmlunit:xmlunit-matchers:2.6.0'
-    testCompile 'com.tngtech.archunit:archunit-junit:0.5.0'
+    testCompile 'com.tngtech.archunit:archunit-junit:0.6.0-java9-SNAPSHOT'
     testCompile "org.testfx:testfx-core:4.0.+"
     testCompile "org.testfx:testfx-junit5:4.0.+"
 
@@ -314,7 +332,7 @@ test {
     useJUnitPlatform {
         excludeTags 'DatabaseTest', 'FetcherTest', 'GUITest', 'org.jabref.testutils.category.FetcherTest', 'org.jabref.testutils.category.GUITest'
     }
-    
+
     testLogging {
         // set options for log level LIFECYCLE
         events "failed"
@@ -375,7 +393,7 @@ checkstyle {
     // do not use other packages for checkstyle, excluding gen(erated) sources
     checkstyleMain.source = "src/main/java"
     toolVersion = '8.5'
-    
+
     // do not perform checkstyle checks by default
     sourceSets = []
 }

gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

src/main/java/module-info.java

@@ -0,0 +1,66 @@
+open module org.jabref {
+    exports org.jabref;
+
+    exports org.jabref.gui;
+    exports org.jabref.gui.logging;
+    exports org.jabref.gui.maintable;
+    exports org.jabref.gui.specialfields;
+
+    exports org.jabref.model.database;
+
+    exports org.jabref.logic;
+    exports org.jabref.logic.citationstyle;
+    exports org.jabref.logic.search;
+
+//    opens org.jabref.gui to com.google.common;
+//    opens org.jabref.model.database to com.google.common;
+//    opens org.jabref.logic.citationstyle to com.google.common;
+
+    // Swing
+	requires java.desktop;
+
+	// SQL
+	requires java.sql;
+	requires pgjdbc.ng;
+
+	// JavaFX
+	requires javafx.graphics;
+	requires javafx.swing;
+	requires javafx.controls;
+	requires javafx.web;
+	requires javafx.fxml;
+	requires afterburner.fx;
+//	requires de.jensd.fx.glyphs.commons;
+//	requires de.jensd.fx.glyphs.materialdesignicons;
+
+    provides com.airhacks.afterburner.views.ResourceLocator
+        with org.jabref.gui.util.JabRefResourceLocator;
+
+	// Logging
+	requires org.slf4j;
+	requires org.apache.logging.log4j;
+
+	// Preferences and XML
+	requires java.prefs;
+	requires java.xml.bind; // Deprecated!
+    requires jdk.xml.dom;
+
+    // Annotations (@PostConstruct)
+    requires java.annotation;
+
+    // Microsoft application insights
+    requires applicationinsights.core;
+
+    requires glazedlists.java15;
+	requires jgoodies.forms;
+	requires commons.logging;
+	requires com.google.common;
+	requires spin;
+    requires easybind;
+    requires de.jensd.fx.glyphs.commons;
+
+    // Libre Office
+	/*requires ridl;
+	requires unoil;
+	requires juh;*/
+}

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

@@ -385,7 +385,7 @@ private void disOrEnableAllElements(Container startContainer, boolean enable) {
     private void expandTree(JTree currentTree, TreePath parent, boolean expand) {
         TreeNode node = (TreeNode) parent.getLastPathComponent();
         if (node.getChildCount() >= 0) {
-            for (Enumeration<TreeNode> e = node.children(); e.hasMoreElements();) {
+            for (Enumeration<? extends TreeNode> e = node.children(); e.hasMoreElements();) {
                 TreePath path = parent.pathByAddingChild(e.nextElement());
                 expandTree(currentTree, path, expand);
             }
@@ -696,14 +696,19 @@ private void setupActions() {
      */
     private List<File> getFileListFromNode(CheckableTreeNode node) {
         List<File> filesList = new ArrayList<>();
-        Enumeration<CheckableTreeNode> children = node.depthFirstEnumeration();
+        Enumeration<TreeNode> children = node.depthFirstEnumeration();
         List<CheckableTreeNode> nodesToRemove = new ArrayList<>();
-        for (CheckableTreeNode child : Collections.list(children)) {
-            if (child.isLeaf() && child.isSelected()) {
-                File nodeFile = ((FileNodeWrapper) child.getUserObject()).file;
+        for (TreeNode child : Collections.list(children)) {
+            if (!(child instanceof CheckableTreeNode)) {
+                continue;
+            }
+            CheckableTreeNode checkableChild = (CheckableTreeNode) child;
+
+            if (child.isLeaf() && checkableChild.isSelected()) {
+                File nodeFile = ((FileNodeWrapper) checkableChild.getUserObject()).file;
                 if ((nodeFile != null) && nodeFile.isFile()) {
                     filesList.add(nodeFile);
-                    nodesToRemove.add(child);
+                    nodesToRemove.add(checkableChild);
                 }
             }
         }
@@ -1138,9 +1143,10 @@ public void check() {
 
         public void setSelected(boolean bSelected) {
             isSelected = bSelected;
-            Enumeration<CheckableTreeNode> tmpChildren = this.children();
-            for (CheckableTreeNode child : Collections.list(tmpChildren)) {
-                child.setSelected(bSelected);
+            // TODO: Java 9: Generics are stronger?
+            Enumeration<TreeNode> tmpChildren = this.children();
+            for (TreeNode child : Collections.list(tmpChildren)) {
+                ((CheckableTreeNode) child).setSelected(bSelected);
             }
 
         }

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

@@ -132,8 +132,6 @@
 import org.jabref.preferences.SearchPreferences;
 
 import com.google.common.eventbus.Subscribe;
-import org.eclipse.fx.ui.controls.tabpane.DndTabPane;
-import org.eclipse.fx.ui.controls.tabpane.DndTabPaneFactory;
 import org.fxmisc.easybind.EasyBind;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -214,8 +212,8 @@ private void init() {
         sidePaneManager = new SidePaneManager(Globals.prefs, this);
         sidePane = sidePaneManager.getPane();
 
-        Pane containerPane = DndTabPaneFactory.createDefaultDnDPane(DndTabPaneFactory.FeedbackType.MARKER, null);
-        tabbedPane = (DndTabPane) containerPane.getChildren().get(0);
+        //Pane containerPane = DndTabPaneFactory.createDefaultDnDPane(DndTabPaneFactory.FeedbackType.MARKER, null);
+        tabbedPane = new TabPane();
 
         initLayout();
 
@@ -1019,11 +1017,12 @@ public void output(final String s) {
     private void initActions() {
         /*
         openDatabaseOnlyActions.clear();
+        // TODO: temporarily removed OpenOffice Panel, (Java 9 incompatibility)
         openDatabaseOnlyActions.addAll(Arrays.asList(manageSelectors, mergeDatabaseAction, newSubDatabaseAction, save, copyPreview,
                 saveAs, saveSelectedAs, saveSelectedAsPlain, undo, redo, cut, deleteEntry, copy, paste, mark, markSpecific, unmark,
                 unmarkAll, rankSubMenu, editEntry, selectAll, copyKey, copyCiteKey, copyKeyAndTitle, copyKeyAndLink, editPreamble, editStrings,
                 groupSidePane.getToggleCommand(), makeKeyAction, normalSearch, generalFetcher.getToggleCommand(), mergeEntries, cleanupEntries, exportToClipboard, replaceAll,
-                sendAsEmail, downloadFullText, lookupIdentifiers, writeXmpAction, openOfficePanel.getToggleCommand(), findUnlinkedFiles, addToGroup, removeFromGroup,
+                sendAsEmail, downloadFullText, lookupIdentifiers, writeXmpAction, /*openOfficePanel.getToggleCommand(), findUnlinkedFiles, addToGroup, removeFromGroup,
                 moveToGroup, autoLinkFile, resolveDuplicateKeys, openUrl, openFolder, openFile, togglePreview,
                 dupliCheck, autoSetFile, newEntryAction, newSpec, customizeAction, plainTextImport, getMassSetField(), getManageKeywords(),
                 pushExternalButton.getMenuAction(), closeDatabaseAction, getNextPreviewStyleAction(), getPreviousPreviewStyleAction(), checkIntegrity,

src/main/java/org/jabref/gui/collab/ChangeDisplayDialog.java

@@ -18,6 +18,7 @@
 import javax.swing.event.TreeSelectionEvent;
 import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
+import javax.swing.tree.TreeNode;
 
 import org.jabref.gui.BasePanel;
 import org.jabref.gui.JabRefDialog;
@@ -86,12 +87,14 @@ public ChangeDisplayDialog(JFrame owner, final BasePanel panel,
             // Perform all accepted changes:
             // Store all edits in an Undoable object:
             NamedCompound ce = new NamedCompound(Localization.lang("Merged external changes"));
-            Enumeration<ChangeViewModel> enumer = root.children();
+            // TODO: Java 9: Generics are stricter?
+            Enumeration<TreeNode> enumer = root.children();
             boolean anyDisabled = false;
-            for (ChangeViewModel c : Collections.list(enumer)) {
+            for (TreeNode c : Collections.list(enumer)) {
+                ChangeViewModel model = (ChangeViewModel) c;
                 boolean allAccepted = false;
-                if (c.isAcceptable() && c.isAccepted()) {
-                    allAccepted = c.makeChange(panel, localSecondary, ce);
+                if (model.isAcceptable() && model.isAccepted()) {
+                    allAccepted = model.makeChange(panel, localSecondary, ce);
                 }
 
                 if (!allAccepted) {

src/main/java/org/jabref/gui/collab/EntryChangeViewModel.java

@@ -15,6 +15,7 @@
 import org.jabref.gui.undo.UndoableFieldChange;
 import org.jabref.logic.bibtex.DuplicateCheck;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.TreeNode;
 import org.jabref.model.database.BibDatabase;
 import org.jabref.model.entry.BibEntry;
 
@@ -74,10 +75,12 @@ public EntryChangeViewModel(BibEntry memEntry, BibEntry tmpEntry, BibEntry diskE
     public boolean makeChange(BasePanel panel, BibDatabase secondary, NamedCompound undoEdit) {
         boolean allAccepted = true;
 
-        Enumeration<ChangeViewModel> e = children();
-        for (ChangeViewModel c : Collections.list(e)) {
-            if (c.isAcceptable() && c.isAccepted()) {
-                c.makeChange(panel, secondary, undoEdit);
+        // TODO: Java 9: Generics are stronger?
+        Enumeration<javax.swing.tree.TreeNode> e = children();
+        for (javax.swing.tree.TreeNode c : Collections.list(e)) {
+            ChangeViewModel model = (ChangeViewModel) c;
+            if (model.isAcceptable() && model.isAccepted()) {
+                model.makeChange(panel, secondary, undoEdit);
             } else {
                 allAccepted = false;
             }