Fix storing of custom jstyles

Fixes #6170
Rename method for internalStyle

Author: Siedlerchr

CHANGELOG.md

@@ -31,6 +31,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 - We fixed an issue with inconsistent capitalization of file extensions when downloading files [#6115](https://github.com/JabRef/jabref/issues/6115)
 - We fixed the display of language and encoding in the preferences dialog. [#6130](https://github.com/JabRef/jabref/pull/6130)
 - We fixed an issue where search full-text documents downloaded files with same name, overwriting existing files. [#6174](https://github.com/JabRef/jabref/pull/6174)
+- We fixe an issue where custom jstyles for Open/LibreOffice where not saved correctly [#6170](https://github.com/JabRef/jabref/issues/6170)
+
 
 ### Removed
 

src/main/java/org/jabref/gui/openoffice/StyleSelectDialogViewModel.java

@@ -51,7 +51,7 @@ public StyleSelectDialogViewModel(DialogService dialogService, StyleLoader loade
     }
 
     public StyleSelectItemViewModel fromOOBibStyle(OOBibStyle style) {
-        return new StyleSelectItemViewModel(style.getName(), String.join(", ", style.getJournals()), style.isFromResource() ? Localization.lang("Internal style") : style.getPath(), style);
+        return new StyleSelectItemViewModel(style.getName(), String.join(", ", style.getJournals()), style.isInternalStyle() ? Localization.lang("Internal style") : style.getPath(), style);
     }
 
     public OOBibStyle toOOBibStyle(StyleSelectItemViewModel item) {
@@ -121,6 +121,9 @@ public ObjectProperty<StyleSelectItemViewModel> selectedItemProperty() {
     }
 
     public void storePrefs() {
+
+        List<String> externalStyles = styles.stream().filter(style -> !style.internalStyleProperty().get()).map(this::toOOBibStyle).map(OOBibStyle::getPath).collect(Collectors.toList());
+        preferences.setExternalStyles(externalStyles);
         preferences.setCurrentStyle(selectedItem.getValue().getStylePath());
         preferencesService.setOpenOfficePreferences(preferences);
     }

src/main/java/org/jabref/gui/openoffice/StyleSelectItemViewModel.java

@@ -25,7 +25,7 @@ public StyleSelectItemViewModel(String name, String journals, String file, OOBib
         this.journals.setValue(journals);
         this.file.setValue(file);
         this.style = style;
-        this.internalStyle.set(style.isFromResource());
+        this.internalStyle.set(style.isInternalStyle());
     }
 
     public StringProperty nameProperty() {

src/main/java/org/jabref/logic/citationstyle/CitationStyleGenerator.java

@@ -55,7 +55,7 @@ public static List<String> generateCitations(List<BibEntry> bibEntries, String s
         try {
             return CSL_ADAPTER.makeBibliography(bibEntries, style, outputFormat);
         } catch (IllegalArgumentException ignored) {
-            LOGGER.error("Could not generate BibEntry citation. The CSL engine could not create a preview for your item.");
+            LOGGER.error("Could not generate BibEntry citation. The CSL engine could not create a preview for your item.", ignored);
             return Collections.singletonList(Localization.lang("Cannot generate preview based on selected citation style."));
         } catch (IOException | ArrayIndexOutOfBoundsException e) {
             LOGGER.error("Could not generate BibEntry citation", e);

src/main/java/org/jabref/logic/openoffice/OOBibStyle.java

@@ -123,6 +123,7 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
     private long styleFileModificationTime = Long.MIN_VALUE;
     private String localCopy;
     private boolean isDefaultLayoutPresent;
+
     public OOBibStyle(File styleFile, LayoutFormatterPreferences prefs,
             Charset encoding) throws IOException {
         this.prefs = Objects.requireNonNull(prefs);
@@ -842,7 +843,7 @@ public Object getProperty(String propName) {
      *
      * @return True if an internal style
      */
-    public boolean isFromResource() {
+    public boolean isInternalStyle() {
         return fromResource;
     }
 

src/main/java/org/jabref/logic/openoffice/StyleLoader.java

@@ -44,6 +44,7 @@ public StyleLoader(OpenOfficePreferences preferences, LayoutFormatterPreferences
         loadExternalStyles();
     }
 
+
     public List<OOBibStyle> getStyles() {
         List<OOBibStyle> result = new ArrayList<>(internalStyles);
         result.addAll(externalStyles);
@@ -120,7 +121,7 @@ private void storeExternalStyles() {
 
     public boolean removeStyle(OOBibStyle style) {
         Objects.requireNonNull(style);
-        if (!style.isFromResource()) {
+        if (!style.isInternalStyle()) {
             boolean result = externalStyles.remove(style);
             storeExternalStyles();
             return result;

src/test/java/org/jabref/logic/openoffice/OOBibStyleTest.java

@@ -43,7 +43,7 @@ void setUp() {
     void testAuthorYear() throws IOException {
         OOBibStyle style = new OOBibStyle(StyleLoader.DEFAULT_AUTHORYEAR_STYLE_PATH, layoutFormatterPreferences);
         assertTrue(style.isValid());
-        assertTrue(style.isFromResource());
+        assertTrue(style.isInternalStyle());
         assertFalse(style.isBibtexKeyCiteMarkers());
         assertFalse(style.isBoldCitations());
         assertFalse(style.isFormatCitations());
@@ -58,7 +58,7 @@ void testAuthorYearAsFile() throws URISyntaxException, IOException {
                             .toFile();
         OOBibStyle style = new OOBibStyle(defFile, layoutFormatterPreferences, StandardCharsets.UTF_8);
         assertTrue(style.isValid());
-        assertFalse(style.isFromResource());
+        assertFalse(style.isInternalStyle());
         assertFalse(style.isBibtexKeyCiteMarkers());
         assertFalse(style.isBoldCitations());
         assertFalse(style.isFormatCitations());

src/test/java/org/jabref/logic/openoffice/StyleLoaderTest.java

@@ -107,7 +107,7 @@ public void testInitalizeWithOneExternalFileRemoveStyle() throws URISyntaxExcept
         List<OOBibStyle> toremove = new ArrayList<>();
         int beforeRemoving = loader.getStyles().size();
         for (OOBibStyle style : loader.getStyles()) {
-            if (!style.isFromResource()) {
+            if (!style.isInternalStyle()) {
                 toremove.add(style);
             }
         }
@@ -127,7 +127,7 @@ public void testInitalizeWithOneExternalFileRemoveStyleUpdatesPreferences() thro
         loader = new StyleLoader(preferences, layoutPreferences, encoding);
         List<OOBibStyle> toremove = new ArrayList<>();
         for (OOBibStyle style : loader.getStyles()) {
-            if (!style.isFromResource()) {
+            if (!style.isInternalStyle()) {
                 toremove.add(style);
             }
         }
@@ -194,7 +194,7 @@ public void testRemoveInternalStyleReturnsFalseAndDoNotRemove() {
         loader = new StyleLoader(preferences, layoutPreferences, encoding);
         List<OOBibStyle> toremove = new ArrayList<>();
         for (OOBibStyle style : loader.getStyles()) {
-            if (style.isFromResource()) {
+            if (style.isInternalStyle()) {
                 toremove.add(style);
             }
         }