Extracted calls to JabRefPreferences out of CustomImportList

src/main/java/org/jabref/gui/importer/ImportCustomizationDialog.java

@@ -2,7 +2,6 @@
 
 import javax.inject.Inject;
 
-import javafx.beans.property.ReadOnlyStringWrapper;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.ButtonType;
@@ -15,7 +14,6 @@
 import org.jabref.gui.util.BaseDialog;
 import org.jabref.gui.util.ControlHelper;
 import org.jabref.gui.util.ViewModelTableRowFactory;
-import org.jabref.logic.importer.fileformat.CustomImporter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.PreferencesService;
 
@@ -27,10 +25,10 @@ public class ImportCustomizationDialog extends BaseDialog<Void> {
  @FXML private ButtonType addButton;
  @FXML private ButtonType removeButton;
  @FXML private ButtonType closeButton;
- @FXML private TableView<CustomImporter> importerTable;
- @FXML private TableColumn<CustomImporter, String> nameColumn;
- @FXML private TableColumn<CustomImporter, String> classColumn;
- @FXML private TableColumn<CustomImporter, String> basePathColumn;
+ @FXML private TableView<ImporterViewModel> importerTable;
+ @FXML private TableColumn<ImporterViewModel, String> nameColumn;
+ @FXML private TableColumn<ImporterViewModel, String> classColumn;
+ @FXML private TableColumn<ImporterViewModel, String> basePathColumn;
 
  @Inject private DialogService dialogService;
  @Inject private PreferencesService preferences;
@@ -60,11 +58,11 @@ private void initialize() {
  importerTable.getSelectionModel().setSelectionMode(SelectionMode.MULTIPLE);
  importerTable.itemsProperty().bind(viewModel.importersProperty());
  EasyBind.bindContent(viewModel.selectedImportersProperty(), importerTable.getSelectionModel().getSelectedItems());
- nameColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().getName()));
- classColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().getClassName()));
- basePathColumn.setCellValueFactory(cellData -> new ReadOnlyStringWrapper(cellData.getValue().getBasePath().toString()));
- new ViewModelTableRowFactory<CustomImporter>()
- .withTooltip(CustomImporter::getDescription)
+ nameColumn.setCellValueFactory(cellData -> cellData.getValue().name());
+ classColumn.setCellValueFactory(cellData -> cellData.getValue().className());
+ basePathColumn.setCellValueFactory(cellData -> cellData.getValue().basePath());
+ new ViewModelTableRowFactory<ImporterViewModel>()
+ .withTooltip(importer -> importer.getLogic().getDescription())
  .install(importerTable);
  }
 }

src/main/java/org/jabref/gui/importer/ImportCustomizationDialogViewModel.java

@@ -4,6 +4,8 @@
 import java.nio.file.Path;
 import java.util.Collections;
 import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import javafx.beans.property.ListProperty;
 import javafx.beans.property.SimpleListProperty;
@@ -26,16 +28,23 @@ public class ImportCustomizationDialogViewModel extends AbstractViewModel {
 
  private static final Logger LOGGER = LoggerFactory.getLogger(ImportCustomizationDialogViewModel.class);
 
- private final ListProperty<CustomImporter> importers;
- private final ListProperty<CustomImporter> selectedImporters = new SimpleListProperty<>(FXCollections.observableArrayList());
+ private final ListProperty<ImporterViewModel> importers = new SimpleListProperty<>(FXCollections.observableArrayList());
+ private final ListProperty<ImporterViewModel> selectedImporters = new SimpleListProperty<>(FXCollections.observableArrayList());
 
  private final PreferencesService preferences;
  private final DialogService dialogService;
 
  public ImportCustomizationDialogViewModel(PreferencesService preferences, DialogService dialogService) {
  this.preferences = preferences;
  this.dialogService = dialogService;
- this.importers = new SimpleListProperty<>(FXCollections.observableArrayList(Globals.prefs.customImports));
+ loadImporters();
+ }
+
+ private void loadImporters() {
+ Set<CustomImporter> importersLogic = preferences.getCustomImportFormats();
+ for (CustomImporter importer : importersLogic) {
+ importers.add(new ImporterViewModel(importer));
+ }
  }
 
  /**
@@ -61,7 +70,7 @@ public void addImporter() {
  FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder()
  .addExtensionFilter(StandardFileType.CLASS, StandardFileType.JAR, StandardFileType.ZIP)
  .withDefaultExtension(StandardFileType.CLASS)
- .withInitialDirectory(Globals.prefs.getWorkingDir())
+ .withInitialDirectory(preferences.getWorkingDir())
  .build();
 
  Optional<Path> selectedFile = dialogService.showFileOpenDialog(fileDialogConfiguration);
@@ -78,7 +87,7 @@ public void addImporter() {
  String className = selectedFileInArchive.get().toString().substring(0, selectedFileInArchive.get().toString().lastIndexOf('.')).replace(
  "/", ".");
  CustomImporter importer = new CustomImporter(selectedFile.get().toAbsolutePath().toString(), className);
- importers.add(importer);
+ importers.add(new ImporterViewModel(importer));
  }
  } catch (IOException exc) {
  LOGGER.error("Could not open ZIP-archive.", exc);
@@ -98,7 +107,7 @@ public void addImporter() {
  String className = pathToClass(basePath, selectedFile.get());
  CustomImporter importer = new CustomImporter(basePath, className);
 
- importers.add(importer);
+ importers.add(new ImporterViewModel(importer));
  } catch (Exception exc) {
  LOGGER.error("Could not instantiate importer", exc);
  dialogService.showErrorDialogAndWait(Localization.lang("Could not instantiate %0", selectedFile.get().toString()), exc);
@@ -117,19 +126,20 @@ public void removeSelectedImporter() {
  }
 
  public void saveToPrefs() {
- Globals.prefs.customImports.clear();
- Globals.prefs.customImports.addAll(importers);
+ preferences.storeCustomImportFormats(importers.stream()
+ .map(ImporterViewModel::getLogic)
+ .collect(Collectors.toSet()));
  Globals.IMPORT_FORMAT_READER.resetImportFormats(
- Globals.prefs.getImportFormatPreferences(),
- Globals.prefs.getXmpPreferences(),
+ preferences.getImportFormatPreferences(),
+ preferences.getXmpPreferences(),
  Globals.getFileUpdateMonitor());
  }
 
- public ListProperty<CustomImporter> selectedImportersProperty() {
+ public ListProperty<ImporterViewModel> selectedImportersProperty() {
  return selectedImporters;
  }
 
- public ListProperty<CustomImporter> importersProperty() {
+ public ListProperty<ImporterViewModel> importersProperty() {
  return importers;
  }
 }

src/main/java/org/jabref/gui/importer/ImporterViewModel.java

@@ -0,0 +1,36 @@
+package org.jabref.gui.importer;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+import org.jabref.logic.importer.fileformat.CustomImporter;
+
+public class ImporterViewModel {
+ private final CustomImporter importer;
+ private final StringProperty name = new SimpleStringProperty();
+ private final StringProperty classname = new SimpleStringProperty();
+ private final StringProperty basePath = new SimpleStringProperty();
+
+ public ImporterViewModel(CustomImporter importer) {
+ this.importer = importer;
+ this.name.setValue(importer.getName());
+ this.classname.setValue(importer.getClassName());
+ this.basePath.setValue(importer.getBasePath().toString());
+ }
+
+ public CustomImporter getLogic() {
+ return this.importer;
+ }
+
+ public StringProperty name() {
+ return this.name;
+ }
+
+ public StringProperty className() {
+ return this.classname;
+ }
+
+ public StringProperty basePath() {
+ return this.basePath;
+ }
+}