Fix for issue #372 #1

BojiZhang · 2024-10-20T12:20:37Z

This PullRequest is just for teammate review

SaltedTan

Would be great to add some comments explaining certain parts of the changes that are more complex.

SaltedTan · 2024-10-25T07:37:22Z

src/main/java/org/jabref/gui/mergeentries/MergeEntriesHelper.java

+    private static void updateFieldIfNecessaryWithUndo(final BibEntry originalEntry,
+                                                       final BibEntry fetchedEntry,
+                                                       final Field field, final NamedCompound undoManager) {
+        fetchedEntry.getField(field).ifPresent(fetchedValue -> originalEntry.getField(field).ifPresentOrElse(
+                originalValue -> {
+                    if (fetchedValue.length() > originalValue.length()) {
+                        updateField(originalEntry, field, originalValue, fetchedValue, undoManager);
+                    }
+                },
+                () -> updateField(originalEntry, field, null, fetchedValue, undoManager)
+        ));
+    }


This method could be simplified for better readability. I'd suggest using .map and .flatMap as suggested by the maintainers.

Sure, will optimize soon

* Refine texts Signed-off-by: subhramit <[email protected]> * Update l10n Signed-off-by: subhramit <[email protected]> --------- Signed-off-by: subhramit <[email protected]>

Signed-off-by: subhramit <[email protected]>

Bumps [com.konghq:unirest-modules-gson](https://github.com/Kong/unirest-java) from 4.4.5 to 4.4.6. - [Release notes](https://github.com/Kong/unirest-java/releases) - [Changelog](https://github.com/Kong/unirest-java/blob/main/CHANGELOG.md) - [Commits](Kong/unirest-java@v4.4.5...v4.4.6) --- updated-dependencies: - dependency-name: com.konghq:unirest-modules-gson dependency-version: 4.4.6 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…#13023) Bumps [com.fasterxml.jackson.dataformat:jackson-dataformat-yaml](https://github.com/FasterXML/jackson-dataformats-text) from 2.18.3 to 2.19.0. - [Commits](FasterXML/jackson-dataformats-text@jackson-dataformats-text-2.18.3...jackson-dataformats-text-2.19.0) --- updated-dependencies: - dependency-name: com.fasterxml.jackson.dataformat:jackson-dataformat-yaml dependency-version: 2.19.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [net.java.dev.jna:jna-platform](https://github.com/java-native-access/jna) from 5.16.0 to 5.17.0. - [Changelog](https://github.com/java-native-access/jna/blob/master/CHANGES.md) - [Commits](java-native-access/jna@5.16.0...5.17.0) --- updated-dependencies: - dependency-name: net.java.dev.jna:jna-platform dependency-version: 5.17.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Bumps [de.undercouch:citeproc-java](https://github.com/michel-kraemer/citeproc-java) from 3.2.0 to 3.3.0. - [Release notes](https://github.com/michel-kraemer/citeproc-java/releases) - [Commits](michel-kraemer/citeproc-java@3.2.0...3.3.0) --- updated-dependencies: - dependency-name: de.undercouch:citeproc-java dependency-version: 3.3.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…JabRef#13022) Bumps [org.junit.platform:junit-platform-launcher](https://github.com/junit-team/junit5) from 1.12.1 to 1.12.2. - [Release notes](https://github.com/junit-team/junit5/releases) - [Commits](https://github.com/junit-team/junit5/commits) --- updated-dependencies: - dependency-name: org.junit.platform:junit-platform-launcher dependency-version: 1.12.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

This reverts commit ef3d440.

* New translations jabref_en.properties (French) * New translations jabref_en.properties (Spanish) * New translations jabref_en.properties (German) * New translations jabref_en.properties (Greek) * New translations jabref_en.properties (Italian) * New translations jabref_en.properties (Japanese) * New translations jabref_en.properties (Korean) * New translations jabref_en.properties (Dutch) * New translations jabref_en.properties (Polish) * New translations jabref_en.properties (Russian) * New translations jabref_en.properties (Swedish) * New translations jabref_en.properties (Turkish) * New translations jabref_en.properties (Chinese Simplified) * New translations jabref_en.properties (Portuguese, Brazilian) * New translations jabref_en.properties (Indonesian) --------- Co-authored-by: Oliver Kopp <[email protected]>

* Execute only one test a time * Fix server start * Move Chocolate.bib to main resources * Move rest-api.http to correct path * Fix native-access-warning * Enable exception output in cae of error * Fix :jabsrv:run * Fix passing of available libraries * Use Chocolate.bib * Minor final fixes * Fix checkstyle * Result of OpenRewrite rewriteRun * Fix test * Get test starting again * Inject Gson, too * Enable full exception logging * Add link to test-logger * Fix checkstyle * Add GlobalExceptionMapper * Try to fix logging * Try to fix binding * Fix path * Fix spaces * Fix spaces - the other way * Fix " * Fix openrewrite * Update sub modules * Fix List modification * Compile fix * Improve start output

* Merging Entry Creation Buttons Into a Single Tool. This commit merges several tools used to create new entries (`NewEntry`, `EntryType`, `CreateEntryFromId`, and `PlainCitationParser`) into a single tool, `NewEntryUnified`. `NewEntryUnified` has a separate tab for each of its component creation methods. The last-used tab, and the values of non-text-entry fields, are preserved between runs of the tool and sessions of JabRef. The new tool reinstates the ComboBox option for which parser should be used to parse plaintext citations, and adds a new option to create entries from a block of Bib(La)TeX entry sources. Additionally: * The Quick-Create New Empty Entry tool still remains, and is linked to create new empty entries of the most-recently used `EntryType` selected in the new tool (when creating an empty entry of a specific type with the new tool). * The keyboard shortcut `Ctrl + Shift + N`, which previously opened the `PlainCitationParser` tool, now opens the new tool with the 'parse plaintext citation' tab pre-opened. * Removed an accidentally-left-in development comment. * Fixed some merge errors. * Fixed changelog entries for PR#13020 being in the wrong section. * Applied some rewrite recommendations, and added comments about good future improvements. * Fixed using an abbreviation in variable named, changed it to the full-form. * Swapped unused lambda variables out for 'ignore this argument' placeholder-things. * Changed instances of 'New Entry Unified' naming to simply 'New Entry' given that there is no "non-unified" new entry tool. * Changed usages of 'Arrays.asList()' to 'List.of()'. * Renamed 'NewEntryUnifiedActionTest.java' to 'NewEntryActionTest.java'. * Changed more instances of unused lambda variables to '_'. * Removed obsolete phrases. * Added a 1px margin around FlowPane buttons to help them stand out more. * Added a keybinding to launch the NewEntry tool focussed on the 'enter identifier' tab. A new entry was added to the 'library' menu to inform users of this. * Moved tool info/hints to the top of the tab content, and changed prompt text to tool hints (as the user starting JabRef with anything in their clipboard means they'd otherwise never see it). * Made the NewEntry tool's TitledPanes collapsible, so it's easier for the user to access custom types without needing to resize the panel. Also added preferences for whether-or-not these TitledPanes are collapsed, preserving there state between sessions. * Changed the default dimensions of the NewEntry tool window to nicer-looking values. * Improved some tab names and a help tip. * Fixed up phrases. * Changed FlowPane's to TilePane's because they look nicer. * Fixed comment formats. * Changed menu item names for launching the 'New Entry' tool. * Renamed 'NewEntryApproach' to 'NewEntryDialogTab'. * Changed 'NewEntryAction' constructors so they don't have to be passed typed null arguments anymore. * Renamed 'StandardActions.NEW_INSTANT_ENTRY' to 'StandardActions.NEW_ENTRY_IMMEDIATE'. * Fixed up some UI stuff, and user-facing text. * Fixed some phrases. * Fixed some UI formatting. * Another UI fix... * Applied a missed phrase change. * Improved a lot of naming consistency between variables, tool names, and enum values (all related to the 'NewEntry' tool). --------- Co-authored-by: Marika-Academic <>

* Fix directory path validation checks * Fix Checkstyle * Fix CHANGELOG.md entry * Fix particular library location path * Improve code quality * Update JabRef_en.properties * Improve validation for unsaved libraries * Fix minor typo and comment * stringfix * stringfix --------- Co-authored-by: Oliver Kopp <[email protected]>

* Add tests Signed-off-by: subhramit <[email protected]> * Add comment Signed-off-by: subhramit <[email protected]> --------- Signed-off-by: subhramit <[email protected]>

JabRef#13040) * Add fallback logic to ConvertToBiblatexCleanup for parsing ISO-style dates in BibTeX `year` field * Add fallback logic to ConvertToBiblatexCleanup for parsing ISO-style dates in BibTeX `year` field * Add changelog entry * changelog * test: replace setField with withField * apply suggestions for concise changelog and remove redundant trim in ConvertToBiblatexCleanup * use List instead of Collection in applyDateFallback * use hasField for date check * fix: Trim input in Date.parse and apply style review feedback JabRef#13040 * fix: Trim input in Date.parse and apply style review feedback JabRef#13040

* Add "JabRef suggested groups" context menu entry Implements a new context menu entry for the "All entries" group to add two predefined groups if they don't already exist: - "Entries without linked files" - A search group that finds entries with no file links - "Entries without groups" - A search group that finds entries not assigned to any group The menu item is disabled automatically when both suggested groups already exist in the library. The implementation includes: - A utility class with factory methods for creating the suggested groups - Logic to check for existence of similar groups before adding Fixes JabRef#12659 * Add unit tests for handling suggested groups in the GroupTreeViewModel: - Test that root node has no suggested groups by default - Test addition of all suggested groups when none exist - Test addition of only missing suggested groups - Test that no groups are added when all suggested groups already exist * Add entry in changelog for suggested groups feature * Refactor GroupTreeViewModel to use toList() for collecting suggested subgroups * Update CHANGELOG to include "Add JabRef suggested groups" feature

* Fix OO sync button not enabeld for jstyle * changelog entry

…abRef#13254)

* Remove spaces * Remove line breaks * Fix casing

…81 (JabRef#13256)

…dator to v9 (JabRef#13257)

* Bring back .mailmap * Fix heading * Re-generate v5.x * Revert "Re-generate v5.x" This reverts commit adefdb4. * Regenerate v6.0-alpha2 * Revert "Regenerate v6.0-alpha2" This reverts commit 84c80d9.

Co-authored-by: Subhramit Basu <[email protected]>

* Fixed Localizations in citation relations * Fix tooltip: 'Add selected entry(s) to library' (follow decision 0041 and localization rules)

* New translations jabref_en.properties (French) * New translations jabref_en.properties (Spanish) * New translations jabref_en.properties (German) * New translations jabref_en.properties (Italian) * New translations jabref_en.properties (Turkish) * New translations jabref_en.properties (Chinese Simplified) * New translations jabref_en.properties (Portuguese, Brazilian)

Co-authored-by: Oliver Kopp <[email protected]>

BojiZhang requested a review from SaltedTan October 20, 2024 12:20

BojiZhang self-assigned this Oct 20, 2024

SaltedTan reviewed Oct 20, 2024

View reviewed changes

SaltedTan reviewed Oct 25, 2024

View reviewed changes

subhramit and others added 26 commits April 27, 2025 23:14

Refine text for update available (JabRef#13010)

6547d18

* Refine texts Signed-off-by: subhramit <[email protected]> * Update l10n Signed-off-by: subhramit <[email protected]> --------- Signed-off-by: subhramit <[email protected]>

Use basic type (JabRef#13016)

6716d54

Update javadoc (JabRef#13018)

0d6cb31

Signed-off-by: subhramit <[email protected]>

Add @return to getFileDirectories (JabRef#13019)

337b08b

Revert "Add Crowdin action (JabRef#13007)"

fd23447

This reverts commit ef3d440.

Fix path - and fix typo (JabRef#13038)

a77883b

Updating the gradle wrapper does not need any JDK (JabRef#13037)

8ddb985

Switch if branches for readbility (JabRef#13042)

dfdbe38

Keep merge=union for JabRef_en.properties

8159964

Add rendered DOI tests for CSL APA 7th ed. (JabRef#13052)

d9ea011

* Add tests Signed-off-by: subhramit <[email protected]> * Add comment Signed-off-by: subhramit <[email protected]> --------- Signed-off-by: subhramit <[email protected]>

Make comment on fixed issue more readable

fad9026

Fix environment variable JAVA_HOME (JabRef#13054)

f81518e

Fix OO sync button not enabeld for jstyle (JabRef#13055)

fef1b02

* Fix OO sync button not enabeld for jstyle * changelog entry

Add -ea workflow (both JDK-ea and JavaFX-ea) (JabRef#13056)

e984f71

Fix path for artifacts (JabRef#13057)

c707a8f

renovate-bot and others added 30 commits June 4, 2025 17:19

chore(deps): update dependency jekyll to "~> 4.4.0" (JabRef#13255)

5690a5e

Try to group PRs (and disable depdency dashboard)

37bec92

chore(deps): update dependency org.postgresql:postgresql to v42.7.6 (J…

fcdcacb

…abRef#13254)

Reformat build.kts (JabRef#13246)

bd2c4f9

* Remove spaces * Remove line breaks * Fix casing

chore(deps): update dependency org.bouncycastle:bcprov-jdk18on to v1.…

fcb0bb4

…81 (JabRef#13256)

chore(deps): update dependency org.hibernate.validator:hibernate-vali…

214a843

…dator to v9 (JabRef#13257)

Ignore Docker for now

83e0e88

Bring back .mailmap (JabRef#13237)

b2104a1

* Bring back .mailmap * Fix heading * Re-generate v5.x * Revert "Re-generate v5.x" This reverts commit adefdb4. * Regenerate v6.0-alpha2 * Revert "Regenerate v6.0-alpha2" This reverts commit 84c80d9.

Add FAQ on upstream sync (JabRef#13238)

2d94374

Co-authored-by: Subhramit Basu <[email protected]>

Fixed Localizations in citation relations (JabRef#13240)

aa07981

* Fixed Localizations in citation relations * Fix tooltip: 'Add selected entry(s) to library' (follow decision 0041 and localization rules)

Add demo for issue 9798 (JabRef#13263)

7ac36c8

Use named groups

ae9f742

Fix codespaces indent

9d0d1c4

Update renovate.json

5767a85

Merge remote-tracking branch 'origin/main' into fix-for-issue-JabRef#372

b919860

Fix logger import

b0da898

Remove unnecessary separator

a0d2c8f

Remove obsolete comment

a70195d

Reorder lookup menu

8057a82

Compilefix

da44233

Merge branch 'main' into fix-for-issue-JabRef#372

7f0d9c6

add test case

23b6172

Remove normalize method

1a7cf26

Refactor RemoveWhitespace to NonSpaceWhitespaceRemover

983091a

Co-authored-by: Oliver Kopp <[email protected]>

Fix CHANGELOG.md

db3e91d

Co-authored-by: Oliver Kopp <[email protected]>

Remove argument record

e394341

Co-authored-by: Oliver Kopp <[email protected]>

Simplify

4dd5004

Co-authored-by: Oliver Kopp <[email protected]>

Rewrite

c223e24

Co-authored-by: Oliver Kopp <[email protected]>

l10n

88ce43f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Fix for issue #372 #1

Fix for issue #372 #1

Uh oh!

BojiZhang commented Oct 20, 2024

Uh oh!

SaltedTan left a comment

Uh oh!

SaltedTan Oct 25, 2024

Uh oh!

BojiZhang Oct 25, 2024

Uh oh!

Uh oh!

Fix for issue #372 #1

Are you sure you want to change the base?

Fix for issue #372 #1

Uh oh!

Conversation

BojiZhang commented Oct 20, 2024

Uh oh!

SaltedTan left a comment

Choose a reason for hiding this comment

Uh oh!

SaltedTan Oct 25, 2024

Choose a reason for hiding this comment

Uh oh!

BojiZhang Oct 25, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!