Skip to content

Refactor merge entries package structure#13614

Merged
koppor merged 2 commits into
mainfrom
rename-merge-dialog-pkg
Jul 31, 2025
Merged

Refactor merge entries package structure#13614
koppor merged 2 commits into
mainfrom
rename-merge-dialog-pkg

Conversation

@HoussemNasri

@HoussemNasri HoussemNasri commented Jul 30, 2025

Copy link
Copy Markdown
Member

The name of the package "newmergedialog" is obsolete as now there is a single entries merge dialog (beside the multi-way merge dialog for merging PDF metadata).

The goal of this pull requests is to rename the package and restructure it a bit to create a clear separation between the three-way merge and the multi-way merge dialogs.

Mandatory checks

  • I own the copyright of the code submitted and I license it under the MIT license
  • Change in CHANGELOG.md described in a way that is understandable for the average user (if change is visible to the user)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (if change is visible to the user)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked 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 to the documentation repository.

@HoussemNasri HoussemNasri requested a review from koppor July 30, 2025 13:58
trag-bot[bot]
trag-bot Bot reviewed Jul 30, 2025
View reviewed changes
Comment thread jabgui/src/main/java/org/jabref/gui/mergeentries/multiwaymerge/MultiMergeEntriesView.java
import javafx.scene.text.TextAlignment;

import org.jabref.gui.icon.IconTheme;
import org.jabref.gui.mergeentries.DiffMode;

@trag-bot trag-bot Bot Jul 30, 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.

The DiffMode class remains in the old package structure while related code has moved. This creates package fragmentation and violates cohesion principles. DiffMode should move with related code.

@Siedlerchr

Siedlerchr commented Jul 30, 2025

Copy link
Copy Markdown
Member

Error: eckstyle] [ERROR] /home/runner/work/jabref/jabref/jabgui/src/main/java/org/jabref/gui/maintable/RightClickMenu.java:32:1: Wrong order for 'org.jabref.gui.mergeentries.MergeWithFetchedEntryAction' import. [ImportOrder]
Error: eckstyle] [ERROR] /home/runner/work/jabref/jabref/jabgui/src/main/java/org/jabref/gui/frame/MainMenu.java:59:1: Wrong order for 'org.jabref.gui.mergeentries.MergeWithFetchedEntryAction' import. [ImportOrder]

@Siedlerchr Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jul 30, 2025
@koppor koppor mentioned this pull request Jul 31, 2025
Closed
koppor
koppor previously approved these changes Jul 31, 2025
View reviewed changes

@koppor koppor left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I went through with RefactoringMiner. Looks good.

Pleae fix merge conflict and checkstyle.

@HoussemNasri HoussemNasri force-pushed the rename-merge-dialog-pkg branch from f011665 to 51ef2a2 Compare July 31, 2025 09:37
@trag-bot

trag-bot Bot commented Jul 31, 2025

Copy link
Copy Markdown

@trag-bot didn't find any issues in the code! ✅✨

@koppor koppor added this pull request to the merge queue Jul 31, 2025
Merged via the queue into main with commit f63eb46 Jul 31, 2025
2 checks passed
@koppor koppor deleted the rename-merge-dialog-pkg branch July 31, 2025 10:06
Siedlerchr added a commit that referenced this pull request Aug 2, 2025
@Siedlerchr
Merge remote-tracking branch 'upstream/main'
8f7ffcb 
* upstream/main:
  Issue 13619 Make Citation relations text more clear. (#13620)
  Explain how to handle notifications (#13630)
  Fix scope of 'determine issue number' job (#13627)
  Add proper closing (#13626)
  Implement logic orchestration for Git Pull/Push operations (#13518)
  Make pattern for issue number more strict
  Fix "Cannot load file MultiMergeEntries.fxml" (#13624)
  Add Copy markdown to copy citation (#13387)
  Add ADR-0047 (#13621)
  Initial start of implementing a LSP for integrity checks (#13612)
  Refactor merge entries package structure (#13614)
  New Crowdin updates (#13616)
  BibEntry class no longer implements Cloneable (#13615)
  Fix dark mode in {} of Citation Relations tab of the entry editor (#13609)
  Update dependency org.kohsuke:github-api to v2.0-rc.4 (#13611)
  Fix setting of proxy without password (#13605)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

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

@koppor koppor koppor approved these changes

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.

3 participants

@HoussemNasri @Siedlerchr @koppor