[fix] Rename EmacsKeyBindings and reorder imports

The old EmacsKeyBindings class is now removed and replaced with a working one. Missing localization keys were also added. [Issue: #9]
stevensdavid · Feb 27, 2020 · 86ab7a3 · 86ab7a3
1 parent d8baf24
commit 86ab7a3
Show file tree

Hide file tree

Showing 6 changed files with 96 additions and 905 deletions.
diff --git a/src/main/java/org/jabref/JabRefGUI.java b/src/main/java/org/jabref/JabRefGUI.java
@@ -5,13 +5,9 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-//import java.util.Optional;
 
 import javafx.application.Platform;
 import javafx.scene.Scene;
-import javafx.stage.Screen;
-import javafx.stage.Stage;
-//import javafx.scene.control.TextField;
 import javafx.scene.input.KeyEvent;
 import javafx.stage.Screen;
 import javafx.stage.Stage;
@@ -24,7 +20,7 @@
 import org.jabref.gui.icon.IconTheme;
 import org.jabref.gui.importer.ParserResultWarningDialog;
 import org.jabref.gui.importer.actions.OpenDatabaseAction;
-import org.jabref.gui.keyboard.KeyBinding;
+import org.jabref.gui.keyboard.EmacsKeyBindings;
 import org.jabref.gui.keyboard.KeyBindingRepository;
 import org.jabref.gui.shared.SharedDatabaseUIManager;
 import org.jabref.logic.autosaveandbackup.BackupManager;
@@ -35,9 +31,6 @@
 import org.jabref.logic.shared.exception.NotASharedDatabaseException;
 import org.jabref.model.database.shared.DatabaseNotSupportedException;
 import org.jabref.preferences.JabRefPreferences;
-import org.jabref.gui.keyboard.KeyBindingRepository;
-//import org.jabref.gui.keyboard.KeyBinding;
-import org.jabref.gui.keyboard.EmacsKeyBindings2;
 
 import impl.org.controlsfx.skin.DecorationPane;
 import org.slf4j.Logger;
@@ -105,7 +98,7 @@ private void openWindow(Stage mainStage) {
             boolean CNFlag = Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_CN);
             boolean AUFlag = Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS_REBIND_AU);
             KeyBindingRepository keyBindingRepository = Globals.getKeyPrefs();
-            EmacsKeyBindings2.executeEmac(scene, event, EmacsFlag, CAFlag, CFFlag, CNFlag, AUFlag, keyBindingRepository);
+            EmacsKeyBindings.executeEmac(scene, event, EmacsFlag, CAFlag, CFFlag, CNFlag, AUFlag, keyBindingRepository);
         });
 
         Globals.getThemeLoader().installCss(scene, Globals.prefs);

diff --git a/src/main/java/org/jabref/gui/GUIGlobals.java b/src/main/java/org/jabref/gui/GUIGlobals.java
@@ -5,7 +5,6 @@
 
 import org.jabref.Globals;
 import org.jabref.gui.icon.IconTheme;
-import org.jabref.gui.keyboard.EmacsKeyBindings;
 import org.jabref.gui.util.CustomLocalDragboard;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
@@ -41,9 +40,6 @@ public static void updateEntryEditorColors() {
      * on Un*x is unavailable.
      */
     public static void init() {
-        if (Globals.prefs.getBoolean(JabRefPreferences.EDITOR_EMACS_KEYBINDINGS)) {
-            EmacsKeyBindings.load();
-        }
         // Set up entry editor colors, first time:
         GUIGlobals.updateEntryEditorColors();