Moved ALL_JOBS to respective ViewModels, small naming changes

Author: alexsukhin

jabgui/src/main/java/org/jabref/gui/cleanup/CleanupDialogViewModel.java

@@ -33,25 +33,6 @@
 
 public class CleanupDialogViewModel extends AbstractViewModel {
 
-    public static final EnumSet<CleanupPreferences.CleanupStep> FILE_RELATED_JOBS = EnumSet.of(
-            CleanupPreferences.CleanupStep.MOVE_PDF,
-            CleanupPreferences.CleanupStep.MAKE_PATHS_RELATIVE,
-            CleanupPreferences.CleanupStep.RENAME_PDF,
-            CleanupPreferences.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS,
-            CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS,
-            CleanupPreferences.CleanupStep.CLEAN_UP_DELETED_LINKED_FILES
-    );
-
-    public static final EnumSet<CleanupPreferences.CleanupStep> MULTI_FIELD_JOBS = EnumSet.of(
-            CleanupPreferences.CleanupStep.CLEAN_UP_DOI,
-            CleanupPreferences.CleanupStep.CLEANUP_EPRINT,
-            CleanupPreferences.CleanupStep.CLEAN_UP_URL,
-            CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX,
-            CleanupPreferences.CleanupStep.CONVERT_TO_BIBTEX,
-            CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_CREATIONDATE,
-            CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_MODIFICATIONDATE
-    );
-
     private final BibDatabaseContext databaseContext;
     private final CliPreferences preferences;
     private final DialogService dialogService;
@@ -60,7 +41,7 @@ public class CleanupDialogViewModel extends AbstractViewModel {
     private final Supplier<LibraryTab> tabSupplier;
     private final TaskExecutor taskExecutor;
 
-    private ObservableList<BibEntry> targetEntries = FXCollections.observableArrayList();
+    private final ObservableList<BibEntry> targetEntries = FXCollections.observableArrayList();
     private int modifiedEntriesCount;
 
     public CleanupDialogViewModel(

jabgui/src/main/java/org/jabref/gui/cleanup/CleanupFileRelatedPanel.java

@@ -26,11 +26,10 @@ public class CleanupFileRelatedPanel extends VBox {
     @FXML private CheckBox cleanupMovePdf;
     @FXML private CheckBox cleanupMakePathsRelative;
     @FXML private CheckBox cleanupRenamePdf;
-    @FXML private CheckBox cleanupRenamePdfonlyRelativePaths;
+    @FXML private CheckBox cleanupRenamePdfOnlyRelativePaths;
     @FXML private CheckBox cleanupDeletedFiles;
     @FXML private CheckBox cleanupUpgradeExternalLinks;
 
-
     private final CleanupFileViewModel viewModel;
     private final CleanupDialogViewModel dialogViewModel;
 
@@ -64,7 +63,7 @@ private void init(BibDatabaseContext databaseContext, FilePreferences filePrefer
             viewModel.movePdfSelected.set(false);
         }
 
-        cleanupRenamePdfonlyRelativePaths.disableProperty().bind(cleanupRenamePdf.selectedProperty().not());
+        cleanupRenamePdfOnlyRelativePaths.disableProperty().bind(cleanupRenamePdf.selectedProperty().not());
 
         cleanupUpgradeExternalLinks.setText(Localization.lang("Upgrade external PDF/PS links to use the '%0' field.", StandardField.FILE.getName()));
 
@@ -76,18 +75,17 @@ private void init(BibDatabaseContext databaseContext, FilePreferences filePrefer
     private void bindProperties() {
         cleanupMovePdf.selectedProperty().bindBidirectional(viewModel.movePdfSelected);
         cleanupMovePdf.disableProperty().bind(viewModel.movePdfEnabled.not());
-
         cleanupMakePathsRelative.selectedProperty().bindBidirectional(viewModel.makePathsRelativeSelected);
         cleanupRenamePdf.selectedProperty().bindBidirectional(viewModel.renamePdfSelected);
-        cleanupRenamePdfonlyRelativePaths.selectedProperty().bindBidirectional(viewModel.renamePdfOnlyRelativeSelected);
+        cleanupRenamePdfOnlyRelativePaths.selectedProperty().bindBidirectional(viewModel.renamePdfOnlyRelativeSelected);
         cleanupDeletedFiles.selectedProperty().bindBidirectional(viewModel.deleteFilesSelected);
         cleanupUpgradeExternalLinks.selectedProperty().bindBidirectional(viewModel.upgradeLinksSelected);
     }
 
     @FXML
     private void onApply() {
         EnumSet<CleanupPreferences.CleanupStep> selectedJobs = viewModel.getSelectedJobs();
-        CleanupTabSelection selectedTab = CleanupTabSelection.ofJobs(CleanupDialogViewModel.FILE_RELATED_JOBS, selectedJobs);
+        CleanupTabSelection selectedTab = CleanupTabSelection.ofJobs(CleanupFileViewModel.FILE_RELATED_JOBS, selectedJobs);
         dialogViewModel.apply(selectedTab);
         getScene().getWindow().hide();
     }

jabgui/src/main/java/org/jabref/gui/cleanup/CleanupFileViewModel.java

@@ -9,6 +9,15 @@
 
 public class CleanupFileViewModel {
 
+    public static final EnumSet<CleanupPreferences.CleanupStep> FILE_RELATED_JOBS = EnumSet.of(
+            CleanupPreferences.CleanupStep.MOVE_PDF,
+            CleanupPreferences.CleanupStep.MAKE_PATHS_RELATIVE,
+            CleanupPreferences.CleanupStep.RENAME_PDF,
+            CleanupPreferences.CleanupStep.RENAME_PDF_ONLY_RELATIVE_PATHS,
+            CleanupPreferences.CleanupStep.CLEAN_UP_UPGRADE_EXTERNAL_LINKS,
+            CleanupPreferences.CleanupStep.CLEAN_UP_DELETED_LINKED_FILES
+    );
+
     public final BooleanProperty movePdfSelected = new SimpleBooleanProperty();
     public final BooleanProperty makePathsRelativeSelected = new SimpleBooleanProperty();
     public final BooleanProperty renamePdfSelected = new SimpleBooleanProperty();

jabgui/src/main/java/org/jabref/gui/cleanup/CleanupMultiFieldPanel.java

@@ -13,9 +13,9 @@
 import com.airhacks.afterburner.views.ViewLoader;
 
 public class CleanupMultiFieldPanel extends VBox {
-    @FXML private CheckBox cleanupDOI;
+    @FXML private CheckBox cleanupDoi;
     @FXML private CheckBox cleanupEprint;
-    @FXML private CheckBox cleanupURL;
+    @FXML private CheckBox cleanupUrl;
     @FXML private CheckBox cleanupBibLaTeX;
     @FXML private CheckBox cleanupBibTeX;
     @FXML private CheckBox cleanupTimestampToCreationDate;
@@ -40,9 +40,9 @@ public CleanupMultiFieldPanel(CleanupPreferences cleanupPreferences,
     }
 
     private void bindProperties() {
-        cleanupDOI.selectedProperty().bindBidirectional(viewModel.doiSelected);
+        cleanupDoi.selectedProperty().bindBidirectional(viewModel.doiSelected);
         cleanupEprint.selectedProperty().bindBidirectional(viewModel.eprintSelected);
-        cleanupURL.selectedProperty().bindBidirectional(viewModel.urlSelected);
+        cleanupUrl.selectedProperty().bindBidirectional(viewModel.urlSelected);
         cleanupBibTeX.selectedProperty().bindBidirectional(viewModel.bibTexSelected);
         cleanupBibLaTeX.selectedProperty().bindBidirectional(viewModel.bibLaTexSelected);
         cleanupTimestampToCreationDate.selectedProperty().bindBidirectional(viewModel.timestampToCreationSelected);
@@ -52,7 +52,7 @@ private void bindProperties() {
     @FXML
     private void onApply() {
         EnumSet<CleanupPreferences.CleanupStep> selectedJobs = viewModel.getSelectedJobs();
-        CleanupTabSelection selectedTab = CleanupTabSelection.ofJobs(CleanupDialogViewModel.MULTI_FIELD_JOBS, selectedJobs);
+        CleanupTabSelection selectedTab = CleanupTabSelection.ofJobs(CleanupMultiFieldViewModel.MULTI_FIELD_JOBS, selectedJobs);
         dialogViewModel.apply(selectedTab);
         getScene().getWindow().hide();
     }

jabgui/src/main/java/org/jabref/gui/cleanup/CleanupMultiFieldViewModel.java

@@ -9,6 +9,16 @@
 
 public class CleanupMultiFieldViewModel {
 
+    public static final EnumSet<CleanupPreferences.CleanupStep> MULTI_FIELD_JOBS = EnumSet.of(
+            CleanupPreferences.CleanupStep.CLEAN_UP_DOI,
+            CleanupPreferences.CleanupStep.CLEANUP_EPRINT,
+            CleanupPreferences.CleanupStep.CLEAN_UP_URL,
+            CleanupPreferences.CleanupStep.CONVERT_TO_BIBLATEX,
+            CleanupPreferences.CleanupStep.CONVERT_TO_BIBTEX,
+            CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_CREATIONDATE,
+            CleanupPreferences.CleanupStep.CONVERT_TIMESTAMP_TO_MODIFICATIONDATE
+    );
+
     public final BooleanProperty doiSelected = new SimpleBooleanProperty();
     public final BooleanProperty eprintSelected = new SimpleBooleanProperty();
     public final BooleanProperty urlSelected = new SimpleBooleanProperty();

jabgui/src/main/resources/org/jabref/gui/cleanup/CleanupFileRelatedPanel.fxml

@@ -20,7 +20,7 @@
         <CheckBox fx:id="cleanupRenamePdf" text="%Rename files to configured filename format pattern" />
         <VBox prefHeight="40.0" prefWidth="451.0" spacing="10.0">
             <Label fx:id="cleanupRenamePdfLabel" />
-            <CheckBox fx:id="cleanupRenamePdfonlyRelativePaths" text="%Only rename files that have a relative path" />
+            <CheckBox fx:id="cleanupRenamePdfOnlyRelativePaths" text="%Only rename files that have a relative path" />
             <VBox.margin>
                 <Insets left="20.0" />
             </VBox.margin>

jabgui/src/main/resources/org/jabref/gui/cleanup/CleanupMultiFieldPanel.fxml

@@ -13,9 +13,9 @@
     </padding>
 
     <VBox>
-        <CheckBox fx:id="cleanupDOI" text="%Move DOIs from 'note' field and 'URL' field to 'DOI' field and remove http prefix" />
+        <CheckBox fx:id="cleanupDoi" text="%Move DOIs from 'note' field and 'URL' field to 'DOI' field and remove http prefix" />
         <CheckBox fx:id="cleanupEprint" text="%Move preprint information from 'URL' field and 'journal' field to the 'eprint' field" />
-        <CheckBox fx:id="cleanupURL" text="%Move URL in 'note' field to 'URL' field" />
+        <CheckBox fx:id="cleanupUrl" text="%Move URL in 'note' field to 'URL' field" />
         <CheckBox fx:id="cleanupBibLaTeX" text="%Convert to biblatex format (e.g., store publication date in date field)" />
         <CheckBox fx:id="cleanupBibTeX" text="%Convert to BibTeX format (e.g., store publication date in year and month fields)" />
         <CheckBox fx:id="cleanupTimestampToCreationDate" text="%Convert timestamp field to field 'creationdate'" />