Show Citation style also in entry preview in preferences (#4121)

* Fixes issue 3849 * Fixes some checkstyle errors and changes a line to pass the tests * Removes BasePanel hack * Adds changelog entry and changes a variable name
JabRef · Jun 12, 2018 · df98c31 · df98c31
1 parent 66afd42
commit df98c31
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -42,6 +42,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 - We reworked the "Edit file" dialog to make it resizeable and improved the workflow for adding and editing files https://github.com/JabRef/jabref/issues/2970
 - We fixed an issue where the month was not shown in the preview https://github.com/JabRef/jabref/issues/3239.
 - Rewritten logic to detect a second jabref instance. [#4023](https://github.com/JabRef/jabref/issues/4023)
+- We fixed an issue where the preview pane in entry preview in preferences wasn't showing the citation style selected [#3849](https://github.com/JabRef/jabref/issues/3849)
 
 ### Removed
 - The feature to "mark entries" was removed and merged with the groups functionality.  For migration, a group is created for every value of the `__markedentry` field and the entry is added to this group.

diff --git a/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java b/src/main/java/org/jabref/gui/preftabs/PreviewPrefsTab.java
@@ -30,6 +30,7 @@
 import org.jabref.logic.citationstyle.CitationStyle;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TestEntry;
+import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.preferences.PreviewPreferences;
 
 import com.google.common.primitives.Ints;
@@ -84,13 +85,15 @@ private void setupLogic() {
                 availableModel.removeElement(object);
                 chosenModel.addElement(object);
             }
+            storeSettings();
         });
 
         btnLeft.addActionListener(event -> {
             for (Object object : chosen.getSelectedValuesList()) {
                 availableModel.addElement(object);
                 chosenModel.removeElement(object);
             }
+            storeSettings();
         });
 
         btnUp.addActionListener(event -> {
@@ -102,6 +105,7 @@ private void setupLogic() {
                 newSelectedIndices.add(newIndex);
             }
             chosen.setSelectedIndices(Ints.toArray(newSelectedIndices));
+            storeSettings();
         });
 
         btnDown.addActionListener(event -> {
@@ -115,6 +119,7 @@ private void setupLogic() {
                 newSelectedIndices.add(newIndex);
             }
             chosen.setSelectedIndices(Ints.toArray(newSelectedIndices));
+            storeSettings();
         });
 
         btnDefault.addActionListener(event -> layout.setText(Globals.prefs.getPreviewPreferences()
@@ -126,8 +131,19 @@ private void setupLogic() {
                 DefaultTaskExecutor.runInJavaFXThread(() -> {
 
                     PreviewPanel testPane = new PreviewPanel(null, null, Globals.getKeyPrefs(), Globals.prefs.getPreviewPreferences(), dialogService);
-                    testPane.setFixedLayout(layout.getText());
-                    testPane.setEntry(TestEntry.getTestEntry());
+                    if (chosen.isSelectionEmpty()) {
+                        testPane.setFixedLayout(layout.getText());
+                        testPane.setEntry(TestEntry.getTestEntry());
+                    }
+                    else {
+                        int indexStyle = chosen.getSelectedIndex();
+                        PreviewPreferences preferences = Globals.prefs.getPreviewPreferences();
+                        preferences = new PreviewPreferences(preferences.getPreviewCycle(),indexStyle,preferences.getPreviewPanelDividerPosition(),preferences.isPreviewPanelEnabled(), preferences.getPreviewStyle(),preferences.getPreviewStyleDefault());
+
+                        testPane = new PreviewPanel(JabRefGUI.getMainFrame().getCurrentBasePanel(), new BibDatabaseContext(), Globals.getKeyPrefs(), preferences, dialogService);
+                        testPane.setEntry(TestEntry.getTestEntry());
+                        testPane.updateLayout(preferences);
+                    }
 
                     DialogPane pane = new DialogPane();
                     pane.setContent(testPane);

diff --git a/src/main/java/org/jabref/preferences/PreviewPreferences.java b/src/main/java/org/jabref/preferences/PreviewPreferences.java
@@ -8,7 +8,7 @@
 public class PreviewPreferences {
 
     private final List<String> previewCycle;
-    private final int previewCyclePosition;
+    private int previewCyclePosition;
     private final Number previewPanelDividerPosition;
     private final boolean previewPanelEnabled;
     private final String previewStyle;