Fix duplicate external file type issue when change language and other corresponding issue of external file type preferences

CHANGELOG.md

@@ -36,6 +36,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
 - We fixed an issue where in the merge dialog the file field of entries was not correctly merged when the first and second entry both contained values inside the file field. [#10572](https://github.com/JabRef/jabref/issues/10572)
 - We fixed some small inconsistencies in the user interface. [#10507](https://github.com/JabRef/jabref/issues/10507) [#10458](https://github.com/JabRef/jabref/issues/10458) [#10660](https://github.com/JabRef/jabref/issues/10660)
 - We fixed the issue where the Hayagriva YAML exporter would not include a parent field for the publisher/series. [#10596](https://github.com/JabRef/jabref/issues/10596)
+- We fixed issues in the external file type dialog w.r.t. duplicate entries in the case of a language switch. [#10271](https://github.com/JabRef/jabref/issues/10271)
 
 ### Removed
 

src/main/java/org/jabref/gui/exporter/CreateModifyExporterDialogViewModel.java

@@ -57,7 +57,7 @@ public ExporterViewModel saveExporter() {
         // Check that there are no empty strings.
         if (layoutFile.get().isEmpty() || name.get().isEmpty() || extension.get().isEmpty()
                 || !layoutFile.get().endsWith(".layout")) {
-            LOGGER.info("One of the fields is empty or invalid!");
+            LOGGER.info("One of the fields is empty or invalid.");
             return null;
         }
 

src/main/java/org/jabref/gui/externalfiletype/ExternalFileTypes.java

@@ -148,10 +148,10 @@ public static String toStringList(Collection<ExternalFileType> fileTypes) {
 
         for (ExternalFileType type : fileTypes) {
             results.add(type);
-            // See if we can find a type with matching name in the default type list:
+            // See if we can find a type with matching extension in the default type list:
             ExternalFileType found = null;
             for (ExternalFileType defType : defTypes) {
-                if (defType.getName().equals(type.getName())) {
+                if (defType.getExtension().equals(type.getExtension())) {
                     found = defType;
                     break;
                 }
@@ -221,11 +221,11 @@ public static Set<ExternalFileType> fromString(String storedFileTypes) {
             } else {
                 // A new or modified entry type. Construct it from the string array:
                 ExternalFileType type = CustomExternalFileType.buildFromArgs(val);
-                // Check if there is a default type with the same name. If so, this is a
+                // Check if there is a default type with the same extension. If so, this is a
                 // modification of that type, so remove the default one:
                 ExternalFileType toRemove = null;
                 for (ExternalFileType defType : types) {
-                    if (type.getName().equals(defType.getName())) {
+                    if (type.getExtension().equals(defType.getExtension())) {
                         toRemove = defType;
                         break;
                     }

src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeEntryDialog.java

@@ -1,5 +1,6 @@
 package org.jabref.gui.preferences.externalfiletypes;
 
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
@@ -33,20 +34,24 @@ public class EditExternalFileTypeEntryDialog extends BaseDialog<Void> {
 
     private final NativeDesktop nativeDesktop = OS.getNativeDesktop();
     private final FileDialogConfiguration fileDialogConfiguration = new FileDialogConfiguration.Builder().withInitialDirectory(nativeDesktop.getApplicationDirectory()).build();
-
     private final ExternalFileTypeItemViewModel item;
 
+    private final ObservableList<ExternalFileTypeItemViewModel> fileTypes;
     private EditExternalFileTypeViewModel viewModel;
 
-    public EditExternalFileTypeEntryDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
+    public EditExternalFileTypeEntryDialog(ExternalFileTypeItemViewModel item, String dialogTitle, ObservableList<ExternalFileTypeItemViewModel> fileTypes) {
         this.item = item;
-
+        this.fileTypes = fileTypes;
         this.setTitle(dialogTitle);
 
         ViewLoader.view(this)
                   .load()
                   .setAsDialogPane(this);
 
+        getDialogPane().getButtonTypes().setAll(ButtonType.OK, ButtonType.CANCEL);
+
+        final Button confirmDialogButton = (Button) getDialogPane().lookupButton(ButtonType.OK);
+        confirmDialogButton.disableProperty().bind(viewModel.validationStatus().validProperty().not());
         this.setResultConverter(button -> {
             if (button == ButtonType.OK) {
                 viewModel.storeSettings();
@@ -57,15 +62,14 @@ public EditExternalFileTypeEntryDialog(ExternalFileTypeItemViewModel item, Strin
 
     @FXML
     public void initialize() {
-        viewModel = new EditExternalFileTypeViewModel(item);
+        viewModel = new EditExternalFileTypeViewModel(item, fileTypes);
 
         icon.setGraphic(viewModel.getIcon());
 
         defaultApplication.selectedProperty().bindBidirectional(viewModel.defaultApplicationSelectedProperty());
         customApplication.selectedProperty().bindBidirectional(viewModel.customApplicationSelectedProperty());
         selectedApplication.disableProperty().bind(viewModel.defaultApplicationSelectedProperty());
         btnBrowse.disableProperty().bind(viewModel.defaultApplicationSelectedProperty());
-
         extension.textProperty().bindBidirectional(viewModel.extensionProperty());
         name.textProperty().bindBidirectional(viewModel.nameProperty());
         mimeType.textProperty().bindBidirectional(viewModel.mimeTypeProperty());

src/main/java/org/jabref/gui/preferences/externalfiletypes/EditExternalFileTypeViewModel.java

@@ -4,21 +4,38 @@
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.collections.ObservableList;
 import javafx.scene.Node;
 
+import org.jabref.logic.l10n.Localization;
+import org.jabref.model.strings.StringUtil;
+
+import de.saxsys.mvvmfx.utils.validation.CompositeValidator;
+import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
+import de.saxsys.mvvmfx.utils.validation.ValidationMessage;
+import de.saxsys.mvvmfx.utils.validation.ValidationStatus;
+import de.saxsys.mvvmfx.utils.validation.Validator;
+
 public class EditExternalFileTypeViewModel {
     private final ExternalFileTypeItemViewModel fileTypeViewModel;
-
     private final StringProperty nameProperty = new SimpleStringProperty("");
     private final StringProperty mimeTypeProperty = new SimpleStringProperty("");
     private final StringProperty extensionProperty = new SimpleStringProperty("");
     private final StringProperty selectedApplicationProperty = new SimpleStringProperty("");
     private final BooleanProperty defaultApplicationSelectedProperty = new SimpleBooleanProperty(false);
     private final BooleanProperty customApplicationSelectedProperty = new SimpleBooleanProperty(false);
-
-    public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewModel) {
+    private final ObservableList<ExternalFileTypeItemViewModel> fileTypes;
+    private final String originalExtension;
+    private Validator extensionValidator;
+    private Validator nameValidator;
+    private Validator mimeTypeValidator;
+    private Validator sameExtensionValidator;
+    private CompositeValidator validator;
+
+    public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewModel, ObservableList<ExternalFileTypeItemViewModel> fileTypes) {
         this.fileTypeViewModel = fileTypeViewModel;
-
+        this.fileTypes = fileTypes;
+        this.originalExtension = fileTypeViewModel.extensionProperty().getValue();
         extensionProperty.setValue(fileTypeViewModel.extensionProperty().getValue());
         nameProperty.setValue(fileTypeViewModel.nameProperty().getValue());
         mimeTypeProperty.setValue(fileTypeViewModel.mimetypeProperty().getValue());
@@ -29,6 +46,48 @@ public EditExternalFileTypeViewModel(ExternalFileTypeItemViewModel fileTypeViewM
             customApplicationSelectedProperty.setValue(true);
             selectedApplicationProperty.setValue(fileTypeViewModel.applicationProperty().getValue());
         }
+
+        setupValidation();
+    }
+
+    private void setupValidation() {
+        validator = new CompositeValidator();
+        extensionValidator = new FunctionBasedValidator<>(
+                extensionProperty,
+                StringUtil::isNotBlank,
+                ValidationMessage.error(Localization.lang("Please enter a name for the extension."))
+        );
+
+        nameValidator = new FunctionBasedValidator<>(
+                nameProperty,
+                StringUtil::isNotBlank,
+                ValidationMessage.error(Localization.lang("Please enter a name."))
+        );
+
+        mimeTypeValidator = new FunctionBasedValidator<>(
+                mimeTypeProperty,
+                StringUtil::isNotBlank,
+                ValidationMessage.error(Localization.lang("Please enter a name for the MIME type."))
+        );
+
+        sameExtensionValidator = new FunctionBasedValidator<>(
+                extensionProperty,
+                extension -> {
+                    for (ExternalFileTypeItemViewModel fileTypeItem : fileTypes) {
+                        if (extension.equalsIgnoreCase(fileTypeItem.extensionProperty().get()) && !extension.equalsIgnoreCase(originalExtension)) {
+                            return false;
+                        }
+                    }
+                    return true;
+                },
+                ValidationMessage.error(Localization.lang("There is already an exists extension with the same name."))
+        );
+
+        validator.addValidators(extensionValidator, sameExtensionValidator, nameValidator, mimeTypeValidator);
+    }
+
+    public ValidationStatus validationStatus() {
+        return validator.getValidationStatus();
     }
 
     public Node getIcon() {
@@ -59,6 +118,10 @@ public BooleanProperty customApplicationSelectedProperty() {
         return customApplicationSelectedProperty;
     }
 
+    public BooleanProperty validExtensionTypeProperty() {
+        return defaultApplicationSelectedProperty;
+    }
+
     public void storeSettings() {
         fileTypeViewModel.nameProperty().setValue(nameProperty.getValue().trim());
         fileTypeViewModel.mimetypeProperty().setValue(mimeTypeProperty.getValue().trim());

src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTab.java

@@ -78,19 +78,27 @@ public void initialize() {
                 .install(fileTypesTableIconColumn);
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, Boolean>()
                 .withGraphic(none -> IconTheme.JabRefIcons.EDIT.getGraphicNode())
-                .withOnMouseClickedEvent((type, none) -> event -> viewModel.edit(type))
+                .withOnMouseClickedEvent((type, none) -> event -> editType(type))
                 .install(fileTypesTableEditColumn);
         new ValueTableCellFactory<ExternalFileTypeItemViewModel, Boolean>()
                 .withGraphic(none -> IconTheme.JabRefIcons.DELETE_ENTRY.getGraphicNode())
                 .withOnMouseClickedEvent((type, none) -> event -> viewModel.remove(type))
                 .install(fileTypesTableDeleteColumn);
     }
 
+    private void editType(ExternalFileTypeItemViewModel type) {
+        if (viewModel.edit(type)) {
+            fileTypesTable.getSelectionModel().selectLast();
+            fileTypesTable.scrollTo(viewModel.getFileTypes().size() - 1);
+        }
+    }
+
     @FXML
     private void addNewType() {
-        viewModel.addNewType();
-        fileTypesTable.getSelectionModel().selectLast();
-        fileTypesTable.scrollTo(viewModel.getFileTypes().size() - 1);
+        if (viewModel.addNewType()) {
+            fileTypesTable.getSelectionModel().selectLast();
+            fileTypesTable.scrollTo(viewModel.getFileTypes().size() - 1);
+        }
     }
 
     @FXML

src/main/java/org/jabref/gui/preferences/externalfiletypes/ExternalFileTypesTabViewModel.java

@@ -8,14 +8,19 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.gui.DialogService;
+import org.jabref.gui.exporter.CreateModifyExporterDialogViewModel;
 import org.jabref.gui.externalfiletype.ExternalFileType;
 import org.jabref.gui.externalfiletype.ExternalFileTypes;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.FilePreferences;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 public class ExternalFileTypesTabViewModel implements PreferenceTabViewModel {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(CreateModifyExporterDialogViewModel.class);
     private final ObservableList<ExternalFileTypeItemViewModel> fileTypes = FXCollections.observableArrayList();
 
     private final FilePreferences filePreferences;
@@ -54,25 +59,69 @@ public void resetToDefaults() {
         fileTypes.sort(Comparator.comparing(ExternalFileTypeItemViewModel::getName));
     }
 
-    public void addNewType() {
+    public boolean addNewType() {
         ExternalFileTypeItemViewModel item = new ExternalFileTypeItemViewModel();
-        fileTypes.add(item);
         showEditDialog(item, Localization.lang("Add new file type"));
+
+        if (!isValidExternalFileType(item)) {
+            return false;
+        }
+
+        fileTypes.add(item);
+        return true;
     }
 
     public ObservableList<ExternalFileTypeItemViewModel> getFileTypes() {
         return fileTypes;
     }
 
-    private void showEditDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
-        dialogService.showCustomDialogAndWait(new EditExternalFileTypeEntryDialog(item, dialogTitle));
+    protected void showEditDialog(ExternalFileTypeItemViewModel item, String dialogTitle) {
+        dialogService.showCustomDialogAndWait(new EditExternalFileTypeEntryDialog(item, dialogTitle, fileTypes));
     }
 
-    public void edit(ExternalFileTypeItemViewModel type) {
-        showEditDialog(type, Localization.lang("Edit file type"));
+    public boolean edit(ExternalFileTypeItemViewModel type) {
+        ExternalFileTypeItemViewModel typeToModify = new ExternalFileTypeItemViewModel(type.toExternalFileType());
+        showEditDialog(typeToModify, Localization.lang("Edit file type"));
+
+        if (!isValidExternalFileType(typeToModify)) {
+            return false;
+        }
+
+        fileTypes.remove(type);
+        fileTypes.add(typeToModify);
+        return true;
     }
 
     public void remove(ExternalFileTypeItemViewModel type) {
         fileTypes.remove(type);
     }
+
+    public boolean isValidExternalFileType(ExternalFileTypeItemViewModel item) {
+        if (withEmptyValue(item)) {
+            LOGGER.debug("One of the fields is empty or invalid.");
+            return false;
+        }
+
+        if (!isUniqueExtension(item)) {
+            LOGGER.debug("File Extension exists already.");
+            return false;
+        }
+
+        return true;
+    }
+
+    private boolean withEmptyValue(ExternalFileTypeItemViewModel item) {
+        return item.getName().isEmpty() || item.extensionProperty().get().isEmpty() || item.mimetypeProperty().get().isEmpty();
+    }
+
+    private boolean isUniqueExtension(ExternalFileTypeItemViewModel item) {
+        // check extension need to be unique in the list
+        String newExt = item.extensionProperty().get();
+        for (ExternalFileTypeItemViewModel fileTypeItem : fileTypes) {
+            if (newExt.equalsIgnoreCase(fileTypeItem.extensionProperty().get())) {
+                return false;
+            }
+        }
+        return true;
+    }
 }

src/main/resources/l10n/JabRef_en.properties

@@ -2040,6 +2040,11 @@ Matching=Matching
 Same\ as\ --import,\ but\ will\ be\ imported\ to\ the\ opened\ tab=Same as --import, but will be imported to the opened tab
 Allow\ integers\ in\ 'edition'\ field\ in\ BibTeX\ mode=Allow integers in 'edition' field in BibTeX mode
 
+Please\ enter\ a\ name\ for\ the\ MIME\ type.=Please enter a name for the MIME type.
+Please\ enter\ a\ name\ for\ the\ extension.=Please enter a name for the extension.
+Please\ enter\ a\ name.=Please enter a name.
+There\ is\ already\ an\ exists\ extension\ with\ the\ same\ name.=There is already an exists extension with the same name.
+
 Search\ for\ citations\ in\ LaTeX\ files...=Search for citations in LaTeX files...
 LaTeX\ Citations\ Search\ Results=LaTeX Citations Search Results
 LaTeX\ files\ directory\:=LaTeX files directory:
@@ -2622,7 +2627,7 @@ Enable=Enable
 Keep\ disabled=Keep disabled
 
 Predatory\ journal\ %0\ found=Predatory journal %0 found
-  
+
 Hide\ user\ comments=Hide user comments
 Show\ user\ comments\ field=Show user comments field