From f1e5c0a1112ea11fd910f211235ffb03145bf82a Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Sun, 16 Sep 2018 14:26:59 +0200
Subject: [PATCH] fix missing ids change bidirectional binding use string
 property

---
 .../genfields/GenFieldsCustomizerDialog.fxml  |  4 ++--
 .../GenFieldsCustomizerDialogView.java        |  3 +--
 .../GenFieldsCustomizerDialogViewModel.java   | 21 ++++++++++---------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/jabref/gui/genfields/GenFieldsCustomizerDialog.fxml b/src/main/java/org/jabref/gui/genfields/GenFieldsCustomizerDialog.fxml
index e8c6a3b18..23692e918 100644
--- a/src/main/java/org/jabref/gui/genfields/GenFieldsCustomizerDialog.fxml
+++ b/src/main/java/org/jabref/gui/genfields/GenFieldsCustomizerDialog.fxml
@@ -12,12 +12,12 @@
             <children>
                 <Label text="General Fields" />
                 <Label text="Create custom fields for each BibTeX entry" />
-                <TextArea minHeight="200.0" minWidth="628.0" />
+                <TextArea fx:id="fieldsTextArea" minHeight="200.0" minWidth="628.0" />
                 <Label text="Format: Tab:field;field;... (e.g. General:url;pdf;note...)" />
             </children>
         </VBox>
     </content>
-    <ButtonType fx:constant="OK" />
+    <ButtonType fx:id="okButton" fx:constant="OK" />
     <ButtonType fx:id="resetButton" buttonData="LEFT" text="%Revert" />
     <ButtonType fx:id="helpButton" text="%Help" />
     <ButtonType fx:constant="CANCEL" />
diff --git a/src/main/java/org/jabref/gui/genfields/GenFieldsCustomizerDialogView.java b/src/main/java/org/jabref/gui/genfields/GenFieldsCustomizerDialogView.java
index 7a5157cf4..32a2ad66d 100644
--- a/src/main/java/org/jabref/gui/genfields/GenFieldsCustomizerDialogView.java
+++ b/src/main/java/org/jabref/gui/genfields/GenFieldsCustomizerDialogView.java
@@ -42,8 +42,7 @@ public class GenFieldsCustomizerDialogView extends BaseDialog<Void> {
     @FXML
     private void initialize() {
         viewModel = new GenFieldsCustomizerDialogViewModel(dialogService, preferences);
-
-        viewModel.fieldsTextProperty().bindBidirectional(fieldsTextArea.textProperty());
+        fieldsTextArea.textProperty().bindBidirectional(viewModel.fieldsTextProperty());
         //No need to use EasyBind here
 
     }
diff --git a/src/main/java/org/jabref/gui/genfields/GenFieldsCustomizerDialogViewModel.java b/src/main/java/org/jabref/gui/genfields/GenFieldsCustomizerDialogViewModel.java
index e20282be9..0d171c7da 100644
--- a/src/main/java/org/jabref/gui/genfields/GenFieldsCustomizerDialogViewModel.java
+++ b/src/main/java/org/jabref/gui/genfields/GenFieldsCustomizerDialogViewModel.java
@@ -3,21 +3,21 @@ package org.jabref.gui.genfields;
 import java.util.List;
 import java.util.Map;
 
-import javafx.beans.property.ObjectProperty;
-import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.beans.property.StringProperty;
+
 import org.jabref.Globals;
-import org.jabref.gui.AbstractViewModel;
 import org.jabref.gui.DialogService;
 import org.jabref.logic.bibtexkeypattern.BibtexKeyGenerator;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreferencesService;
 
-public class GenFieldsCustomizerDialogViewModel extends AbstractViewModel {
+public class GenFieldsCustomizerDialogViewModel {
 
     private final DialogService dialogService;
     private final PreferencesService preferences;
-    private final ObjectProperty<String> fieldsText = new SimpleObjectProperty<>();
+    private final StringProperty fieldsText = new SimpleStringProperty("");
 
     public GenFieldsCustomizerDialogViewModel(DialogService dialogService, PreferencesService preferences) {
         this.dialogService = dialogService;
@@ -28,6 +28,7 @@ public class GenFieldsCustomizerDialogViewModel extends AbstractViewModel {
     private void setInitialFieldsText() {
         StringBuilder sb = new StringBuilder();
 
+        //TODO: add method getEntryEditorTabList to PreferencesService interface
         for (Map.Entry<String, List<String>> tab : Globals.prefs.getEntryEditorTabList().entrySet()) {
             sb.append(tab.getKey());
             sb.append(':');
@@ -38,7 +39,7 @@ public class GenFieldsCustomizerDialogViewModel extends AbstractViewModel {
         fieldsText.set(sb.toString());
     }
 
-    public ObjectProperty<String> fieldsTextProperty() {
+    public StringProperty fieldsTextProperty() {
         return fieldsText;
     }
 
@@ -52,18 +53,18 @@ public class GenFieldsCustomizerDialogViewModel extends AbstractViewModel {
                 String field = Localization.lang("field");
                 String title = Localization.lang("Error");
                 String content = Localization.lang("Each line must be of the following form") + " '" +
-                    Localization.lang("Tabname") + ':' + field + "1;" + field + "2;...;" + field + "N'";
+                                 Localization.lang("Tabname") + ':' + field + "1;" + field + "2;...;" + field + "N'";
                 dialogService.showInformationDialogAndWait(title, content);
                 return;
             }
-            String testString = BibtexKeyGenerator.cleanKey(parts[1],
-                    Globals.prefs.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
+
+            //TODO: create a method in preferences which wraps the get enfore legal keys and add it to preferneces service as well
+            String testString = BibtexKeyGenerator.cleanKey(parts[1], Globals.prefs.getBoolean(JabRefPreferences.ENFORCE_LEGAL_BIBTEX_KEY));
 
             //Unfinished
         }
     }
 
-
     public void resetFields() {
 
     }
-- 
2.19.0.windows.1