Merge remote-tracking branch 'upstream/maintable-beta' into selectFil…

…esDlg * upstream/maintable-beta: fix failing tests in maintable beta (#3863)
JabRef · Mar 19, 2018 · 773d4cc · 773d4cc
2 parents 298a28f + 06d6736
commit 773d4cc
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 30 deletions.
diff --git a/src/main/java/org/jabref/gui/BasePanel.java b/src/main/java/org/jabref/gui/BasePanel.java
@@ -1042,7 +1042,7 @@ public void updateTableFont() {
     private void createMainTable() {
         bibDatabaseContext.getDatabase().registerListener(SpecialFieldDatabaseChangeListener.INSTANCE);
 
-        mainTable = new MainTable(tableModel, frame, this, bibDatabaseContext, preferences.getTablePreferences(), externalFileTypes, Globals.getKeyPrefs());
+        mainTable = new MainTable(tableModel, frame, this, bibDatabaseContext, preferences.getTablePreferences(), externalFileTypes, preferences.getKeyBindings());
 
         mainTable.updateFont();
 

diff --git a/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java b/src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java
@@ -175,6 +175,7 @@ public JabRefIcon getIcon() {
     }
 
     public void setIcon(JabRefIcon icon) {
+        Objects.requireNonNull(icon);
         this.icon = icon;
         label.setIcon(this.icon.getSmallIcon());
     }

diff --git a/src/main/java/org/jabref/gui/keyboard/KeyBinding.java b/src/main/java/org/jabref/gui/keyboard/KeyBinding.java
@@ -12,7 +12,7 @@ public enum KeyBinding {
     CLEANUP("Cleanup", Localization.lang("Cleanup entries"), "alt+F8", KeyBindingCategory.QUALITY),
     CLOSE_DATABASE("Close library", Localization.lang("Close library"), "ctrl+W", KeyBindingCategory.FILE),
     CLOSE_DIALOG("Close dialog", Localization.lang("Close dialog"), "ESCAPE", KeyBindingCategory.FILE),
-    CLOSE_ENTRY_EDITOR("Close entry editor", Localization.lang("Close entry editor"), "ESC", KeyBindingCategory.VIEW),
+    CLOSE_ENTRY_EDITOR("Close entry editor", Localization.lang("Close entry editor"), "Esc", KeyBindingCategory.VIEW),
     COPY("Copy", Localization.lang("Copy"), "ctrl+C", KeyBindingCategory.EDIT),
     COPY_TITLE("Copy title", Localization.lang("Copy title"), "ctrl+shift+alt+T", KeyBindingCategory.EDIT),
     COPY_CITE_BIBTEX_KEY("Copy \\cite{BibTeX key}", Localization.lang("Copy \\cite{BibTeX key}"), "ctrl+K", KeyBindingCategory.EDIT),

diff --git a/src/main/java/org/jabref/gui/util/ControlHelper.java b/src/main/java/org/jabref/gui/util/ControlHelper.java
@@ -29,7 +29,9 @@ public static void loadFXMLForControl(Parent control) {
             fxmlLoader.load();
 
             // Add our base css file
-            Globals.getThemeLoader().installBaseCss(control);
+            if (Globals.getThemeLoader() != null) {
+                Globals.getThemeLoader().installBaseCss(control);
+            }
 
         } catch (IOException exception) {
             LOGGER.error("Problem loading fxml for control", exception);

diff --git a/src/test/java/org/jabref/gui/BasePanelTest.java b/src/test/java/org/jabref/gui/BasePanelTest.java
@@ -12,6 +12,7 @@
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 import org.jabref.preferences.PreviewPreferences;
+import org.jabref.testutils.category.GUITest;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -23,6 +24,7 @@
 import static org.mockito.Mockito.RETURNS_MOCKS;
 import static org.mockito.Mockito.mock;
 
+@GUITest
 @ExtendWith(ApplicationExtension.class)
 public class BasePanelTest {
 

diff --git a/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypeTest.java b/src/test/java/org/jabref/gui/externalfiletype/ExternalFileTypeTest.java