[GSOC22] - B - Implement merging fields in the three way merge UI#9022

Merged

Siedlerchr merged 437 commits intomainfrom GSOC-merge-fields

Aug 10, 2022

+999-77

This pull request is big! We're only showing the most recent 250 commits

Commits on Jul 27, 2022

Pass arguments to Localization.lang using '%0' not '%'
HoussemNasri
committed
Decompose the ToggleMergeUnmergeButton into its own class (or component)
HoussemNasri
committed

Commits on Aug 2, 2022

Commits on Aug 3, 2022

Enable the 'Merge...' button only if the selected change has an advanced merge dialog
HoussemNasri
committed
Select the first change after opening the dialog
HoussemNasri
committed
Open the advanced merge dialog when 'Merge...' is clicked
HoussemNasri
committed
Don't open the advanced merge dialog when 'makeChange()' is called on 'EntryChangeViewModel'
HoussemNasri
committed
Display a preview of the deleted entry
HoussemNasri
committed
Display information about the selected change in the bottom detail node
HoussemNasri
committed
Merge branch 'JabRef:main' into GSOC-merge-groups
HoussemNasri
authored
Merge branch 'GSOC-merge-groups' into GSOC-improve-collab-dialog
HoussemNasri
committed
Merge remote-tracking branch 'origin/main' into GSOC-merge-fields
HoussemNasri
committed
Merge remote-tracking branch 'upstream/main' into GSOC-improve-collab-dialog
Siedlerchr
committed
Update README.md

HoussemNasri
authored and
Siedlerchr
committed
Fix Readme

HoussemNasri
authored and
Siedlerchr
committed
Create grid cells for rendering field name and field value

HoussemNasri
authored and
Siedlerchr
committed
Implement FieldNameCell and define style class

HoussemNasri
authored and
Siedlerchr
committed
Make FieldValueCell selectable

HoussemNasri
authored and
Siedlerchr
committed
Implement MergedFieldCell for rendering editable merged field value

HoussemNasri
authored and
Siedlerchr
committed
Change MergedFieldCell text based on the selected FieldValueCell

HoussemNasri
authored and
Siedlerchr
committed
Style MergedFieldCell

HoussemNasri
authored and
Siedlerchr
committed
Rename ThreeWayMerge css stylesheet

HoussemNasri
authored and
Siedlerchr
committed
Create HeadView for rendering left, right and merged entry headers

HoussemNasri
authored and
Siedlerchr
committed
Fix typo

HoussemNasri
authored and
Siedlerchr
committed
Fix a bug that causes the selection of both left and right field cells simultaneously.

HoussemNasri
authored and
Siedlerchr
committed
Prevent the selection of FieldValueCell when it's disabled

HoussemNasri
authored and
Siedlerchr
committed
Display a copy icon inside FieldValueCell

HoussemNasri
authored and
Siedlerchr
committed
Disable left or right FieldValueCell when it's empty

HoussemNasri
authored and
Siedlerchr
committed
Update Base CSS style

HoussemNasri
authored and
Siedlerchr
committed
Design and implement the merge toolbox

HoussemNasri
authored and
Siedlerchr
committed
Implement the initial prototype of the new merge UI

HoussemNasri
authored and
Siedlerchr
committed
Use ThreeWayMergeView in MergeEntriesDialog

HoussemNasri
authored and
Siedlerchr
committed
Fix ThreeWayMergeView.css stylesheet not being imported

HoussemNasri
authored and
Siedlerchr
committed
Span left field value to 2 columns when left and right field values are the same

HoussemNasri
authored and
Siedlerchr
committed
Wrap the copy icon inside a button

HoussemNasri
authored and
Siedlerchr
committed
Use HAND cursor when hover over FieldValueCell

HoussemNasri
authored and
Siedlerchr
committed
Move field cells styles to ThreeWayMergeView.css

HoussemNasri
authored and
Siedlerchr
committed
Update merge toolbox FXML UI

HoussemNasri
authored and
Siedlerchr
committed
Implement and style HeaderCell

HoussemNasri
authored and
Siedlerchr
committed
Take row index as an argument in AbstractCell

HoussemNasri
authored and
Siedlerchr
committed
Color cell background based on its row position (odd or even)

HoussemNasri
authored and
Siedlerchr
committed
Bind textArea.textProperty() and textProperty() using BindingsHelper

HoussemNasri
authored and
Siedlerchr
committed
Copy field value to Clipboard user clicks on the copy button

HoussemNasri
authored and
Siedlerchr
committed
Implement a more complete HeaderView

HoussemNasri
authored and
Siedlerchr
committed
Pass left and right headers to HeaderView

HoussemNasri
authored and
Siedlerchr
committed
Create merged entry

HoussemNasri
authored and
Siedlerchr
committed
Add the entry type field at the top of the fields list

HoussemNasri
authored and
Siedlerchr
committed
Display entry type and bind merged entry

HoussemNasri
authored and
Siedlerchr
committed
Minor changes

HoussemNasri
authored and
Siedlerchr
committed
Style CSS

HoussemNasri
authored and
Siedlerchr
committed
Update ThreeWayMergeToolbox.fxml

HoussemNasri
authored and
Siedlerchr
committed
Remove MergeEntries from MergeEntriesDialog

HoussemNasri
authored and
Siedlerchr
committed
Create EmptyCell for optimization

HoussemNasri
authored and
Siedlerchr
committed
Update HeaderCell

HoussemNasri
authored and
Siedlerchr
committed
Rename HeaderView to ThreeWayMergeHeaderView

HoussemNasri
authored and
Siedlerchr
committed
Add buttons to accept all left or right entry changes to ThreeWayMergeToolbar

HoussemNasri
authored and
Siedlerchr
committed
Disable right field cell when it's not visible

HoussemNasri
authored and
Siedlerchr
committed
Listen for select all left/right toolbar buttons

HoussemNasri
authored and
Siedlerchr
committed
Style stuff

HoussemNasri
authored and
Siedlerchr
committed
Add DiffHighlighter

HoussemNasri
authored and
Siedlerchr
committed
Create DiffHighlighter.css

HoussemNasri
authored and
Siedlerchr
committed
Add left padding to HeaderCell

HoussemNasri
authored and
Siedlerchr
committed
Move diff highlighting styles to Dark.css

HoussemNasri
authored and
Siedlerchr
committed
Show differences between left and right values using a unified diff view

HoussemNasri
authored and
Siedlerchr
committed
Change MergeEntriesDialog stage style

HoussemNasri
authored and
Siedlerchr
committed
Remove BackgroundTone from AbstractCell

HoussemNasri
authored and
Siedlerchr
committed
Move CopyFieldValueCommand

HoussemNasri
authored and
Siedlerchr
committed
Make DiffMethod public

HoussemNasri
authored and
Siedlerchr
committed
Move CopyFieldValueCommand

HoussemNasri
authored and
Siedlerchr
committed
Implement SplitDiffHighlighter

HoussemNasri
authored and
Siedlerchr
committed
Show diffs when user selects "Show Diff" in the toolbar UI

HoussemNasri
authored and
Siedlerchr
committed
Fix bugs in UnifiedDiffHighlighter

HoussemNasri
authored and
Siedlerchr
committed
Style css stuff

HoussemNasri
authored and
Siedlerchr
committed
Fix typos

HoussemNasri
authored and
Siedlerchr
committed
Refactor SplitDiffHighlighter and fix bugs

HoussemNasri
authored and
Siedlerchr
committed
Remove redundant constructor from UnifiedDiffHighlighter

HoussemNasri
authored and
Siedlerchr
committed
Allow users to switch between split and unified diff view

HoussemNasri
authored and
Siedlerchr
committed
Set left and right headers in MergeEntriesDialog

HoussemNasri
authored and
Siedlerchr
committed
Refactor ThreeWayMergeHeaderView

HoussemNasri
authored and
Siedlerchr
committed
Remove wellbehavedfx module dependency

HoussemNasri
authored and
Siedlerchr
committed
Delete EmptyCell.java

HoussemNasri
authored and
Siedlerchr
committed
Refactor FieldValueCell

HoussemNasri
authored and
Siedlerchr
committed
Use the new merge UI in DuplicateResolverDialog

HoussemNasri
authored and
Siedlerchr
committed
Expose an API to change diff view and highlight method from outside the merge toolbar

HoussemNasri
authored and
Siedlerchr
committed
Use the new merge UI when an entry is changed from external

HoussemNasri
authored and
Siedlerchr
committed
Minor styling

HoussemNasri
authored and
Siedlerchr
committed
Remove DiffHighlighter.css stylesheet

HoussemNasri
authored and
Siedlerchr
committed
Remove unused dependencies

HoussemNasri
authored and
Siedlerchr
committed
Allow selecting empty field values

HoussemNasri
authored and
Siedlerchr
committed
Fix readme :(

HoussemNasri
authored and
Siedlerchr
committed
Use a theme color for selection box background

HoussemNasri
authored and
Siedlerchr
committed
Refactor FieldValueCell

HoussemNasri
authored and
Siedlerchr
committed
Add an action to FieldValueCell for opening Urls

HoussemNasri
authored and
Siedlerchr
committed
Add the ability to open DOI identifier

HoussemNasri
authored and
Siedlerchr
committed
Cleanup

HoussemNasri
authored and
Siedlerchr
committed
Checkstyle

HoussemNasri
authored and
Siedlerchr
committed
Improve URL validation logic

HoussemNasri
authored and
Siedlerchr
committed
Use DiffMethod in merge toolbar for consistency

HoussemNasri
authored and
Siedlerchr
committed
i18n
Siedlerchr
committed
Cleanup css

HoussemNasri
authored and
Siedlerchr
committed
Remove redundant icon style

HoussemNasri
authored and
Siedlerchr
committed
Rename style class field-value to merge-field-value

HoussemNasri
authored and
Siedlerchr
committed
Remove old Merge entries UI

HoussemNasri
authored and
Siedlerchr
committed
Fix missing header styles

HoussemNasri
authored and
Siedlerchr
committed
i18n
Siedlerchr
committed
Garbage collect right cell when it's invisible

HoussemNasri
authored and
Siedlerchr
committed
Fix typo

HoussemNasri
authored and
Siedlerchr
committed
Create GroupsFieldNameCell

HoussemNasri
authored and
Siedlerchr
committed
Create MergedGroups to record the state of the groups before and after the merge

HoussemNasri
authored and
Siedlerchr
committed
Create a factory class for creating field name cells

HoussemNasri
authored and
Siedlerchr
committed
Perform experiments for implementing groups merging

HoussemNasri
authored and
Siedlerchr
committed
Delegate field name cells creation to ThreeWayMergeView

HoussemNasri
authored and
Siedlerchr
committed
Improve groups merging function

HoussemNasri
authored and
Siedlerchr
committed
Implement updateFieldValues to redraw the field row when left or right entry changes

HoussemNasri
authored and
Siedlerchr
committed
Write a draft version of the logic to merge groups

HoussemNasri
authored and
Siedlerchr
committed
Refactoring

HoussemNasri
authored and
Siedlerchr
committed
More Refactoring

HoussemNasri
authored and
Siedlerchr
committed
Merge groups only when left and right entries have different groups

HoussemNasri
authored and
Siedlerchr
committed
Add row constraints to fix UI lagging when updating field values

HoussemNasri
authored and
Siedlerchr
committed
Minor refactoring

HoussemNasri
authored and
Siedlerchr
committed
Don't merge common groups between left and right entries

HoussemNasri
authored and
Siedlerchr
committed
Refactor GroupsFieldNameCell constructor

HoussemNasri
authored and
Siedlerchr
committed
Allow groups field row to grow in height

HoussemNasri
authored and
Siedlerchr
committed
Fix select all left/right not working properly

HoussemNasri
authored and
Siedlerchr
committed
Update diff when a field value changes

HoussemNasri
authored and
Siedlerchr
committed
Add the merge icon and style css

HoussemNasri
authored and
Siedlerchr
committed
Extract merge and unmerge commands into their own classes

HoussemNasri
authored and
Siedlerchr
committed
Refactoring

HoussemNasri
authored and
Siedlerchr
committed
Record groups merging operation using CompoundEdit

HoussemNasri
authored and
Siedlerchr
committed
Cancel groups merge when user choose 'Cancel' in the merge entries dialog

HoussemNasri
authored and
Siedlerchr
committed
Make FieldNameCell take only one action

HoussemNasri
authored and
Siedlerchr
committed
Set groups merge action to MERGE by default

HoussemNasri
authored and
Siedlerchr
committed
Fix Unmerge button always disabled

HoussemNasri
authored and
Siedlerchr
committed
Cleanup

HoussemNasri
authored and
Siedlerchr
committed
Almost f**** everything up. I deleted GroupsFieldNameCell content by mistake, it's all ok now

HoussemNasri
authored and
Siedlerchr
committed
Checkstyle

HoussemNasri
authored and
Siedlerchr
committed
Remove unused MergedGroups class

HoussemNasri
authored and
Siedlerchr
committed
Register groups merge edit into UndoManager

HoussemNasri
authored and
Siedlerchr
committed
Cancel merge groups edit in the DuplicateResolverDialog when user choose 'Cancel' button

HoussemNasri
authored and
Siedlerchr
committed
i18n
Siedlerchr
committed
Introduce ThreeFieldValuesViewModel

HoussemNasri
authored and
Siedlerchr
committed
Merge clones of left & right entry rather than the original ones

HoussemNasri
authored and
Siedlerchr
committed
Optimize imports

HoussemNasri
authored and
Siedlerchr
committed
Refactor DuplicateResolverDialog to merge clones of left and right entry

HoussemNasri
authored and
Siedlerchr
committed
Select the other entry groups when one entry has no group

HoussemNasri
authored and
Siedlerchr
committed
Remove unused property

HoussemNasri
authored and
Siedlerchr
committed
[WIP] Convert ThreeFieldValues to MVVM

HoussemNasri
authored and
Siedlerchr
committed
Move business logic to the view-model and update UI via binding

HoussemNasri
authored and
Siedlerchr
committed
Consider equal left and right fields as merged

HoussemNasri
authored and
Siedlerchr
committed
Move initial selection code to the view model

HoussemNasri
authored and
Siedlerchr
committed
Refactor

HoussemNasri
authored and
Siedlerchr
committed
Hide rightValueCell and extend leftValueCell to 2 columns when fields are merged

HoussemNasri
authored and
Siedlerchr
committed
Prepare for adding the ability to merge fields other than groups

HoussemNasri
authored and
Siedlerchr
committed
Rename ThreeFieldValues to ThreeFieldValuesView

HoussemNasri
authored and
Siedlerchr
committed
Delegate FieldNameCell creation to ThreeFieldValuesView

HoussemNasri
authored and
Siedlerchr
committed
Pass Bib entries to ThreeFieldValuesView rather than raw string

HoussemNasri
authored and
Siedlerchr
committed
Move merge/unmerge commands to ThreeFieldValuesView

HoussemNasri
authored and
Siedlerchr
committed
Bind field value cell text property

HoussemNasri
authored and
Siedlerchr
committed
Create an undoable edit for undoing fields merging

HoussemNasri
authored and
Siedlerchr
committed
Update bib entries when left and right field value properties change

HoussemNasri
authored and
Siedlerchr
committed
Update left and right field value properties when merging fields rather than the bib entries

HoussemNasri
authored and
Siedlerchr
committed
Unbind MergedFieldValue property because it can't be edited when bound

HoussemNasri
authored and
Siedlerchr
committed
Cleanup

HoussemNasri
authored and
Siedlerchr
committed
Move merged entry update logic to ThreeFieldValuesViewModel

HoussemNasri
authored and
Siedlerchr
committed
Implement algorithms for merging groups and keywords

HoussemNasri
authored and
Siedlerchr
committed
Pass FieldMergerFactory to ThreeFieldValuesView

HoussemNasri
authored and
Siedlerchr
committed
Move isMergeableField method to FieldMergerFactory

HoussemNasri
authored and
Siedlerchr
committed
Delete cancelGroupsEdit()

HoussemNasri
authored and
Siedlerchr
committed
Fix KeywordMerger implementation

HoussemNasri
authored and
Siedlerchr
committed
Fix a bug that deselects both fields after they are unmerged

HoussemNasri
authored and
Siedlerchr
committed
Rename 'ThreeFieldValues' to 'FieldRow'

HoussemNasri
authored and
Siedlerchr
committed
Cleanup

HoussemNasri
authored and
Siedlerchr
committed
Hide diffs when both values are equal

HoussemNasri
authored and
Siedlerchr
committed
Fix typos

HoussemNasri
authored and
Siedlerchr
committed
Select LEFT value after merging fields

HoussemNasri
authored and
Siedlerchr
committed
Logging

HoussemNasri
authored and
Siedlerchr
committed
Implement merging comments

HoussemNasri
authored and
Siedlerchr
committed
Improve groups and keywords merger implementation

HoussemNasri
authored and
Siedlerchr
committed
Change merge/unmerge buttons tooltip text based on the field to merge

HoussemNasri
authored and
Siedlerchr
committed
Implement file merging

HoussemNasri
authored and
Siedlerchr
committed
Encode the resulting string from merging files

HoussemNasri
authored and
Siedlerchr
committed
Refactor merge/unmerge fields command handling

HoussemNasri
authored and
Siedlerchr
committed
Declare Actions with the builder design pattern

HoussemNasri
authored and
Siedlerchr
committed
Remove MergeableFieldCell dependency from the merge/unmerge commands

HoussemNasri
authored and
Siedlerchr
committed
Add logs

HoussemNasri
authored and
Siedlerchr
committed
Disable field's merge button when field values are equal

HoussemNasri
authored and
Siedlerchr
committed
Update code documentation

HoussemNasri
authored and
Siedlerchr
committed
Rename 'AbstractCell' to 'ThreeWayMergeCell'

HoussemNasri
authored and
Siedlerchr
committed
Pass arguments to Localization.lang using '%0' not '%'

HoussemNasri
authored and
Siedlerchr
committed
Decompose the ToggleMergeUnmergeButton into its own class (or component)

HoussemNasri
authored and
Siedlerchr
committed
Include original left and right entries in EntriesMergeResult

HoussemNasri
authored and
Siedlerchr
committed
Make entries merging logic reusable

HoussemNasri
authored and
Siedlerchr
committed
Rename ChangeDisplayDialog.java to ExternalChangesResolverDialog.java

HoussemNasri
authored and
Siedlerchr
committed
Create ExternalChangesResolverViewModel

HoussemNasri
authored and
Siedlerchr
committed
Design the ExternalChangesResolverDialog

HoussemNasri
authored and
Siedlerchr
committed
Implement a method for opening an advanced merge dialog for modified entries

HoussemNasri
authored and
Siedlerchr
committed
Wrap the UI in a dialog pane

HoussemNasri
authored and
Siedlerchr
committed
Convert change name to a StringProperty instead of a raw string

HoussemNasri
authored and
Siedlerchr
committed
Populate table view with changes

HoussemNasri
authored and
Siedlerchr
committed
Remove 'Accept changes' and 'Dismiss' buttons from the dialog

HoussemNasri
authored and
Siedlerchr
committed
Allow selecting multiple changes

HoussemNasri
authored and
Siedlerchr
committed
Rename 'Accept Theirs' to 'Accept' and 'Accept Yours' to 'Deny'

HoussemNasri
authored and
Siedlerchr
committed
Apply changes when before the dialog

HoussemNasri
authored and
Siedlerchr
committed
Cleanup FXML

HoussemNasri
authored and
Siedlerchr
committed
Remove old UI code

HoussemNasri
authored and
Siedlerchr
committed
Close dialog when all changes are resolved

HoussemNasri
authored and
Siedlerchr
committed
Enable the 'Merge...' button only if the selected change has an advanced merge dialog

HoussemNasri
authored and
Siedlerchr
committed
Select the first change after opening the dialog

HoussemNasri
authored and
Siedlerchr
committed
Open the advanced merge dialog when 'Merge...' is clicked

HoussemNasri
authored and
Siedlerchr
committed
Don't open the advanced merge dialog when 'makeChange()' is called on 'EntryChangeViewModel'

HoussemNasri
authored and
Siedlerchr
committed
Display a preview of the deleted entry

HoussemNasri
authored and
Siedlerchr
committed
Display information about the selected change in the bottom detail node

HoussemNasri
authored and
Siedlerchr
committed
Merge branch 'GSOC-improve-collab-dialog' of github.com:JabRef/jabref into GSOC-improve-collab-dialog
Siedlerchr
committed
Merge remote-tracking branch 'upstream/main' into GSOC-merge-fields
Siedlerchr
committed
Merge remote-tracking branch 'upstream/main' into GSOC-fully-functional-three-way-merge
Siedlerchr
committed
Merge remote-tracking branch 'upstream/GSOC-improve-collab-dialog' into GSOC-merge-fields
Siedlerchr
committed
Revert "[WIP] [GSOC22] Improve the external changes resolver dialog" (#9019 )
Siedlerchr
authored
Merge branch 'GSOC-fully-functional-three-way-merge' into GSOC-merge-groups
HoussemNasri
committed

Commits

Commits on Jul 25, 2022

Commits on Jul 27, 2022

Commits on Aug 2, 2022

Commits on Aug 3, 2022