Skip to content

Commit 2e808c2

Browse files
authored
Merge pull request #5034 from yurickyh/fix-for-issue-5019
"Set up general fields" character check not correct & alphabetical ordering
2 parents 65a7cd3 + 57782e4 commit 2e808c2

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
6666
- We added an option on the Linked File Viewer to rename the attached file of an entry directly on the JabRef. [#4844](https://github.com/JabRef/jabref/issues/4844)
6767
- We added an option in the preference dialog box that allows user to enable helpful tooltips.[#3599](https://github.com/JabRef/jabref/issues/3599)
6868
- We moved the dropdown menu for selecting the push-application from the toolbar into the external application preferences. [#674](https://github.com/JabRef/jabref/issues/674)
69+
- We removed the alphabetical ordering of the custom tabs and updated the error message when trying to create a general field with a name containing an illegal character. [#5019](https://github.com/JabRef/jabref/issues/5019)
6970

7071

7172
### Fixed

src/main/java/org/jabref/gui/customizefields/CustomizeGeneralFieldsDialogViewModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void saveFields() {
6060
String title = Localization.lang("Error");
6161
String content = Localization.lang("Field names are not allowed to contain white space or the following "
6262
+ "characters")
63-
+ ": # { } ~ , ^ &";
63+
+ ": # { } ( ) ~ , ^ & - \" ' ` ʹ \\";
6464
dialogService.showInformationDialogAndWait(title, content);
6565
return;
6666
}

src/main/java/org/jabref/gui/entryeditor/EntryEditorTabList.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.jabref.gui.entryeditor;
22

33
import java.util.Arrays;
4+
import java.util.LinkedHashMap;
45
import java.util.List;
56
import java.util.Map;
6-
import java.util.TreeMap;
77

88
import org.jabref.preferences.JabRefPreferences;
99

@@ -17,7 +17,7 @@ private EntryEditorTabList() {
1717
}
1818

1919
public static Map<String, List<String>> create(JabRefPreferences preferences) {
20-
Map<String, List<String>> tabs = new TreeMap<>();
20+
Map<String, List<String>> tabs = new LinkedHashMap<>();
2121
int i = 0;
2222
String name;
2323
if (preferences.hasKey(JabRefPreferences.CUSTOM_TAB_NAME + 0)) {

0 commit comments

Comments
 (0)