From 2af4fa40f74a379d62368b1e0e1a5d31dc9b1570 Mon Sep 17 00:00:00 2001
From: Hana Chaari <hana.chaari@medtech.tn>
Date: Tue, 21 Mar 2023 12:45:45 +0100
Subject: [PATCH 01/11] Remote services config panel UI

---
 .../RemoteServicesConfigPanel.fxml            | 21 +++++++++++++++++++
 .../RemoteServicesConfigPanel.java            |  4 ++++
 .../RemoteServicesConfigPanelViewModel.java   |  4 ++++
 .../importexport/ImportExportTab.fxml         |  5 +++++
 src/main/resources/l10n/JabRef_en.properties  |  4 +++-
 5 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml
 create mode 100644 src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
 create mode 100644 src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java

diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml
new file mode 100644
index 00000000000..3ce8887fa38
--- /dev/null
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<fx:root prefWidth="650.0" spacing="10.0" type="VBox"
+         xmlns="http://javafx.com/javafx/8.0.212" xmlns:fx="http://javafx.com/fxml/1"
+         fx:controller="org.jabref.gui.commonfxcontrols.RemoteServicesConfigPanel">
+    <fx:define>
+        <ToggleGroup fx:id="RemoteServicesToggleGroup"/>
+    </fx:define>
+
+    <RadioButton fx:id="gorbidEnabled" text="%Always enable Gorbid"
+                 toggleGroup="RemoteServicesToggleGroup"/>
+    <RadioButton fx:id="gorbidDisabled" text="%Always disable Gorbid"
+                 toggleGroup="RemoteServicesToggleGroup"/>
+    <RadioButton fx:id="gorbidDemanded" text="%Always Ask"
+                 toggleGroup="RemoteServicesToggleGroup"/>
+</fx:root>
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
new file mode 100644
index 00000000000..eec7fc84017
--- /dev/null
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
@@ -0,0 +1,4 @@
+package org.jabref.gui.commonfxcontrols;
+
+public class RemoteServicesConfigPanel {
+}
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
new file mode 100644
index 00000000000..34541c84b17
--- /dev/null
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
@@ -0,0 +1,4 @@
+package org.jabref.gui.commonfxcontrols;
+
+public class RemoteServicesConfigPanelViewModel {
+}
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
index c698a797910..7785c01a42d 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
@@ -9,6 +9,8 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 <?import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel?>
+<?import org.jabref.gui.commonfxcontrols.RemoteServicesConfigPanel?>
+
 <fx:root spacing="10.0" type="VBox"
          xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"
          fx:controller="org.jabref.gui.preferences.importexport.ImportExportTab">
@@ -28,6 +30,9 @@
     <Label styleClass="sectionHeader" text="%Export sort order"/>
     <SaveOrderConfigPanel fx:id="exportOrderPanel"/>
 
+    <Label styleClass="sectionHeader" text="%Remote services"/>
+    <RemoteServicesConfigPanel fx:id="RemoteServicesPanel"/>
+
     <Label styleClass="sectionHeader" text="%Remote services"/>
     <CheckBox fx:id="grobidEnabled" text="%Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results."/>
     <HBox alignment="CENTER_LEFT" spacing="10.0">
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 188a114e8d4..263d3e5c612 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2432,7 +2432,9 @@ Found\ matches\ in\ Annotations\:=Found matches in Annotations:
 Grobid\ URL=Grobid URL
 Remote\ services=Remote services
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results.
-
+Always\ enable\ Gorbid=Always enable Gorbid
+Always\ disable\ Gorbid=Always disable Gorbid
+Always\ Ask=Always Ask
 Fetcher\ cannot\ be\ tested\!=Fetcher cannot be tested!
 Fetcher\ unknown\!=Fetcher unknown!
 

From dbd2e692ba851400e529431dbd8ee73ce2adc1c3 Mon Sep 17 00:00:00 2001
From: Hana Chaari <hana.chaari@medtech.tn>
Date: Wed, 22 Mar 2023 13:23:50 +0100
Subject: [PATCH 02/11] complete pannel error: unable coerce toggleGroup

---
 .../RemoteServicesConfigPanel.java            | 38 ++++++++++++++++++-
 .../RemoteServicesConfigPanelViewModel.java   | 18 +++++++++
 .../importexport/ImportExportTab.fxml         |  2 +-
 .../importexport/ImportExportTab.java         | 12 ++++--
 .../ImportExportTabViewModel.java             | 22 ++++++++++-
 .../importer/fetcher/GrobidPreferences.java   | 17 +++++++++
 .../jabref/preferences/JabRefPreferences.java |  5 +++
 7 files changed, 106 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
index eec7fc84017..c963b5819fe 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
@@ -1,4 +1,40 @@
 package org.jabref.gui.commonfxcontrols;
 
-public class RemoteServicesConfigPanel {
+import com.airhacks.afterburner.views.ViewLoader;
+import javafx.beans.property.BooleanProperty;
+import javafx.collections.ListChangeListener;
+import javafx.fxml.FXML;
+import javafx.scene.control.RadioButton;
+import javafx.scene.layout.VBox;
+
+public class RemoteServicesConfigPanel extends VBox {
+    @FXML private RadioButton gorbidEnabled;
+    @FXML private RadioButton gorbidDisabled;
+    @FXML private RadioButton gorbidDemanded;
+    private RemoteServicesConfigPanelViewModel viewModel;
+
+    public RemoteServicesConfigPanel() {
+        ViewLoader.view(this)
+                .root(this)
+                .load();
+    }
+    private void initialize() {
+        viewModel = new RemoteServicesConfigPanelViewModel();
+        gorbidEnabled.selectedProperty().bindBidirectional(viewModel.gorbidEnabledProperty());
+        gorbidDisabled.selectedProperty().bindBidirectional(viewModel.gorbidDisabledProperty());
+        gorbidDemanded.selectedProperty().bindBidirectional(viewModel.gorbidDemandedProperty());
+    }
+    public BooleanProperty gorbidEnabledProperty() {
+        return viewModel.gorbidEnabledProperty();
+    }
+    public BooleanProperty gorbidDisabledProperty() {
+        return viewModel.gorbidDisabledProperty();
+    }
+    public BooleanProperty gorbidDemandedProperty() {
+        return viewModel.gorbidDemandedProperty();
+    }
+
+
+
+
 }
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
index 34541c84b17..d0d6ef4f523 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
@@ -1,4 +1,22 @@
 package org.jabref.gui.commonfxcontrols;
 
+import javafx.beans.property.BooleanProperty;
+import javafx.beans.property.SimpleBooleanProperty;
+
 public class RemoteServicesConfigPanelViewModel {
+    private final BooleanProperty gorbidEnabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty gorbidDisabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty gorbidDemandedProperty = new SimpleBooleanProperty();
+
+    public BooleanProperty gorbidEnabledProperty() {
+        return gorbidEnabledProperty;
+    }
+    public BooleanProperty gorbidDisabledProperty() {
+        return gorbidDisabledProperty;
+    }
+    public BooleanProperty gorbidDemandedProperty() {
+        return gorbidDemandedProperty;
+    }
+
+
 }
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
index 7785c01a42d..cce26009ec5 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
@@ -31,7 +31,7 @@
     <SaveOrderConfigPanel fx:id="exportOrderPanel"/>
 
     <Label styleClass="sectionHeader" text="%Remote services"/>
-    <RemoteServicesConfigPanel fx:id="RemoteServicesPanel"/>
+    <RemoteServicesConfigPanel fx:id="RemoteServicesConfigPanel"/>
 
     <Label styleClass="sectionHeader" text="%Remote services"/>
     <CheckBox fx:id="grobidEnabled" text="%Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results."/>
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
index 3018a76daca..7ddcb439bea 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
@@ -7,6 +7,7 @@
 import javafx.scene.control.ComboBox;
 import javafx.scene.control.TextField;
 
+import org.jabref.gui.commonfxcontrols.RemoteServicesConfigPanel;
 import org.jabref.gui.commonfxcontrols.SaveOrderConfigPanel;
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
@@ -23,13 +24,12 @@ public class ImportExportTab extends AbstractPreferenceTabView<ImportExportTabVi
     @FXML private TextField useCustomDOIName;
 
     @FXML private SaveOrderConfigPanel exportOrderPanel;
-
+    @FXML private RemoteServicesConfigPanel RemoteServicesConfigPanel;
     @FXML private ComboBox<FetcherApiKey> apiKeySelector;
     @FXML private TextField customApiKey;
     @FXML private CheckBox useCustomApiKey;
     @FXML private Button testCustomApiKey;
 
-    @FXML private CheckBox grobidEnabled;
     @FXML private TextField grobidURL;
 
     @FXML private CheckBox warnAboutDuplicatesOnImport;
@@ -62,9 +62,13 @@ public void initialize() {
         exportOrderPanel.sortCriteriaProperty().bindBidirectional(viewModel.sortCriteriaProperty());
         exportOrderPanel.setCriteriaLimit(3);
 
-        grobidEnabled.selectedProperty().bindBidirectional(viewModel.grobidEnabledProperty());
+        RemoteServicesConfigPanel.gorbidDemandedProperty().bindBidirectional(viewModel.grobidDemandedProperty());
+        RemoteServicesConfigPanel.gorbidDisabledProperty().bindBidirectional(viewModel.grobidDisabledProperty());
+        RemoteServicesConfigPanel.gorbidEnabledProperty().bindBidirectional(viewModel.grobidEnabledProperty());
+
+
         grobidURL.textProperty().bindBidirectional(viewModel.grobidURLProperty());
-        grobidURL.disableProperty().bind(grobidEnabled.selectedProperty().not());
+        grobidURL.disableProperty().bind(viewModel.grobidEnabledProperty());
 
         downloadLinkedOnlineFiles.selectedProperty().bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
 
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
index 96196df3284..086df435100 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
@@ -53,11 +53,16 @@ public class ImportExportTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty exportInOriginalProperty = new SimpleBooleanProperty();
     private final BooleanProperty exportInTableOrderProperty = new SimpleBooleanProperty();
     private final BooleanProperty exportInSpecifiedOrderProperty = new SimpleBooleanProperty();
+    //private final BooleanProperty gorbidEnabledProperty = new SimpleBooleanProperty();
+
     private final ListProperty<Field> sortableFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ListProperty<SortCriterionViewModel> sortCriteriaProperty = new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>()));
-
+//remove
     private final BooleanProperty grobidEnabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty grobidDisabledProperty = new SimpleBooleanProperty();
+    private final BooleanProperty grobidDemandedProperty = new SimpleBooleanProperty();
     private final StringProperty grobidURLProperty = new SimpleStringProperty("");
+    //remove
     private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty();
     private final BooleanProperty shouldDownloadLinkedOnlineFiles = new SimpleBooleanProperty();
 
@@ -104,7 +109,14 @@ public void setValues() {
                                                       .map(SortCriterionViewModel::new)
                                                       .toList());
 
+//remove
+
+
         grobidEnabledProperty.setValue(grobidPreferences.isGrobidEnabled());
+        grobidDisabledProperty.setValue(grobidPreferences.isGrobidOptOut());
+        grobidDemandedProperty.setValue(grobidPreferences.isGrobidDemanded());
+
+
         grobidURLProperty.setValue(grobidPreferences.getGrobidURL());
 
         apiKeys.setValue(FXCollections.observableArrayList(preferencesService.getImporterPreferences().getApiKeys()));
@@ -114,7 +126,9 @@ public void setValues() {
     public void storeSettings() {
         importerPreferences.setGenerateNewKeyOnImport(generateKeyOnImportProperty.getValue());
         grobidPreferences.setGrobidEnabled(grobidEnabledProperty.getValue());
-        grobidPreferences.setGrobidOptOut(grobidPreferences.isGrobidOptOut());
+        grobidPreferences.setGrobidDemanded(grobidDisabledProperty.getValue());
+        grobidPreferences.setGrobidOptOut(grobidDemandedProperty.getValue());
+
         grobidPreferences.setGrobidURL(grobidURLProperty.getValue());
 
         filePreferences.setDownloadLinkedFiles(shouldDownloadLinkedOnlineFiles.getValue());
@@ -171,6 +185,10 @@ public ListProperty<SortCriterionViewModel> sortCriteriaProperty() {
     public BooleanProperty grobidEnabledProperty() {
         return grobidEnabledProperty;
     }
+    public BooleanProperty grobidDisabledProperty() {
+        return grobidDisabledProperty;
+    }
+    public BooleanProperty grobidDemandedProperty() { return grobidDemandedProperty; }
 
     public StringProperty grobidURLProperty() {
         return grobidURLProperty;
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java b/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
index e87b54f08fe..9a97740ad79 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
@@ -8,13 +8,16 @@
 public class GrobidPreferences {
     private final BooleanProperty grobidEnabled;
     private final BooleanProperty grobidOptOut;
+    private final BooleanProperty grobidDemanded;
     private final StringProperty grobidURL;
 
     public GrobidPreferences(boolean grobidEnabled,
                              boolean grobidOptOut,
+                             boolean grobidDemanded,
                              String grobidURL) {
         this.grobidEnabled = new SimpleBooleanProperty(grobidEnabled);
         this.grobidOptOut = new SimpleBooleanProperty(grobidOptOut);
+        this.grobidDemanded = new SimpleBooleanProperty(grobidDemanded);
         this.grobidURL = new SimpleStringProperty(grobidURL);
     }
 
@@ -42,6 +45,20 @@ public void setGrobidOptOut(boolean grobidOptOut) {
         this.grobidOptOut.set(grobidOptOut);
     }
 
+
+    public boolean isGrobidDemanded() {
+        return grobidDemanded.get();
+    }
+
+    public BooleanProperty grobidDemandedProperty() {
+        return grobidDemanded;
+    }
+
+    public void setGrobidDemanded(boolean grobidDemanded) {
+        this.grobidDemanded.set(grobidDemanded);
+    }
+
+
     public String getGrobidURL() {
         return grobidURL.get();
     }
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index bbc182f9497..8dd6892a422 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -268,6 +268,8 @@ public class JabRefPreferences implements PreferencesService {
     public static final String GENERATE_KEY_ON_IMPORT = "generateKeyOnImport";
     public static final String GROBID_ENABLED = "grobidEnabled";
     public static final String GROBID_OPT_OUT = "grobidOptOut";
+
+    public static final String GROBID_DEMANDED = "grobidDemanded";
     public static final String GROBID_URL = "grobidURL";
 
     public static final String DEFAULT_CITATION_KEY_PATTERN = "defaultBibtexKeyPattern";
@@ -494,6 +496,7 @@ private JabRefPreferences() {
         defaults.put(GENERATE_KEY_ON_IMPORT, Boolean.TRUE);
         defaults.put(GROBID_ENABLED, Boolean.FALSE);
         defaults.put(GROBID_OPT_OUT, Boolean.FALSE);
+        defaults.put(GROBID_DEMANDED, Boolean.FALSE);
         defaults.put(GROBID_URL, "http://grobid.jabref.org:8070");
 
         defaults.put(PUSH_TEXMAKER_PATH, JabRefDesktop.getNativeDesktop().detectProgramPath("texmaker", "Texmaker"));
@@ -2850,10 +2853,12 @@ public GrobidPreferences getGrobidPreferences() {
         grobidPreferences = new GrobidPreferences(
                 getBoolean(GROBID_ENABLED),
                 getBoolean(GROBID_OPT_OUT),
+                getBoolean(GROBID_DEMANDED),
                 get(GROBID_URL));
 
         EasyBind.listen(grobidPreferences.grobidEnabledProperty(), (obs, oldValue, newValue) -> putBoolean(GROBID_ENABLED, newValue));
         EasyBind.listen(grobidPreferences.grobidOptOutProperty(), (obs, oldValue, newValue) -> putBoolean(GROBID_OPT_OUT, newValue));
+        EasyBind.listen(grobidPreferences.grobidDemandedProperty(), (obs, oldValue, newValue) -> putBoolean(GROBID_DEMANDED, newValue));
         EasyBind.listen(grobidPreferences.grobidURLProperty(), (obs, oldValue, newValue) -> put(GROBID_URL, newValue));
 
         return grobidPreferences;

From 9c0561c964d251abdcb3704c2c3b5e732a6176e2 Mon Sep 17 00:00:00 2001
From: Hana Chaari <hana.chaari@medtech.tn>
Date: Wed, 22 Mar 2023 15:08:57 +0100
Subject: [PATCH 03/11] Gorbid toggleGroup functional

---
 .../gui/commonfxcontrols/RemoteServicesConfigPanel.fxml  | 9 +++------
 .../gui/commonfxcontrols/RemoteServicesConfigPanel.java  | 7 +++++--
 .../gui/preferences/importexport/ImportExportTab.fxml    | 1 -
 .../gui/preferences/importexport/ImportExportTab.java    | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml
index 3ce8887fa38..1ecee0fa7f9 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <fx:root prefWidth="650.0" spacing="10.0" type="VBox"
@@ -13,9 +10,9 @@
     </fx:define>
 
     <RadioButton fx:id="gorbidEnabled" text="%Always enable Gorbid"
-                 toggleGroup="RemoteServicesToggleGroup"/>
+                 toggleGroup="$RemoteServicesToggleGroup"/>
     <RadioButton fx:id="gorbidDisabled" text="%Always disable Gorbid"
-                 toggleGroup="RemoteServicesToggleGroup"/>
+                 toggleGroup="$RemoteServicesToggleGroup"/>
     <RadioButton fx:id="gorbidDemanded" text="%Always Ask"
-                 toggleGroup="RemoteServicesToggleGroup"/>
+                 toggleGroup="$RemoteServicesToggleGroup"/>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
index c963b5819fe..902f94ef8bd 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
@@ -2,12 +2,13 @@
 
 import com.airhacks.afterburner.views.ViewLoader;
 import javafx.beans.property.BooleanProperty;
-import javafx.collections.ListChangeListener;
 import javafx.fxml.FXML;
 import javafx.scene.control.RadioButton;
 import javafx.scene.layout.VBox;
 
-public class RemoteServicesConfigPanel extends VBox {
+
+public class
+RemoteServicesConfigPanel extends VBox {
     @FXML private RadioButton gorbidEnabled;
     @FXML private RadioButton gorbidDisabled;
     @FXML private RadioButton gorbidDemanded;
@@ -18,6 +19,8 @@ public RemoteServicesConfigPanel() {
                 .root(this)
                 .load();
     }
+
+    @FXML
     private void initialize() {
         viewModel = new RemoteServicesConfigPanelViewModel();
         gorbidEnabled.selectedProperty().bindBidirectional(viewModel.gorbidEnabledProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
index cce26009ec5..94e780d97f6 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
@@ -33,7 +33,6 @@
     <Label styleClass="sectionHeader" text="%Remote services"/>
     <RemoteServicesConfigPanel fx:id="RemoteServicesConfigPanel"/>
 
-    <Label styleClass="sectionHeader" text="%Remote services"/>
     <CheckBox fx:id="grobidEnabled" text="%Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results."/>
     <HBox alignment="CENTER_LEFT" spacing="10.0">
         <Label text="%Grobid URL" />
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
index 7ddcb439bea..427d0ac304c 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
@@ -68,7 +68,7 @@ public void initialize() {
 
 
         grobidURL.textProperty().bindBidirectional(viewModel.grobidURLProperty());
-        grobidURL.disableProperty().bind(viewModel.grobidEnabledProperty());
+        grobidURL.disableProperty().bind(viewModel.grobidEnabledProperty().not());
 
         downloadLinkedOnlineFiles.selectedProperty().bindBidirectional(viewModel.shouldDownloadLinkedOnlineFiles());
 

From 499bcd179274483f97eff72761b6975897e0d008 Mon Sep 17 00:00:00 2001
From: Hana Chaari <hana.chaari@medtech.tn>
Date: Sat, 25 Mar 2023 11:33:52 +0100
Subject: [PATCH 04/11] start working on allow gorbid dialog

---
 .../org/jabref/gui/importer/GrobidOptInDialogHelper.java     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
index cf21a38a30c..967a58d1045 100644
--- a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
@@ -19,6 +19,11 @@ public class GrobidOptInDialogHelper {
      * @return if the user enabled Grobid, either in the past or after being asked by the dialog.
      */
     public static boolean showAndWaitIfUserIsUndecided(DialogService dialogService, GrobidPreferences preferences) {
+       //new code//
+        if (preferences.isGrobidDemanded()){
+            preferences.grobidEnabledProperty().setValue(false);
+            preferences.grobidOptOutProperty().setValue(false);
+        }
         if (preferences.isGrobidEnabled()) {
             return true;
         }

From fc8691a9a5ef4816ce5d44f9238bdb782120b3c4 Mon Sep 17 00:00:00 2001
From: Hana Chaari <hana.chaari@medtech.tn>
Date: Sun, 9 Apr 2023 11:33:00 +0100
Subject: [PATCH 05/11] logic error

---
 .../org/jabref/gui/preferences/importexport/ImportExportTab.fxml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
index 94e780d97f6..42b57d4851a 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.fxml
@@ -33,7 +33,6 @@
     <Label styleClass="sectionHeader" text="%Remote services"/>
     <RemoteServicesConfigPanel fx:id="RemoteServicesConfigPanel"/>
 
-    <CheckBox fx:id="grobidEnabled" text="%Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results."/>
     <HBox alignment="CENTER_LEFT" spacing="10.0">
         <Label text="%Grobid URL" />
         <TextField fx:id="grobidURL" HBox.hgrow="ALWAYS"/>

From aa8ec2f266e36bea9e77613e9c62e659a5d233e9 Mon Sep 17 00:00:00 2001
From: Hana Chaari <hana.chaari@medtech.tn>
Date: Mon, 17 Apr 2023 13:48:36 +0100
Subject: [PATCH 06/11] issue resolved

---
 .../preferences/importexport/ImportExportTabViewModel.java    | 4 ++--
 src/main/java/org/jabref/preferences/JabRefPreferences.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
index 086df435100..76c39fd9f15 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
@@ -126,8 +126,8 @@ public void setValues() {
     public void storeSettings() {
         importerPreferences.setGenerateNewKeyOnImport(generateKeyOnImportProperty.getValue());
         grobidPreferences.setGrobidEnabled(grobidEnabledProperty.getValue());
-        grobidPreferences.setGrobidDemanded(grobidDisabledProperty.getValue());
-        grobidPreferences.setGrobidOptOut(grobidDemandedProperty.getValue());
+        grobidPreferences.setGrobidDemanded(grobidDemandedProperty.getValue());
+        grobidPreferences.setGrobidOptOut(grobidDisabledProperty.getValue());
 
         grobidPreferences.setGrobidURL(grobidURLProperty.getValue());
 
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index 8dd6892a422..ea2d14db5e4 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -496,7 +496,7 @@ private JabRefPreferences() {
         defaults.put(GENERATE_KEY_ON_IMPORT, Boolean.TRUE);
         defaults.put(GROBID_ENABLED, Boolean.FALSE);
         defaults.put(GROBID_OPT_OUT, Boolean.FALSE);
-        defaults.put(GROBID_DEMANDED, Boolean.FALSE);
+        defaults.put(GROBID_DEMANDED, Boolean.TRUE);
         defaults.put(GROBID_URL, "http://grobid.jabref.org:8070");
 
         defaults.put(PUSH_TEXMAKER_PATH, JabRefDesktop.getNativeDesktop().detectProgramPath("texmaker", "Texmaker"));

From eeab9d31ed6d6b51b4a6fcb51382c4c85954b583 Mon Sep 17 00:00:00 2001
From: Hana Chaari <hana.chaari@medtech.tn>
Date: Tue, 18 Apr 2023 01:04:46 +0100
Subject: [PATCH 07/11] remove dont ask again from confirmation dialog

---
 .../jabref/gui/importer/GrobidOptInDialogHelper.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
index 967a58d1045..ca025064aaa 100644
--- a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
@@ -30,12 +30,12 @@ public static boolean showAndWaitIfUserIsUndecided(DialogService dialogService,
         if (preferences.isGrobidOptOut()) {
             return false;
         }
-        boolean grobidEnabled = dialogService.showConfirmationDialogWithOptOutAndWait(
+
+        boolean grobidEnabled = dialogService.showConfirmationDialogAndWait(
                 Localization.lang("Remote services"),
-                Localization.lang("Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results."),
-                Localization.lang("Do not ask again"),
-                (optOut) -> preferences.grobidOptOutProperty().setValue(optOut));
-        preferences.grobidEnabledProperty().setValue(grobidEnabled);
+                Localization.lang("Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results.")
+                );
+        preferences.grobidOptOutProperty().setValue(grobidEnabled);
         return grobidEnabled;
     }
 }

From ee979d42ee93c6eeebec5aa653f4f1f6cd2000ac Mon Sep 17 00:00:00 2001
From: Hana Chaari <hana.chaari@medtech.tn>
Date: Tue, 25 Apr 2023 20:16:08 +0100
Subject: [PATCH 08/11] fixed a spelling mistake

---
 .../gui/commonfxcontrols/RemoteServicesConfigPanel.fxml       | 4 ++--
 src/main/resources/l10n/JabRef_en.properties                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml
index 1ecee0fa7f9..5ef631ceb6c 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml
@@ -9,9 +9,9 @@
         <ToggleGroup fx:id="RemoteServicesToggleGroup"/>
     </fx:define>
 
-    <RadioButton fx:id="gorbidEnabled" text="%Always enable Gorbid"
+    <RadioButton fx:id="gorbidEnabled" text="%Always enable Grobid"
                  toggleGroup="$RemoteServicesToggleGroup"/>
-    <RadioButton fx:id="gorbidDisabled" text="%Always disable Gorbid"
+    <RadioButton fx:id="gorbidDisabled" text="%Always disable Grobid"
                  toggleGroup="$RemoteServicesToggleGroup"/>
     <RadioButton fx:id="gorbidDemanded" text="%Always Ask"
                  toggleGroup="$RemoteServicesToggleGroup"/>
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 263d3e5c612..2f2044ba46a 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2432,8 +2432,8 @@ Found\ matches\ in\ Annotations\:=Found matches in Annotations:
 Grobid\ URL=Grobid URL
 Remote\ services=Remote services
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results.
-Always\ enable\ Gorbid=Always enable Gorbid
-Always\ disable\ Gorbid=Always disable Gorbid
+Always\ enable\ Grobid=Always enable Grobid
+Always\ disable\ Grobid=Always disable Grobid
 Always\ Ask=Always Ask
 Fetcher\ cannot\ be\ tested\!=Fetcher cannot be tested!
 Fetcher\ unknown\!=Fetcher unknown!

From 1325cf61cf9651fa8ed91a055130cfcb8aea72d0 Mon Sep 17 00:00:00 2001
From: Hana Chaari <hana.chaari@medtech.tn>
Date: Fri, 28 Apr 2023 10:43:39 +0100
Subject: [PATCH 09/11]  omitted Always ask from Grobid preferences and ask
 prefernece just the first time

---
 .../gui/commonfxcontrols/RemoteServicesConfigPanel.fxml     | 6 ++----
 .../gui/commonfxcontrols/RemoteServicesConfigPanel.java     | 5 -----
 .../RemoteServicesConfigPanelViewModel.java                 | 4 ----
 .../org/jabref/gui/importer/GrobidOptInDialogHelper.java    | 4 +++-
 .../gui/preferences/importexport/ImportExportTab.java       | 1 -
 src/main/java/org/jabref/preferences/JabRefPreferences.java | 1 -
 src/main/resources/l10n/JabRef_en.properties                | 5 ++---
 7 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml
index 5ef631ceb6c..fe099b599d1 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.fxml
@@ -9,10 +9,8 @@
         <ToggleGroup fx:id="RemoteServicesToggleGroup"/>
     </fx:define>
 
-    <RadioButton fx:id="gorbidEnabled" text="%Always enable Grobid"
+    <RadioButton fx:id="gorbidEnabled" text="%Enable GROBID"
                  toggleGroup="$RemoteServicesToggleGroup"/>
-    <RadioButton fx:id="gorbidDisabled" text="%Always disable Grobid"
-                 toggleGroup="$RemoteServicesToggleGroup"/>
-    <RadioButton fx:id="gorbidDemanded" text="%Always Ask"
+    <RadioButton fx:id="gorbidDisabled" text="%Disable GROBID"
                  toggleGroup="$RemoteServicesToggleGroup"/>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
index 902f94ef8bd..2486dfd531c 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
@@ -11,7 +11,6 @@
 RemoteServicesConfigPanel extends VBox {
     @FXML private RadioButton gorbidEnabled;
     @FXML private RadioButton gorbidDisabled;
-    @FXML private RadioButton gorbidDemanded;
     private RemoteServicesConfigPanelViewModel viewModel;
 
     public RemoteServicesConfigPanel() {
@@ -25,7 +24,6 @@ private void initialize() {
         viewModel = new RemoteServicesConfigPanelViewModel();
         gorbidEnabled.selectedProperty().bindBidirectional(viewModel.gorbidEnabledProperty());
         gorbidDisabled.selectedProperty().bindBidirectional(viewModel.gorbidDisabledProperty());
-        gorbidDemanded.selectedProperty().bindBidirectional(viewModel.gorbidDemandedProperty());
     }
     public BooleanProperty gorbidEnabledProperty() {
         return viewModel.gorbidEnabledProperty();
@@ -33,9 +31,6 @@ public BooleanProperty gorbidEnabledProperty() {
     public BooleanProperty gorbidDisabledProperty() {
         return viewModel.gorbidDisabledProperty();
     }
-    public BooleanProperty gorbidDemandedProperty() {
-        return viewModel.gorbidDemandedProperty();
-    }
 
 
 
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
index d0d6ef4f523..cc6b3502c27 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
@@ -6,7 +6,6 @@
 public class RemoteServicesConfigPanelViewModel {
     private final BooleanProperty gorbidEnabledProperty = new SimpleBooleanProperty();
     private final BooleanProperty gorbidDisabledProperty = new SimpleBooleanProperty();
-    private final BooleanProperty gorbidDemandedProperty = new SimpleBooleanProperty();
 
     public BooleanProperty gorbidEnabledProperty() {
         return gorbidEnabledProperty;
@@ -14,9 +13,6 @@ public BooleanProperty gorbidEnabledProperty() {
     public BooleanProperty gorbidDisabledProperty() {
         return gorbidDisabledProperty;
     }
-    public BooleanProperty gorbidDemandedProperty() {
-        return gorbidDemandedProperty;
-    }
 
 
 }
diff --git a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
index ca025064aaa..d93d524d410 100644
--- a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
@@ -35,7 +35,9 @@ public static boolean showAndWaitIfUserIsUndecided(DialogService dialogService,
                 Localization.lang("Remote services"),
                 Localization.lang("Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results.")
                 );
-        preferences.grobidOptOutProperty().setValue(grobidEnabled);
+        preferences.grobidEnabledProperty().setValue(grobidEnabled);
+        preferences.grobidOptOutProperty().setValue(!grobidEnabled);
+        preferences.grobidDemandedProperty().setValue(false);
         return grobidEnabled;
     }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
index 427d0ac304c..0fccbdab2c7 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
@@ -62,7 +62,6 @@ public void initialize() {
         exportOrderPanel.sortCriteriaProperty().bindBidirectional(viewModel.sortCriteriaProperty());
         exportOrderPanel.setCriteriaLimit(3);
 
-        RemoteServicesConfigPanel.gorbidDemandedProperty().bindBidirectional(viewModel.grobidDemandedProperty());
         RemoteServicesConfigPanel.gorbidDisabledProperty().bindBidirectional(viewModel.grobidDisabledProperty());
         RemoteServicesConfigPanel.gorbidEnabledProperty().bindBidirectional(viewModel.grobidEnabledProperty());
 
diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java
index ea2d14db5e4..dcd646fa994 100644
--- a/src/main/java/org/jabref/preferences/JabRefPreferences.java
+++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java
@@ -268,7 +268,6 @@ public class JabRefPreferences implements PreferencesService {
     public static final String GENERATE_KEY_ON_IMPORT = "generateKeyOnImport";
     public static final String GROBID_ENABLED = "grobidEnabled";
     public static final String GROBID_OPT_OUT = "grobidOptOut";
-
     public static final String GROBID_DEMANDED = "grobidDemanded";
     public static final String GROBID_URL = "grobidURL";
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 2f2044ba46a..43bc7e43cd8 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2432,9 +2432,8 @@ Found\ matches\ in\ Annotations\:=Found matches in Annotations:
 Grobid\ URL=Grobid URL
 Remote\ services=Remote services
 Allow\ sending\ PDF\ files\ and\ raw\ citation\ strings\ to\ a\ JabRef\ online\ service\ (Grobid)\ to\ determine\ Metadata.\ This\ produces\ better\ results.=Allow sending PDF files and raw citation strings to a JabRef online service (Grobid) to determine Metadata. This produces better results.
-Always\ enable\ Grobid=Always enable Grobid
-Always\ disable\ Grobid=Always disable Grobid
-Always\ Ask=Always Ask
+Disable\ GROBID=Disable GROBID
+Enable\ GROBID=Enable GROBID
 Fetcher\ cannot\ be\ tested\!=Fetcher cannot be tested!
 Fetcher\ unknown\!=Fetcher unknown!
 

From e22bec4a483ce13701dcfbe00258030a0fe31cda Mon Sep 17 00:00:00 2001
From: Hana Chaari <hana.chaari@medtech.tn>
Date: Fri, 28 Apr 2023 11:38:44 +0100
Subject: [PATCH 10/11] fix 1 checkstyle test

---
 .../RemoteServicesConfigPanel.java                |  3 ++-
 .../RemoteServicesConfigPanelViewModel.java       |  1 +
 .../gui/importer/GrobidOptInDialogHelper.java     |  3 +--
 .../importexport/ImportExportTabViewModel.java    | 15 +++++----------
 .../logic/importer/fetcher/GrobidPreferences.java |  2 --
 5 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
index 2486dfd531c..eb4b9df32d6 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
@@ -6,7 +6,6 @@
 import javafx.scene.control.RadioButton;
 import javafx.scene.layout.VBox;
 
-
 public class
 RemoteServicesConfigPanel extends VBox {
     @FXML private RadioButton gorbidEnabled;
@@ -25,9 +24,11 @@ private void initialize() {
         gorbidEnabled.selectedProperty().bindBidirectional(viewModel.gorbidEnabledProperty());
         gorbidDisabled.selectedProperty().bindBidirectional(viewModel.gorbidDisabledProperty());
     }
+
     public BooleanProperty gorbidEnabledProperty() {
         return viewModel.gorbidEnabledProperty();
     }
+
     public BooleanProperty gorbidDisabledProperty() {
         return viewModel.gorbidDisabledProperty();
     }
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
index cc6b3502c27..2d7bab06ca9 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
@@ -10,6 +10,7 @@ public class RemoteServicesConfigPanelViewModel {
     public BooleanProperty gorbidEnabledProperty() {
         return gorbidEnabledProperty;
     }
+
     public BooleanProperty gorbidDisabledProperty() {
         return gorbidDisabledProperty;
     }
diff --git a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
index d93d524d410..d77d68873c6 100644
--- a/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
+++ b/src/main/java/org/jabref/gui/importer/GrobidOptInDialogHelper.java
@@ -19,8 +19,7 @@ public class GrobidOptInDialogHelper {
      * @return if the user enabled Grobid, either in the past or after being asked by the dialog.
      */
     public static boolean showAndWaitIfUserIsUndecided(DialogService dialogService, GrobidPreferences preferences) {
-       //new code//
-        if (preferences.isGrobidDemanded()){
+        if (preferences.isGrobidDemanded()) {
             preferences.grobidEnabledProperty().setValue(false);
             preferences.grobidOptOutProperty().setValue(false);
         }
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
index 76c39fd9f15..5875b1c7477 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
@@ -53,16 +53,12 @@ public class ImportExportTabViewModel implements PreferenceTabViewModel {
     private final BooleanProperty exportInOriginalProperty = new SimpleBooleanProperty();
     private final BooleanProperty exportInTableOrderProperty = new SimpleBooleanProperty();
     private final BooleanProperty exportInSpecifiedOrderProperty = new SimpleBooleanProperty();
-    //private final BooleanProperty gorbidEnabledProperty = new SimpleBooleanProperty();
-
     private final ListProperty<Field> sortableFieldsProperty = new SimpleListProperty<>(FXCollections.observableArrayList());
     private final ListProperty<SortCriterionViewModel> sortCriteriaProperty = new SimpleListProperty<>(FXCollections.observableArrayList(new ArrayList<>()));
-//remove
     private final BooleanProperty grobidEnabledProperty = new SimpleBooleanProperty();
     private final BooleanProperty grobidDisabledProperty = new SimpleBooleanProperty();
     private final BooleanProperty grobidDemandedProperty = new SimpleBooleanProperty();
     private final StringProperty grobidURLProperty = new SimpleStringProperty("");
-    //remove
     private final BooleanProperty warnAboutDuplicatesOnImportProperty = new SimpleBooleanProperty();
     private final BooleanProperty shouldDownloadLinkedOnlineFiles = new SimpleBooleanProperty();
 
@@ -109,9 +105,6 @@ public void setValues() {
                                                       .map(SortCriterionViewModel::new)
                                                       .toList());
 
-//remove
-
-
         grobidEnabledProperty.setValue(grobidPreferences.isGrobidEnabled());
         grobidDisabledProperty.setValue(grobidPreferences.isGrobidOptOut());
         grobidDemandedProperty.setValue(grobidPreferences.isGrobidDemanded());
@@ -160,8 +153,6 @@ public StringProperty useCustomDOINameProperty() {
         return this.useCustomDOINameProperty;
     }
 
-    // SaveOrderConfigPanel
-
     public BooleanProperty saveInOriginalProperty() {
         return exportInOriginalProperty;
     }
@@ -185,10 +176,14 @@ public ListProperty<SortCriterionViewModel> sortCriteriaProperty() {
     public BooleanProperty grobidEnabledProperty() {
         return grobidEnabledProperty;
     }
+
     public BooleanProperty grobidDisabledProperty() {
         return grobidDisabledProperty;
     }
-    public BooleanProperty grobidDemandedProperty() { return grobidDemandedProperty; }
+
+    public BooleanProperty grobidDemandedProperty() {
+        return grobidDemandedProperty;
+    }
 
     public StringProperty grobidURLProperty() {
         return grobidURLProperty;
diff --git a/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java b/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
index 9a97740ad79..9fa7eb288a3 100644
--- a/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
+++ b/src/main/java/org/jabref/logic/importer/fetcher/GrobidPreferences.java
@@ -45,7 +45,6 @@ public void setGrobidOptOut(boolean grobidOptOut) {
         this.grobidOptOut.set(grobidOptOut);
     }
 
-
     public boolean isGrobidDemanded() {
         return grobidDemanded.get();
     }
@@ -58,7 +57,6 @@ public void setGrobidDemanded(boolean grobidDemanded) {
         this.grobidDemanded.set(grobidDemanded);
     }
 
-
     public String getGrobidURL() {
         return grobidURL.get();
     }

From c2a3b2a3eb0a138375b84cbbadaaf89665bdcff0 Mon Sep 17 00:00:00 2001
From: Hana Chaari <hana.chaari@medtech.tn>
Date: Fri, 28 Apr 2023 11:51:58 +0100
Subject: [PATCH 11/11] fix 2 checkstyle test

---
 .../gui/commonfxcontrols/RemoteServicesConfigPanel.java       | 3 ---
 .../commonfxcontrols/RemoteServicesConfigPanelViewModel.java  | 4 +---
 .../jabref/gui/preferences/importexport/ImportExportTab.java  | 1 -
 .../preferences/importexport/ImportExportTabViewModel.java    | 1 -
 4 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
index eb4b9df32d6..f42ea03c0f4 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanel.java
@@ -33,7 +33,4 @@ public BooleanProperty gorbidDisabledProperty() {
         return viewModel.gorbidDisabledProperty();
     }
 
-
-
-
 }
diff --git a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
index 2d7bab06ca9..6335d8fe1dc 100644
--- a/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
+++ b/src/main/java/org/jabref/gui/commonfxcontrols/RemoteServicesConfigPanelViewModel.java
@@ -1,7 +1,7 @@
 package org.jabref.gui.commonfxcontrols;
 
-import javafx.beans.property.BooleanProperty;
 import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.BooleanProperty;
 
 public class RemoteServicesConfigPanelViewModel {
     private final BooleanProperty gorbidEnabledProperty = new SimpleBooleanProperty();
@@ -14,6 +14,4 @@ public BooleanProperty gorbidEnabledProperty() {
     public BooleanProperty gorbidDisabledProperty() {
         return gorbidDisabledProperty;
     }
-
-
 }
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
index 0fccbdab2c7..9a316e80913 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTab.java
@@ -65,7 +65,6 @@ public void initialize() {
         RemoteServicesConfigPanel.gorbidDisabledProperty().bindBidirectional(viewModel.grobidDisabledProperty());
         RemoteServicesConfigPanel.gorbidEnabledProperty().bindBidirectional(viewModel.grobidEnabledProperty());
 
-
         grobidURL.textProperty().bindBidirectional(viewModel.grobidURLProperty());
         grobidURL.disableProperty().bind(viewModel.grobidEnabledProperty().not());
 
diff --git a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
index 5875b1c7477..e7f730b3226 100644
--- a/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/importexport/ImportExportTabViewModel.java
@@ -109,7 +109,6 @@ public void setValues() {
         grobidDisabledProperty.setValue(grobidPreferences.isGrobidOptOut());
         grobidDemandedProperty.setValue(grobidPreferences.isGrobidDemanded());
 
-
         grobidURLProperty.setValue(grobidPreferences.getGrobidURL());
 
         apiKeys.setValue(FXCollections.observableArrayList(preferencesService.getImporterPreferences().getApiKeys()));