From c4cef2b7b582b3ccadb9d173a32860a5b0ba5939 Mon Sep 17 00:00:00 2001
From: LuckyLuo09 <luckyluo09@gmail.com>
Date: Wed, 27 May 2020 19:45:00 +0800
Subject: [PATCH 1/4] delete the "Default bibliography mode" in preference
 dialog

---
 CHANGELOG.md                                         |  1 +
 .../java/org/jabref/gui/preferences/GeneralTab.fxml  |  4 ++--
 .../org/jabref/gui/preferences/GeneralTabView.java   | 12 ++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e443c7ae84d..bedc270b236 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
 
 ### Changed
 
+- we deleted the `Default bibliography mode` in the Preference/General tab since it is a redundant setting. [#6470](https://github.com/JabRef/jabref/issues/6470)
 - We improved the arXiv fetcher. Now it should find entries even more reliably and does no longer include the version (e.g `v1`) in the `eprint` field. [forum#1941](https://discourse.jabref.org/t/remove-version-in-arxiv-import/1941)
 - We moved the group search bar and the button "New group" from bottom to top position to make it more prominent. [#6112](https://github.com/JabRef/jabref/pull/6112)
 - When JabRef finds a `.sav` file without changes, there is no dialog asking for acceptance of changes anymore.
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
index 86dfee7fdf9..b0028d00728 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
@@ -29,8 +29,8 @@
         <ComboBox fx:id="language" prefWidth="200.0" GridPane.columnIndex="1"/>
         <Label text="%Default encoding" GridPane.rowIndex="1"/>
         <ComboBox fx:id="defaultEncoding" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-        <Label text="%Default bibliography mode" GridPane.rowIndex="2"/>
-        <ComboBox fx:id="biblatexMode" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+<!--        <Label text="%Default bibliography mode" GridPane.rowIndex="2"/>-->
+<!--        <ComboBox fx:id="biblatexMode" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2"/>-->
     </GridPane>
     <CheckBox fx:id="inspectionWarningDuplicate"
               text="%Warn about unresolved duplicates when closing inspection window"/>
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
index 3d0fdf2cffa..f0e9c60e157 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
@@ -29,7 +29,7 @@ public class GeneralTabView extends AbstractPreferenceTabView<GeneralTabViewMode
 
     @FXML private ComboBox<Language> language;
     @FXML private ComboBox<Charset> defaultEncoding;
-    @FXML private ComboBox<BibDatabaseMode> biblatexMode;
+//    @FXML private ComboBox<BibDatabaseMode> biblatexMode;
     @FXML private CheckBox inspectionWarningDuplicate;
     @FXML private CheckBox confirmDelete;
     @FXML private CheckBox allowIntegerEdition;
@@ -79,11 +79,11 @@ public void initialize() {
         defaultEncoding.itemsProperty().bind(viewModel.encodingsListProperty());
         defaultEncoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
 
-        new ViewModelListCellFactory<BibDatabaseMode>()
-                .withText(BibDatabaseMode::getFormattedName)
-                .install(biblatexMode);
-        biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
-        biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
+//        new ViewModelListCellFactory<BibDatabaseMode>()
+//                .withText(BibDatabaseMode::getFormattedName)
+//                .install(biblatexMode);
+//        biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
+//        biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
 
         inspectionWarningDuplicate.selectedProperty().bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
         confirmDelete.selectedProperty().bindBidirectional(viewModel.confirmDeleteProperty());

From 116f7047e92f34b0b078f2698533f399385222e1 Mon Sep 17 00:00:00 2001
From: LuckyLuo09 <luckyluo09@gmail.com>
Date: Wed, 27 May 2020 21:51:09 +0800
Subject: [PATCH 2/4] fixing issue #6470: remove Default bibliography mode in
 preference dialog

---
 .../org/jabref/gui/preferences/GeneralTabView.java |  7 -------
 .../gui/preferences/GeneralTabViewModel.java       | 14 ++------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
index f0e9c60e157..8265ba188cd 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
@@ -19,7 +19,6 @@
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Language;
 import org.jabref.logic.l10n.Localization;
-import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.preferences.JabRefPreferences;
 
 import com.airhacks.afterburner.views.ViewLoader;
@@ -29,7 +28,6 @@ public class GeneralTabView extends AbstractPreferenceTabView<GeneralTabViewMode
 
     @FXML private ComboBox<Language> language;
     @FXML private ComboBox<Charset> defaultEncoding;
-//    @FXML private ComboBox<BibDatabaseMode> biblatexMode;
     @FXML private CheckBox inspectionWarningDuplicate;
     @FXML private CheckBox confirmDelete;
     @FXML private CheckBox allowIntegerEdition;
@@ -79,11 +77,6 @@ public void initialize() {
         defaultEncoding.itemsProperty().bind(viewModel.encodingsListProperty());
         defaultEncoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
 
-//        new ViewModelListCellFactory<BibDatabaseMode>()
-//                .withText(BibDatabaseMode::getFormattedName)
-//                .install(biblatexMode);
-//        biblatexMode.itemsProperty().bind(viewModel.biblatexModeListProperty());
-//        biblatexMode.valueProperty().bindBidirectional(viewModel.selectedBiblatexModeProperty());
 
         inspectionWarningDuplicate.selectedProperty().bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
         confirmDelete.selectedProperty().bindBidirectional(viewModel.confirmDeleteProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
index c5f166f66e1..610c038b242 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
@@ -24,6 +24,7 @@
 import org.jabref.model.database.BibDatabaseMode;
 import org.jabref.model.entry.field.FieldFactory;
 import org.jabref.preferences.GeneralPreferences;
+import org.jabref.preferences.JabRefPreferences;
 import org.jabref.preferences.PreferencesService;
 
 import de.saxsys.mvvmfx.utils.validation.FunctionBasedValidator;
@@ -36,8 +37,6 @@ public class GeneralTabViewModel implements PreferenceTabViewModel {
     private final ObjectProperty<Language> selectedLanguageProperty = new SimpleObjectProperty<>();
     private final ListProperty<Charset> encodingsListProperty = new SimpleListProperty<>();
     private final ObjectProperty<Charset> selectedEncodingProperty = new SimpleObjectProperty<>();
-    private final ListProperty<BibDatabaseMode> bibliographyModeListProperty = new SimpleListProperty<>();
-    private final ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty = new SimpleObjectProperty<>();
 
     private final BooleanProperty inspectionWarningDuplicateProperty = new SimpleBooleanProperty();
     private final BooleanProperty confirmDeleteProperty = new SimpleBooleanProperty();
@@ -99,8 +98,6 @@ public void setValues() {
         encodingsListProperty.setValue(FXCollections.observableArrayList(Encodings.getCharsets()));
         selectedEncodingProperty.setValue(initialGeneralPreferences.getDefaultEncoding());
 
-        bibliographyModeListProperty.setValue(FXCollections.observableArrayList(BibDatabaseMode.values()));
-        selectedBiblatexModeProperty.setValue(initialGeneralPreferences.getDefaultBibDatabaseMode());
 
         inspectionWarningDuplicateProperty.setValue(initialGeneralPreferences.isWarnAboutDuplicatesInInspection());
         confirmDeleteProperty.setValue(initialGeneralPreferences.isConfirmDelete());
@@ -136,7 +133,7 @@ public void storeSettings() {
 
         preferencesService.storeGeneralPreferences(new GeneralPreferences(
                 selectedEncodingProperty.getValue(),
-                selectedBiblatexModeProperty.getValue(),
+                ((JabRefPreferences) preferencesService).getBoolean(JabRefPreferences.BIBLATEX_DEFAULT_MODE) ? BibDatabaseMode.BIBLATEX : BibDatabaseMode.BIBTEX,
                 inspectionWarningDuplicateProperty.getValue(),
                 confirmDeleteProperty.getValue(),
                 allowIntegerEditionProperty.getValue(),
@@ -194,13 +191,6 @@ public ObjectProperty<Charset> selectedEncodingProperty() {
         return this.selectedEncodingProperty;
     }
 
-    public ListProperty<BibDatabaseMode> biblatexModeListProperty() {
-        return this.bibliographyModeListProperty;
-    }
-
-    public ObjectProperty<BibDatabaseMode> selectedBiblatexModeProperty() {
-        return this.selectedBiblatexModeProperty;
-    }
 
     public BooleanProperty inspectionWarningDuplicateProperty() {
         return this.inspectionWarningDuplicateProperty;

From ca8aab8b6760685da205b1fc000d8f9a9e0742f0 Mon Sep 17 00:00:00 2001
From: LuckyLuo09 <luckyluo09@gmail.com>
Date: Wed, 27 May 2020 21:51:47 +0800
Subject: [PATCH 3/4] update for passing checkstyle

---
 src/main/java/org/jabref/gui/preferences/GeneralTabView.java    | 1 -
 .../java/org/jabref/gui/preferences/GeneralTabViewModel.java    | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
index 8265ba188cd..863912b0ae0 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabView.java
@@ -77,7 +77,6 @@ public void initialize() {
         defaultEncoding.itemsProperty().bind(viewModel.encodingsListProperty());
         defaultEncoding.valueProperty().bindBidirectional(viewModel.selectedEncodingProperty());
 
-
         inspectionWarningDuplicate.selectedProperty().bindBidirectional(viewModel.inspectionWarningDuplicateProperty());
         confirmDelete.selectedProperty().bindBidirectional(viewModel.confirmDeleteProperty());
         allowIntegerEdition.selectedProperty().bindBidirectional(viewModel.allowIntegerEditionProperty());
diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
index 610c038b242..890568a879f 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTabViewModel.java
@@ -98,7 +98,6 @@ public void setValues() {
         encodingsListProperty.setValue(FXCollections.observableArrayList(Encodings.getCharsets()));
         selectedEncodingProperty.setValue(initialGeneralPreferences.getDefaultEncoding());
 
-
         inspectionWarningDuplicateProperty.setValue(initialGeneralPreferences.isWarnAboutDuplicatesInInspection());
         confirmDeleteProperty.setValue(initialGeneralPreferences.isConfirmDelete());
         allowIntegerEditionProperty.setValue(initialGeneralPreferences.isAllowIntegerEditionBibtex());
@@ -191,7 +190,6 @@ public ObjectProperty<Charset> selectedEncodingProperty() {
         return this.selectedEncodingProperty;
     }
 
-
     public BooleanProperty inspectionWarningDuplicateProperty() {
         return this.inspectionWarningDuplicateProperty;
     }

From 011951b46d93c8f3457a38d276447dedf9929ade Mon Sep 17 00:00:00 2001
From: Yunsheng Luo <38714962+LuckyOne09@users.noreply.github.com>
Date: Wed, 27 May 2020 22:08:27 +0800
Subject: [PATCH 4/4] Remove unnecessary annotation

---
 src/main/java/org/jabref/gui/preferences/GeneralTab.fxml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
index b0028d00728..3e1f9240ad3 100644
--- a/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/GeneralTab.fxml
@@ -29,8 +29,6 @@
         <ComboBox fx:id="language" prefWidth="200.0" GridPane.columnIndex="1"/>
         <Label text="%Default encoding" GridPane.rowIndex="1"/>
         <ComboBox fx:id="defaultEncoding" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="1"/>
-<!--        <Label text="%Default bibliography mode" GridPane.rowIndex="2"/>-->
-<!--        <ComboBox fx:id="biblatexMode" prefWidth="200.0" GridPane.columnIndex="1" GridPane.rowIndex="2"/>-->
     </GridPane>
     <CheckBox fx:id="inspectionWarningDuplicate"
               text="%Warn about unresolved duplicates when closing inspection window"/>