From fbd889389f9395417230224b25acf398d3ac35e5 Mon Sep 17 00:00:00 2001 From: sponbob-pat <64796257+sponbob-pat@users.noreply.github.com> Date: Tue, 9 Nov 2021 11:16:55 +0900 Subject: [PATCH 1/6] Update LibraryPropertiesDialogViewModel.java --- .../gui/libraryproperties/LibraryPropertiesDialogViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java index f3a37a6092d..0bddb0d9604 100644 --- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java +++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java @@ -168,7 +168,7 @@ void storeSettings() { } SaveOrderConfig newSaveOrderConfig = new SaveOrderConfig( - SaveOrderConfig.OrderType.fromBooleans(saveInSpecifiedOrderProperty.getValue(), saveInOriginalProperty.getValue()), + SaveOrderConfig.OrderType.fromBooleans(saveInSpecifiedOrderProperty.getValue(), saveInTableOrderProperty.getValue()), sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList()); if (!newSaveOrderConfig.equals(initialSaveOrderConfig)) { From 7edc3b93222064368faa59bee785252e64d892b7 Mon Sep 17 00:00:00 2001 From: sponbob-pat <64796257+sponbob-pat@users.noreply.github.com> Date: Tue, 9 Nov 2021 11:20:05 +0900 Subject: [PATCH 2/6] Update JabRefPreferences.java --- src/main/java/org/jabref/preferences/JabRefPreferences.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java index 53a7f113b25..76515f9f4a7 100644 --- a/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -157,6 +157,7 @@ public class JabRefPreferences implements PreferencesService { public static final String REFORMAT_FILE_ON_SAVE_AND_EXPORT = "reformatFileOnSaveAndExport"; public static final String EXPORT_IN_ORIGINAL_ORDER = "exportInOriginalOrder"; public static final String EXPORT_IN_SPECIFIED_ORDER = "exportInSpecifiedOrder"; + public static final String EXPORT_IN_TABLE_ORDER = "exportInTableOrder"; public static final String EXPORT_PRIMARY_SORT_FIELD = "exportPriSort"; public static final String EXPORT_PRIMARY_SORT_DESCENDING = "exportPriDescending"; public static final String EXPORT_SECONDARY_SORT_FIELD = "exportSecSort"; @@ -532,6 +533,7 @@ private JabRefPreferences() { // export order defaults.put(EXPORT_IN_ORIGINAL_ORDER, Boolean.FALSE); defaults.put(EXPORT_IN_SPECIFIED_ORDER, Boolean.FALSE); + defaults.put(EXPORT_IN_TABLE_ORDER, Boolean.FALSE); // export order: if EXPORT_IN_SPECIFIED_ORDER, then use following criteria defaults.put(EXPORT_PRIMARY_SORT_FIELD, InternalField.KEY_FIELD.getName()); @@ -2048,7 +2050,7 @@ public SaveOrderConfig getExportSaveOrder() { ); return new SaveOrderConfig( - SaveOrderConfig.OrderType.fromBooleans(getBoolean(EXPORT_IN_SPECIFIED_ORDER), getBoolean(EXPORT_IN_ORIGINAL_ORDER)), + SaveOrderConfig.OrderType.fromBooleans(getBoolean(EXPORT_IN_SPECIFIED_ORDER), getBoolean(EXPORT_IN_TABLE_ORDER)), sortCriteria ); } @@ -2057,6 +2059,7 @@ public SaveOrderConfig getExportSaveOrder() { public void storeExportSaveOrder(SaveOrderConfig config) { putBoolean(EXPORT_IN_ORIGINAL_ORDER, config.getOrderType() == SaveOrderConfig.OrderType.ORIGINAL); putBoolean(EXPORT_IN_SPECIFIED_ORDER, config.getOrderType() == SaveOrderConfig.OrderType.SPECIFIED); + putBoolean(EXPORT_IN_TABLE_ORDER, config.getOrderType() == SaveOrderConfig.OrderType.TABLE); put(EXPORT_PRIMARY_SORT_FIELD, config.getSortCriteria().get(0).field.getName()); put(EXPORT_SECONDARY_SORT_FIELD, config.getSortCriteria().get(1).field.getName()); From f369e631e5651fe6f7604824d15dfd81dd8bbb02 Mon Sep 17 00:00:00 2001 From: sponbob-pat <64796257+sponbob-pat@users.noreply.github.com> Date: Wed, 10 Nov 2021 16:19:37 +0900 Subject: [PATCH 3/6] Update SaveOrderConfig.java --- src/main/java/org/jabref/model/metadata/SaveOrderConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java b/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java index 26720236083..30b827d0187 100644 --- a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java +++ b/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java @@ -67,7 +67,7 @@ private SaveOrderConfig(List data) { } try { - this.orderType = OrderType.valueOf(data.get(0)); + this.orderType = OrderType.valueOf(data.get(0).toUpperCase()); } catch (IllegalArgumentException ex) { if (data.size() > 1 && data.size() % 2 == 1) { LOGGER.warn("Could not parse sort order: {} - trying to parse the sort criteria", data.get(0)); From 4b8fb63e996e04362175deb6c5ab9ecee1d1b583 Mon Sep 17 00:00:00 2001 From: sponbob-pat <64796257+sponbob-pat@users.noreply.github.com> Date: Sun, 14 Nov 2021 09:53:40 +0900 Subject: [PATCH 4/6] Update LibraryPropertiesDialogViewModel.java --- .../gui/libraryproperties/LibraryPropertiesDialogViewModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java index 0bddb0d9604..f3a37a6092d 100644 --- a/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java +++ b/src/main/java/org/jabref/gui/libraryproperties/LibraryPropertiesDialogViewModel.java @@ -168,7 +168,7 @@ void storeSettings() { } SaveOrderConfig newSaveOrderConfig = new SaveOrderConfig( - SaveOrderConfig.OrderType.fromBooleans(saveInSpecifiedOrderProperty.getValue(), saveInTableOrderProperty.getValue()), + SaveOrderConfig.OrderType.fromBooleans(saveInSpecifiedOrderProperty.getValue(), saveInOriginalProperty.getValue()), sortCriteriaProperty.stream().map(SortCriterionViewModel::getCriterion).toList()); if (!newSaveOrderConfig.equals(initialSaveOrderConfig)) { From c64b465067add64446656b360b2101326ab71441 Mon Sep 17 00:00:00 2001 From: sponbob-pat <64796257+sponbob-pat@users.noreply.github.com> Date: Sun, 14 Nov 2021 09:58:05 +0900 Subject: [PATCH 5/6] Update JabRefPreferences.java --- .../java/org/jabref/preferences/JabRefPreferences.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/org/jabref/preferences/JabRefPreferences.java b/src/main/java/org/jabref/preferences/JabRefPreferences.java index 76515f9f4a7..a72dc324d80 100644 --- a/src/main/java/org/jabref/preferences/JabRefPreferences.java +++ b/src/main/java/org/jabref/preferences/JabRefPreferences.java @@ -157,7 +157,7 @@ public class JabRefPreferences implements PreferencesService { public static final String REFORMAT_FILE_ON_SAVE_AND_EXPORT = "reformatFileOnSaveAndExport"; public static final String EXPORT_IN_ORIGINAL_ORDER = "exportInOriginalOrder"; public static final String EXPORT_IN_SPECIFIED_ORDER = "exportInSpecifiedOrder"; - public static final String EXPORT_IN_TABLE_ORDER = "exportInTableOrder"; + public static final String EXPORT_PRIMARY_SORT_FIELD = "exportPriSort"; public static final String EXPORT_PRIMARY_SORT_DESCENDING = "exportPriDescending"; public static final String EXPORT_SECONDARY_SORT_FIELD = "exportSecSort"; @@ -531,9 +531,8 @@ private JabRefPreferences() { defaults.put(REFORMAT_FILE_ON_SAVE_AND_EXPORT, Boolean.FALSE); // export order - defaults.put(EXPORT_IN_ORIGINAL_ORDER, Boolean.FALSE); + defaults.put(EXPORT_IN_ORIGINAL_ORDER, Boolean.TRUE); defaults.put(EXPORT_IN_SPECIFIED_ORDER, Boolean.FALSE); - defaults.put(EXPORT_IN_TABLE_ORDER, Boolean.FALSE); // export order: if EXPORT_IN_SPECIFIED_ORDER, then use following criteria defaults.put(EXPORT_PRIMARY_SORT_FIELD, InternalField.KEY_FIELD.getName()); @@ -2050,7 +2049,7 @@ public SaveOrderConfig getExportSaveOrder() { ); return new SaveOrderConfig( - SaveOrderConfig.OrderType.fromBooleans(getBoolean(EXPORT_IN_SPECIFIED_ORDER), getBoolean(EXPORT_IN_TABLE_ORDER)), + SaveOrderConfig.OrderType.fromBooleans(getBoolean(EXPORT_IN_SPECIFIED_ORDER), getBoolean(EXPORT_IN_ORIGINAL_ORDER)), sortCriteria ); } @@ -2059,7 +2058,6 @@ public SaveOrderConfig getExportSaveOrder() { public void storeExportSaveOrder(SaveOrderConfig config) { putBoolean(EXPORT_IN_ORIGINAL_ORDER, config.getOrderType() == SaveOrderConfig.OrderType.ORIGINAL); putBoolean(EXPORT_IN_SPECIFIED_ORDER, config.getOrderType() == SaveOrderConfig.OrderType.SPECIFIED); - putBoolean(EXPORT_IN_TABLE_ORDER, config.getOrderType() == SaveOrderConfig.OrderType.TABLE); put(EXPORT_PRIMARY_SORT_FIELD, config.getSortCriteria().get(0).field.getName()); put(EXPORT_SECONDARY_SORT_FIELD, config.getSortCriteria().get(1).field.getName()); From 727bed36b54ee09d5987f09c3afce913a1b4ab65 Mon Sep 17 00:00:00 2001 From: sponbob-pat <64796257+sponbob-pat@users.noreply.github.com> Date: Sun, 14 Nov 2021 10:04:13 +0900 Subject: [PATCH 6/6] Update SaveOrderConfig.java --- .../java/org/jabref/model/metadata/SaveOrderConfig.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java b/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java index 30b827d0187..9c79b0414aa 100644 --- a/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java +++ b/src/main/java/org/jabref/model/metadata/SaveOrderConfig.java @@ -33,12 +33,12 @@ public String toString() { return name; } - public static SaveOrderConfig.OrderType fromBooleans(boolean saveInSpecifiedOrder, boolean saveInTableOrder) { - SaveOrderConfig.OrderType orderType = SaveOrderConfig.OrderType.ORIGINAL; + public static SaveOrderConfig.OrderType fromBooleans(boolean saveInSpecifiedOrder, boolean saveInOriginalOrder) { + SaveOrderConfig.OrderType orderType = SaveOrderConfig.OrderType.TABLE; if (saveInSpecifiedOrder) { orderType = SaveOrderConfig.OrderType.SPECIFIED; - } else if (saveInTableOrder) { - orderType = SaveOrderConfig.OrderType.TABLE; + } else if (saveInOriginalOrder) { + orderType = SaveOrderConfig.OrderType.ORIGINAL; } return orderType;