Complete refactor of LibraryProperties to mvvm (#6107)

JabRef · Mar 22, 2020 · 120a0af · 120a0af
1 parent 1b9f572
commit 120a0af
Show file tree

Hide file tree

Showing 26 changed files with 996 additions and 716 deletions.
diff --git a/src/main/java/org/jabref/gui/JabRefFrame.java b/src/main/java/org/jabref/gui/JabRefFrame.java
@@ -753,7 +753,7 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
-                factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(this, dialogService, stateManager)),
+                factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(this, stateManager)),
                 factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new PreambleEditor(stateManager, undoManager, this.getDialogService())),
                 factory.createMenuItem(StandardActions.EDIT_STRINGS, new BibtexStringEditorAction(stateManager)),
                 factory.createMenuItem(StandardActions.MANAGE_CITE_KEY_PATTERNS, new BibtexKeyPatternAction(this, stateManager))

diff --git a/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java b/src/main/java/org/jabref/gui/SaveOrderConfigDisplayViewModel.java
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.fxml
@@ -4,6 +4,7 @@
 <?import javafx.scene.control.CheckBox?>
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.VBox?>
+<?import org.jabref.gui.commonfxcontrols.FieldFormatterCleanupsPanel?>
 <fx:root xmlns:fx="http://javafx.com/fxml/1" spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/8.0.121"
          fx:controller="org.jabref.gui.cleanup.CleanupPresetPanel">
 
@@ -28,6 +29,5 @@
     <CheckBox fx:id="cleanUpBibtex"
               text="%Convert to BibTeX format (for example, move the value of the 'journaltitle' field to 'journal')"/>
 
-    <VBox fx:id="formatterContainer"/>
-
+    <FieldFormatterCleanupsPanel fx:id="formatterCleanupsPanel"/>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java b/src/main/java/org/jabref/gui/cleanup/CleanupPresetPanel.java
@@ -6,13 +6,16 @@
 import java.util.Optional;
 import java.util.Set;
 
+import javafx.collections.FXCollections;
 import javafx.fxml.FXML;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
 
+import org.jabref.gui.commonfxcontrols.FieldFormatterCleanupsPanel;
 import org.jabref.logic.cleanup.CleanupPreset;
 import org.jabref.logic.l10n.Localization;
+import org.jabref.model.cleanup.FieldFormatterCleanups;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.field.StandardField;
 import org.jabref.model.metadata.FilePreferences;
@@ -33,8 +36,7 @@ public class CleanupPresetPanel extends VBox {
     @FXML private CheckBox cleanUpUpgradeExternalLinks;
     @FXML private CheckBox cleanUpBiblatex;
     @FXML private CheckBox cleanUpBibtex;
-    @FXML private VBox formatterContainer;
-    private FieldFormatterCleanupsPanel cleanUpFormatters;
+    @FXML private FieldFormatterCleanupsPanel formatterCleanupsPanel;
 
     public CleanupPresetPanel(BibDatabaseContext databaseContext, CleanupPreset cleanupPreset, FilePreferences filePreferences) {
         this.databaseContext = Objects.requireNonNull(databaseContext);
@@ -63,9 +65,6 @@ private void init(CleanupPreset cleanupPreset, FilePreferences filePreferences)
 
         cleanUpUpgradeExternalLinks.setText(Localization.lang("Upgrade external PDF/PS links to use the '%0' field.", StandardField.FILE.getDisplayName()));
 
-        cleanUpFormatters = new FieldFormatterCleanupsPanel(Localization.lang("Run field formatter:"));
-        formatterContainer.getChildren().setAll(cleanUpFormatters);
-
         String currentPattern = Localization.lang("Filename format pattern")
                                             .concat(": ")
                                             .concat(filePreferences.getFileNamePattern());
@@ -87,7 +86,8 @@ private void updateDisplay(CleanupPreset preset) {
         cleanUpBiblatex.setSelected(preset.isActive(CleanupPreset.CleanupStep.CONVERT_TO_BIBLATEX));
         cleanUpBibtex.setSelected(preset.isActive(CleanupPreset.CleanupStep.CONVERT_TO_BIBTEX));
         cleanUpISSN.setSelected(preset.isActive(CleanupPreset.CleanupStep.CLEAN_UP_ISSN));
-        cleanUpFormatters.setValues(preset.getFormatterCleanups());
+        formatterCleanupsPanel.cleanupsDisableProperty().setValue(!preset.getFormatterCleanups().isEnabled());
+        formatterCleanupsPanel.cleanupsProperty().setValue(FXCollections.observableArrayList(preset.getFormatterCleanups().getConfiguredActions()));
     }
 
     public CleanupPreset getCleanupPreset() {
@@ -127,6 +127,8 @@ public CleanupPreset getCleanupPreset() {
 
         activeJobs.add(CleanupPreset.CleanupStep.FIX_FILE_LINKS);
 
-        return new CleanupPreset(activeJobs, cleanUpFormatters.getFormatterCleanups());
+        return new CleanupPreset(activeJobs, new FieldFormatterCleanups(
+                !formatterCleanupsPanel.cleanupsDisableProperty().getValue(),
+                formatterCleanupsPanel.cleanupsProperty()));
     }
 }