Fix preview style configuration (#4613)

* Modify prefsTab to save the selected preview style in preferences * Fix codacy by changing to equals
JabRef · Jan 31, 2019 · 769ebd1 · 769ebd1
1 parent 33b35f7
commit 769ebd1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/org/jabref/gui/PreviewPanel.java b/src/main/java/org/jabref/gui/PreviewPanel.java
@@ -62,6 +62,7 @@ public class PreviewPanel extends ScrollPane implements SearchQueryHighlightList
     private final KeyBindingRepository keyBindingRepository;
 
     private String previewStyle;
+    private CitationStyle citationStyle;
     private final String defaultPreviewStyle = "Preview";
     private Optional<BasePanel> basePanel = Optional.empty();
 
@@ -224,13 +225,14 @@ private void updateLayout(PreviewPreferences previewPreferences, boolean init) {
         String style = previewPreferences.getCurrentPreviewStyle();
         if (previewStyle == null) {
             previewStyle = style;
+            CitationStyle.createCitationStyleFromFile(style).ifPresent(cs -> citationStyle = cs);
         }
         if (basePanel.isPresent() && !previewStyle.equals(style)) {
             if (CitationStyle.isCitationStyleFile(style)) {
                 layout = Optional.empty();
                 CitationStyle.createCitationStyleFromFile(style)
-                        .ifPresent(citationStyle -> {
-                            basePanel.get().getCitationStyleCache().setCitationStyle(citationStyle);
+                        .ifPresent(cs -> {
+                            citationStyle = cs;
                             if (!init) {
                                 basePanel.get().output(Localization.lang("Preview style changed to: %0", citationStyle.getTitle()));
                             }
@@ -299,6 +301,9 @@ public void update() {
                                                         .doLayout(entry, databaseContext.getDatabase())));
             setPreviewLabel(sb.toString());
         } else if (basePanel.isPresent() && bibEntry.isPresent()) {
+            if (citationStyle != null && !previewStyle.equals(defaultPreviewStyle)) {
+                basePanel.get().getCitationStyleCache().setCitationStyle(citationStyle);
+            }
             Future<?> citationStyleWorker = BackgroundTask
                                                           .wrap(() -> basePanel.get().getCitationStyleCache().getCitationFor(bibEntry.get()))
                                                           .onRunning(() -> {

diff --git a/src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java b/src/main/java/org/jabref/gui/preferences/PreviewPrefsTab.java
@@ -264,6 +264,9 @@ public void storeSettings() {
                 .withPreviewCycle(styles)
                 .withPreviewStyle(layout.getText().replace("\n", "__NEWLINE__"))
                 .build();
+        if (!chosen.getSelectionModel().isEmpty()) {
+            previewPreferences = previewPreferences.getBuilder().withPreviewCyclePosition(chosen.getSelectionModel().getSelectedIndex()).build();
+        }
         Globals.prefs.storePreviewPreferences(previewPreferences);
 
         // update preview