fix: make fields sorted by lexicographical order #7711
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Normally, this would be a suitable way. However, this is a special case as you can reorder the fields in the custom entry types dialog. Refs #6152 |
Siedlerchr
requested changes
May 7, 2021
dateri
changed the title
|
Thanks for guidance, I found they both use |
Siedlerchr
added
the
status: ready-for-review
Siedlerchr
requested changes
May 7, 2021
CHANGELOG.md
Outdated
| @@ -550,6 +550,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve | |||
| - We fixed an issue where the XMP Importer would incorrectly return an empty default entry when importing pdfs [#6577](https://github.com/JabRef/jabref/issues/6577) | |||
| - We fixed an issue where opening the menu 'Library properties' marked the library as modified [#6451](https://github.com/JabRef/jabref/issues/6451) | |||
| - We fixed an issue when importing resulted in an exception [#7343](https://github.com/JabRef/jabref/issues/7343) | |||
| - We fixed an issue Some fields are in random order [#7710](https://github.com/JabRef/jabref/issues/7710) | |||
There was a problem hiding this comment.
Suggested change
| - We fixed an issue Some fields are in random order [#7710](https://github.com/JabRef/jabref/issues/7710) | |
| - We fixed an issue where the field in the Field formatter dropdown selection were sorted in random order [#7710](https://github.com/JabRef/jabref/issues/7710) |
| @@ -28,6 +28,12 @@ | |||
| private final ObjectProperty<Formatter> selectedFormatterProperty = new SimpleObjectProperty<>(); | |||
|
|
|||
| public FieldFormatterCleanupsPanelViewModel() { | |||
| availableFieldsProperty.sort((field1, field2) -> { | |||
| if (field1.getDisplayName().equals(field2.getDisplayName())) { | |||
There was a problem hiding this comment.
The compareTo already performs equal checks...
So you should be able to directly use sort(field1, field2) -> field1.getDisplayName().compareTo(field2.getDisplayName))
There was a problem hiding this comment.
Comparator.comparing should work as well.
There was a problem hiding this comment.
What you said really makes sense and I have modified them.
k3KAW8Pnf7mkmdSMPHz27
requested changes
May 7, 2021
| @@ -17,6 +17,8 @@ | |||
| import org.jabref.model.entry.field.Field; | |||
| import org.jabref.model.entry.field.FieldFactory; | |||
|
|
|||
| import java.util.Comparator; | |||
There was a problem hiding this comment.
Please fix the reviewdog complaint
src/main/java/org/jabref/gui/commonfxcontrols/FieldFormatterCleanupsPanelViewModel.java
Outdated
Show resolved
Hide resolved
Siedlerchr
reviewed
May 8, 2021
Siedlerchr
approved these changes
May 8, 2021
Siedlerchr
added a commit
that referenced
this pull request
May 15, 2021
* upstream/main: (71 commits) [Bot] Update CSL styles (#7735) Fix for issue 6966: open all files of multiple entries (#7709) Add simple unit tests (#7696) Add simple unit tests (#7543) Update check-outdated-dependencies.yml Added preset for new entry keybindings and reintroduced defaults (#7705) Select the entry which has smaller dictonary order when merge (#7708) Update CHANGELOG.md fix: make more fields, fomatters, ids and languages sorted by alphabetical order (#7717) Bump libreoffice from 7.1.2 to 7.1.3 (#7721) Bump unoloader from 7.1.2 to 7.1.3 (#7724) Bump org.beryx.jlink from 2.23.7 to 2.23.8 (#7723) Bump org.openjfx.javafxplugin from 0.0.9 to 0.0.10 (#7725) fix: make fields sorted by lexicographical order (#7711) Fix tests Refactoring existing unit tests (#7687) Refactoring and addition of unit tests (#7581) Refactor simple Unit Tests (#7571) Add simple unit tests (#7544) add and extend unit tests (#7685) ...
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #7710
We fix that some fields are in random order (issue #7710). We use
Treemapwhich is ordered to replaceLinkedHashMapand added a comparison function to the treemap to ensure that fields are ordered by lexicographical order.CHANGELOG.mddescribed in a way that is understandable for the average user (if applicable)