Convert Strings Dialog to javafx

src/main/java/org/jabref/gui/JabRefFrame.java

@@ -106,6 +106,7 @@
 import org.jabref.gui.push.PushToApplications;
 import org.jabref.gui.search.GlobalSearchBar;
 import org.jabref.gui.specialfields.SpecialFieldValueViewModel;
+import org.jabref.gui.strings.StringAction;
 import org.jabref.gui.undo.CountingUndoManager;
 import org.jabref.gui.util.DefaultTaskExecutor;
 import org.jabref.logic.autosaveandbackup.AutosaveManager;
@@ -873,13 +874,15 @@ private MenuBar createMenu() {
 
                 new SeparatorMenuItem(),
 
+
                 factory.createMenuItem(StandardActions.DELETE_ENTRY, new EditAction(Actions.DELETE)),
 
                 new SeparatorMenuItem(),
 
                 factory.createMenuItem(StandardActions.LIBRARY_PROPERTIES, new LibraryPropertiesAction(this)),
                 factory.createMenuItem(StandardActions.EDIT_PREAMBLE, new OldDatabaseCommandWrapper(Actions.EDIT_PREAMBLE, this, Globals.stateManager)),
-                factory.createMenuItem(StandardActions.EDIT_STRINGS, new OldDatabaseCommandWrapper(Actions.EDIT_STRINGS, this, Globals.stateManager))
+
+                factory.createMenuItem(StandardActions.EDIT_STRINGS, new StringAction())
 
         );
 

src/main/java/org/jabref/gui/strings/StringAction.java

@@ -0,0 +1,12 @@
+package org.jabref.gui.strings;
+
+import org.jabref.gui.actions.SimpleCommand;
+
+public class StringAction extends SimpleCommand {
+
+    @Override
+    public void execute() {
+        new StringDialogView().show();
+    }
+
+}

src/main/java/org/jabref/gui/strings/StringDialogController.java

@@ -0,0 +1,133 @@
+package org.jabref.gui.strings;
+
+import javax.inject.Inject;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.TableCell;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableColumn.CellEditEvent;
+import javafx.scene.control.TableView;
+import javafx.scene.control.Tooltip;
+import javafx.scene.control.cell.TextFieldTableCell;
+import javafx.util.Callback;
+import javafx.util.converter.DefaultStringConverter;
+
+import org.jabref.gui.AbstractController;
+import org.jabref.gui.IconTheme.JabRefIcons;
+import org.jabref.gui.StateManager;
+import org.jabref.gui.help.HelpAction;
+import org.jabref.logic.help.HelpFile;
+import org.jabref.logic.l10n.Localization;
+
+import org.controlsfx.tools.ValueExtractor;
+import org.controlsfx.validation.ValidationSupport;
+import org.controlsfx.validation.Validator;
+
+public class StringDialogController extends AbstractController<StringDialogViewModel> {
+
+    @FXML private Button btnNewString;
+    @FXML private Button btnRemove;
+    @FXML private Button btnHelp;
+    @FXML private Button btnCancel;
+    @FXML private Button btnSave;
+    @FXML private TableView<StringViewModel> tblStrings;
+    @FXML private TableColumn<StringViewModel, String> colLabel;
+    @FXML private TableColumn<StringViewModel, String> colContent;
+    @Inject private StateManager stateManager;
+
+    @FXML
+    private void initialize() {
+
+        btnHelp.setGraphic(JabRefIcons.HELP.getGraphicNode());
+        btnHelp.setTooltip(new Tooltip(Localization.lang("Open Help page")));
+
+        btnNewString.setGraphic(JabRefIcons.ADD.getGraphicNode());
+        btnNewString.setTooltip(new Tooltip(Localization.lang("New string")));
+
+        btnRemove.setGraphic(JabRefIcons.REMOVE.getGraphicNode());
+        btnRemove.setTooltip(new Tooltip(Localization.lang("Remove string")));
+
+        viewModel = new StringDialogViewModel(stateManager);
+        colLabel.setCellValueFactory(cellData -> cellData.getValue().getLabel());
+        colContent.setCellValueFactory(cellData -> cellData.getValue().getContent());
+
+        ValidationSupport validationSupport = new ValidationSupport();
+
+        //Register TextfieldTableCell Control for validation
+        ValueExtractor.addObservableValueExtractor(c -> c instanceof TextFieldTableCell, c -> ((TextFieldTableCell<?, String>) c).textProperty());
+
+        colLabel.setCellFactory(new Callback<TableColumn<StringViewModel, String>, TableCell<StringViewModel, String>>() {
+
+            @Override
+            public TableCell<StringViewModel, String> call(TableColumn<StringViewModel, String> param) {
+
+                TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
+                validationSupport.registerValidator(cell, Validator.createEmptyValidator("Text is required"));
+                return cell;
+            }
+
+        });
+
+        colContent.setCellFactory(new Callback<TableColumn<StringViewModel, String>, TableCell<StringViewModel, String>>() {
+
+            @Override
+            public TableCell<StringViewModel, String> call(TableColumn<StringViewModel, String> param) {
+
+                TextFieldTableCell<StringViewModel, String> cell = new TextFieldTableCell<>(new DefaultStringConverter());
+                validationSupport.registerValidator(cell, Validator.createEmptyValidator("Text is required"));
+                return cell;
+            }
+        });
+
+        colLabel.setOnEditCommit(
+                (CellEditEvent<StringViewModel, String> t) -> {
+                    t.getTableView()
+                            .getItems()
+                            .get(
+                                    t.getTablePosition().getRow())
+                            .setLabel(t.getNewValue());
+                });
+        colContent.setOnEditCommit(
+                (CellEditEvent<StringViewModel, String> t) -> {
+                    t.getTableView()
+                            .getItems()
+                            .get(
+                                    t.getTablePosition().getRow())
+                            .setContent(t.getNewValue());
+                });
+
+        tblStrings.itemsProperty().bindBidirectional(viewModel.allStringsProperty());
+        tblStrings.setEditable(true);
+
+        tblStrings.getSelectionModel().selectedItemProperty().addListener(
+                (observable, oldValue, newValue) -> viewModel.validateInput(newValue));
+    }
+
+    @FXML
+    private void addString(ActionEvent event) {
+        viewModel.addNewString();
+    }
+
+    @FXML
+    private void openHelp(ActionEvent event) {
+        HelpAction.openHelpPage(HelpFile.STRING_EDITOR);
+    }
+
+    @FXML
+    private void removeString(ActionEvent event) {
+        StringViewModel selected = tblStrings.getSelectionModel().getSelectedItem();
+        viewModel.removeString(selected);
+    }
+
+    @FXML
+    private void save() {
+        viewModel.save();
+    }
+
+    @FXML
+    private void close() {
+        getStage().close();
+    }
+}

src/main/java/org/jabref/gui/strings/StringDialogView.java

@@ -0,0 +1,18 @@
+package org.jabref.gui.strings;
+
+import javafx.scene.control.Alert.AlertType;
+import javafx.scene.control.DialogPane;
+
+import org.jabref.gui.AbstractDialogView;
+import org.jabref.gui.FXDialog;
+
+public class StringDialogView extends AbstractDialogView {
+
+    @Override
+    public void show() {
+        FXDialog stringDialog = new FXDialog(AlertType.INFORMATION, "Edit Strings");
+        stringDialog.setDialogPane((DialogPane) this.getView());
+        stringDialog.setResizable(true);
+        stringDialog.show();
+    }
+}

src/main/java/org/jabref/gui/strings/StringDialogViewModel.java

@@ -0,0 +1,84 @@
+package org.jabref.gui.strings;
+
+import java.util.Optional;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+import javafx.beans.property.ListProperty;
+import javafx.beans.property.SimpleListProperty;
+import javafx.collections.FXCollections;
+
+import org.jabref.gui.AbstractViewModel;
+import org.jabref.gui.StateManager;
+import org.jabref.logic.bibtex.comparator.BibtexStringComparator;
+import org.jabref.model.database.BibDatabase;
+import org.jabref.model.entry.BibtexString;
+
+public class StringDialogViewModel extends AbstractViewModel {
+
+    private final ListProperty<StringViewModel> allStrings = new SimpleListProperty<>(FXCollections.observableArrayList());
+
+    private final BibDatabase db;
+
+    public StringDialogViewModel(StateManager stateManager) {
+        this.db = stateManager.getActiveDatabase().get().getDatabase();
+        addAllStringsFromDB();
+
+    }
+
+    private void addAllStringsFromDB() {
+
+        Set<StringViewModel> strings = db.getStringKeySet()
+                .stream()
+                .map(string -> db.getString(string))
+                .sorted(new BibtexStringComparator(false))
+                .map(this::convertFromBibTexString)
+                .collect(Collectors.toSet());
+        allStrings.addAll(strings);
+    }
+
+    public ListProperty<StringViewModel> allStringsProperty() {
+        return this.allStrings;
+    }
+
+    public void addNewString() {
+        allStrings.add(new StringViewModel("new Label", "New Content"));
+    }
+
+    public void removeString(StringViewModel selected) {
+        allStrings.remove(selected);
+
+    }
+
+    private StringViewModel convertFromBibTexString(BibtexString bibtexString) {
+        return new StringViewModel(bibtexString.getName(), bibtexString.getContent());
+
+    }
+
+    public void validateInput(StringViewModel newValue) {
+        if (newValue != null) {
+            String label = newValue.getLabel().getValue();
+            String content = newValue.getContent().getValue();
+
+            //TODO: Validation
+        }
+
+    }
+
+    public void save() {
+        for (StringViewModel model : allStrings) {
+            String label = model.getLabel().getValue();
+            String content = model.getContent().getValue();
+
+            Optional<BibtexString> bibtexString = db.getStringByName(label);
+            if (bibtexString.isPresent()) {
+                if (!(bibtexString.get().getContent().equals(content))) {
+                    bibtexString.get().setContent(content);
+                }
+            } else {
+                db.addString(new BibtexString(label, content));
+            }
+        }
+
+    }
+}

src/main/java/org/jabref/gui/strings/StringViewModel.java

@@ -0,0 +1,33 @@
+package org.jabref.gui.strings;
+
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
+
+public class StringViewModel {
+
+    private final StringProperty label;
+    private final StringProperty content;
+
+    public StringViewModel(String label, String content) {
+
+        this.label = new SimpleStringProperty(label);
+        this.content = new SimpleStringProperty(content);
+    }
+
+    public StringProperty getLabel() {
+        return label;
+    }
+
+    public StringProperty getContent() {
+        return content;
+    }
+
+    public void setLabel(String label) {
+        this.label.setValue(label);
+    }
+
+    public void setContent(String content) {
+        this.content.setValue(content);
+    }
+}

src/main/java/org/jabref/gui/util/IconValidationDecorator.java

@@ -31,14 +31,17 @@ public IconValidationDecorator(Pos position) {
         this.position = position;
     }
 
+    @Override
     protected Node createErrorNode() {
         return IconTheme.JabRefIcons.ERROR.getGraphicNode();
     }
 
+    @Override
     protected Node createWarningNode() {
         return IconTheme.JabRefIcons.WARNING.getGraphicNode();
     }
 
+    @Override
     public Node createDecorationNode(ValidationMessage message) {
         Node graphic = Severity.ERROR == message.getSeverity() ? createErrorNode() : createWarningNode();
         graphic.getStyleClass().add(Severity.ERROR == message.getSeverity() ? "error-icon" : "warning-icon");
@@ -49,6 +52,7 @@ public Node createDecorationNode(ValidationMessage message) {
         return label;
     }
 
+    @Override
     protected Tooltip createTooltip(ValidationMessage message) {
         Tooltip tooltip = new Tooltip(message.getText());
         tooltip.getStyleClass().add(Severity.ERROR == message.getSeverity() ? "tooltip-error" : "tooltip-warning");

src/main/java/org/jabref/model/database/BibDatabase.java

@@ -318,7 +318,7 @@ public BibtexString getString(String id) {
     }
 
     /**
-     * Returns the string with the given name.
+     * Returns the string with the given name/label
      */
     public Optional<BibtexString> getStringByName(String name) {
         for (BibtexString string : getStringValues()) {

src/main/java/org/jabref/model/entry/BibtexString.java

@@ -7,6 +7,7 @@
  * This class models a BibTex String ("@String")
  */
 public class BibtexString implements Cloneable {
+
     /**
      * Type of a \@String.
      * <p>
@@ -95,6 +96,10 @@ public void setId(String id) {
         hasChanged = true;
     }
 
+    /**
+     * Returns the name/label of the string
+     * @return
+     */
     public String getName() {
         return name;
     }
@@ -173,15 +178,19 @@ public String toString() {
 
     @Override
     public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
+        if (this == o) {
+            return true;
+        }
+        if ((o == null) || (getClass() != o.getClass())) {
+            return false;
+        }
         BibtexString that = (BibtexString) o;
-        return hasChanged == that.hasChanged &&
+        return (Objects.equals(hasChanged,that.hasChanged) &&
                 Objects.equals(name, that.name) &&
                 Objects.equals(content, that.content) &&
-                Objects.equals(id, that.id) &&
-                type == that.type &&
-                Objects.equals(parsedSerialization, that.parsedSerialization);
+                Objects.equals(id, that.id)  &&
+                Objects.equals(type, that.type) &&
+                Objects.equals(parsedSerialization, that.parsedSerialization));
     }
 
     @Override