Fix #1130 and re-enable GUI test

JabRef · Apr 7, 2016 · 3ef187b · 3ef187b
1 parent d857074
commit 3ef187b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/integrationTest/java/net/sf/jabref/gui/GUITest.java b/src/integrationTest/java/net/sf/jabref/gui/GUITest.java
@@ -18,10 +18,8 @@
 import static org.assertj.swing.launcher.ApplicationLauncher.application;
 
 public class GUITest extends AssertJSwingJUnitTestCase {
-
     private AWTExceptionHandler awtExceptionHandler;
 
-
     @Override
     protected void onSetUp() {
         awtExceptionHandler = new AWTExceptionHandler();
@@ -78,7 +76,6 @@ protected boolean isMatching(@Nonnull JButton jButton) {
         exitJabRef(mainFrame);
     }
 
-    @Ignore
     @Test
     public void testOpenAndSavePreferences() {
         FrameFixture mainFrame = findFrame(JabRefFrame.class).withTimeout(10_000).using(robot());

diff --git a/src/main/java/net/sf/jabref/gui/labelpattern/LabelPatternPanel.java b/src/main/java/net/sf/jabref/gui/labelpattern/LabelPatternPanel.java
@@ -104,9 +104,12 @@ private void buildGUI() {
         gbl.setConstraints(btnDefault, con);
         pan.add(btnDefault);
 
-        for (EntryType type : EntryTypes.getAllValues(panel.getBibDatabaseContext().getMode())) {
-            textFields.put(type.getName().toLowerCase(), addEntryType(pan, type, y));
-            y++;
+        // check if DB is open
+        if(panel != null) {
+            for (EntryType type : EntryTypes.getAllValues(panel.getBibDatabaseContext().getMode())) {
+                textFields.put(type.getName().toLowerCase(), addEntryType(pan, type, y));
+                y++;
+            }
         }
 
         con.fill = GridBagConstraints.BOTH;