Skip to content

Fix NoSuchElementException in ThreeWayMerge dialog#13838

Merged
koppor merged 9 commits into
JabRef:mainfrom
HoussemNasri:fix-threewaymerge-exception
Sep 10, 2025
Merged

Fix NoSuchElementException in ThreeWayMerge dialog#13838
koppor merged 9 commits into
JabRef:mainfrom
HoussemNasri:fix-threewaymerge-exception

Conversation

@HoussemNasri

@HoussemNasri HoussemNasri commented Sep 8, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

Fixes #13673

Mandatory checks

  • I own the copyright of the code submitted and I license it under the MIT license
  • I manually tested my changes in running JabRef (always required)
  • I added JUnit tests for changes (if applicable)
  • [/] I added screenshots in the PR description (if change is visible to the user)
  • I described the change in CHANGELOG.md in a way that is understandable for the average user (if change is visible to the user)
  • I checked the user documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request updating file(s) in https://github.com/JabRef/user-documentation/tree/main/en.

subhramit
subhramit reviewed Sep 8, 2025
View reviewed changes
Comment thread CHANGELOG.md Outdated
@HoussemNasri HoussemNasri added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Sep 8, 2025
subhramit
subhramit reviewed Sep 8, 2025
View reviewed changes
Comment thread CHANGELOG.md Outdated
Siedlerchr
Siedlerchr previously approved these changes Sep 8, 2025
View reviewed changes
@HoussemNasri @subhramit
Update CHANGELOG.md
6e15a54 
Co-authored-by: Subhramit Basu <subhramit.bb@live.in>
koppor
koppor previously approved these changes Sep 8, 2025
View reviewed changes
@koppor koppor enabled auto-merge September 8, 2025 20:04
koppor
koppor previously approved these changes Sep 8, 2025
View reviewed changes
calixtus
calixtus previously approved these changes Sep 8, 2025
View reviewed changes
@subhramit

subhramit commented Sep 9, 2025

Copy link
Copy Markdown
Member

Just openrewrite is left i think

@subhramit

subhramit commented Sep 9, 2025

Copy link
Copy Markdown
Member

Nope, the logs seem like its that odd prolog error that keeps happening
Let me try merging main once

@subhramit

subhramit commented Sep 9, 2025 •
edited
Loading

Copy link
Copy Markdown
Member

No change, the error seems to be XML Parse Exception for:
jabref/jablib/src/main/resources/csl-styles/oscola-journal-abbreviations.csl and jabref/jablib/src/main/resources/csl-styles/eu-interinstitutional-style-1st-edition.csl (instead of literatura.csl that appeared in the past).
Under Task :jablib:extractMaintainers

@Siedlerchr

Siedlerchr commented Sep 10, 2025

Copy link
Copy Markdown
Member

Task :rewriteDryRun
Recipe validation error in org.jabref.config.rewrite.cleanup.recipeList[71] (in file:/home/runner/work/jabref/jabref/rewrite.yml): recipe 'org.openrewrite.java.testing.cleanup.AssertLiteralBooleanToFailRecipe' does not exist.

@HoussemNasri HoussemNasri dismissed stale reviews from koppor and calixtus via 9008a56 September 10, 2025 13:18
trag-bot[bot]
trag-bot Bot reviewed Sep 10, 2025
View reviewed changes
Comment thread jablib/src/main/java/org/jabref/logic/integrity/YearChecker.java
return Optional.empty();
}

public static boolean isValueCorrectlyFormatted(String value) {

@trag-bot trag-bot Bot Sep 10, 2025

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Method duplicates logic from checkValue() which violates DRY principle. Should refactor to reuse existing validation logic to prevent maintenance issues.

@koppor koppor added this pull request to the merge queue Sep 10, 2025
Merged via the queue into JabRef:main with commit 577bbb6 Sep 10, 2025
35 of 36 checks passed
@github-actions github-actions Bot mentioned this pull request Sep 10, 2025
Closed
2 tasks
Siedlerchr added a commit that referenced this pull request Sep 11, 2025
@Siedlerchr
Merge remote-tracking branch 'upstream/main'
2a819aa 
* upstream/main:
  Fix NoSuchElementException in ThreeWayMerge dialog (#13838)
  Keep global search bar open when  keep on top pin is selected (#13846)
  Spell "BibDesk" with capital "D" (#13847)
  fix: Improper icon sizing with respect to font size (#13841)
  Ensure latest JDK veriant (#13843)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@subhramit subhramit subhramit left review comments

@trag-bot trag-bot[bot] trag-bot[bot] left review comments

@Siedlerchr Siedlerchr Siedlerchr approved these changes

@koppor koppor koppor left review comments

@calixtus calixtus calixtus left review comments

Assignees

No one assigned

Labels

status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uncaught Exception in ThreeWayMerge dialog when looking up Bibliographic information from DOI

5 participants

@HoussemNasri @subhramit @Siedlerchr @koppor @calixtus