Cleanup after merge

JabRef · Jul 23, 2018 · 85f9685 · 85f9685
1 parent 88751da
commit 85f9685
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 31 deletions.
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
@@ -58,10 +58,10 @@
 	requires jgoodies.forms;
 	requires commons.logging;
 	requires com.google.common;
-	requires spin;
     requires easybind;
     requires de.jensd.fx.glyphs.commons;
     requires controlsfx;
+    requires mvvmfx;
 
     // Libre Office
 	/*requires ridl;

diff --git a/src/main/java/org/jabref/Globals.java b/src/main/java/org/jabref/Globals.java
@@ -97,7 +97,8 @@ private static void stopTelemetryClient() {
             client.flush();
 
             //FIXME: Workaround for bug https://github.com/Microsoft/ApplicationInsights-Java/issues/662
-            SDKShutdownActivity.INSTANCE.stopAll();
+            // TODO: Java 9, Application Insights
+//            SDKShutdownActivity.INSTANCE.stopAll();
         });
     }
 

diff --git a/src/main/java/org/jabref/gui/actions/ActionFactory.java b/src/main/java/org/jabref/gui/actions/ActionFactory.java
@@ -72,8 +72,8 @@ public Button createIconButton(Action action, Command command) {
     public ButtonBase configureIconButton(Action action, Command command, ButtonBase button) {
         ActionUtils.configureButton(
                 new JabRefAction(action, command, keyBindingRepository),
-                button,
-                ActionUtils.ActionTextBehavior.HIDE);
+                button/*,
+                ActionUtils.ActionTextBehavior.HIDE*/); // TODO: Java 9 why is this argument too much?
 
         button.getStyleClass().add("flatButton");
 

diff --git a/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java b/src/main/java/org/jabref/gui/fieldeditors/EditorTextField.java
@@ -6,13 +6,12 @@
 import java.util.function.Supplier;
 
 import javafx.fxml.Initializable;
-import javafx.scene.control.ContextMenu;
 import javafx.scene.control.MenuItem;
-import javafx.scene.input.KeyCode;
 import javafx.scene.input.KeyEvent;
 
-import com.sun.javafx.scene.control.skin.TextFieldSkin;
+//import com.sun.javafx.scene.control.skin.TextFieldSkin;
 
+// TODO: java 9 TextFieldSkin not accessible in Java 9
 public class EditorTextField extends javafx.scene.control.TextField implements Initializable, ContextMenuAddable {
 
     public EditorTextField() {
@@ -27,35 +26,35 @@ public EditorTextField(final String text) {
 
         // Should behave as a normal text field with respect to TAB behaviour
         addEventFilter(KeyEvent.KEY_PRESSED, event -> {
-            if (event.getCode() == KeyCode.TAB) {
-                TextFieldSkin skin = (TextFieldSkin) getSkin();
-                if (event.isShiftDown()) {
-                    // Shift + Tab > previous text area
-                    skin.getBehavior().traversePrevious();
-                } else {
-                    if (event.isControlDown()) {
-                        // Ctrl + Tab > insert tab
-                        skin.getBehavior().callAction("InsertTab");
-                    } else {
-                        // Tab > next text area
-                        skin.getBehavior().traverseNext();
-                    }
-                }
-                event.consume();
-            }
+//            if (event.getCode() == KeyCode.TAB) {
+//                TextFieldSkin skin = (TextFieldSkin) getSkin();
+//                if (event.isShiftDown()) {
+//                    // Shift + Tab > previous text area
+//                    skin.getBehavior().traversePrevious();
+//                } else {
+//                    if (event.isControlDown()) {
+//                        // Ctrl + Tab > insert tab
+//                        skin.getBehavior().callAction("InsertTab");
+//                    } else {
+//                        // Tab > next text area
+//                        skin.getBehavior().traverseNext();
+//                    }
+//                }
+//                event.consume();
+//            }
         });
     }
 
     @Override
     public void addToContextMenu(final Supplier<List<MenuItem>> items) {
-        TextFieldSkin customContextSkin = new TextFieldSkin(this) {
-            @Override
-            public void populateContextMenu(ContextMenu contextMenu) {
-                super.populateContextMenu(contextMenu);
-                contextMenu.getItems().addAll(0, items.get());
-            }
-        };
-        setSkin(customContextSkin);
+//        TextFieldSkin customContextSkin = new TextFieldSkin(this) {
+//            @Override
+//            public void populateContextMenu(ContextMenu contextMenu) {
+//                super.populateContextMenu(contextMenu);
+//                contextMenu.getItems().addAll(0, items.get());
+//            }
+//        };
+//        setSkin(customContextSkin);
     }
 
     @Override