[WIP][GSOC22] - C - Improve the external changes resolver dialog#9021
Merged
Conversation
- Sorted fields by name - Removed internal fields
- When cell is empty there is no point of creating a label object
- Implemented UnifiedDiffHighlighter
- Just for testing
- Just for testing
- Only unified diff view will be shown for now
- Added "updated" style class for styling CHANGE diffs
calixtus
reviewed
Aug 23, 2022
calixtus
reviewed
Aug 23, 2022
calixtus
reviewed
Aug 23, 2022
Co-authored-by: Carl Christian Snethlage <50491877+calixtus@users.noreply.github.com>
Siedlerchr
reviewed
Aug 24, 2022
calixtus
reviewed
Aug 24, 2022
| public final class StringRenameDetailsView extends ExternalChangeDetailsView { | ||
|
|
||
| public StringRenameDetailsView(StringRename stringRename) { | ||
| Label label = new Label(stringRename.getNewString().getName() + " : " + stringRename.getOldString().getContent()); |
Member
There was a problem hiding this comment.
Maybe some comment about what is to be displayed here... huh?
Member
Author
There was a problem hiding this comment.
This view shows the state of the string after it is renamed, so if we have a string oldString : 1 and we rename it to newString then this should display newString : 1. I believe the use of stringRename.getOldString().getContent() is what causes the confusion. So I think using getNewString() might be a better fix than a comment.
Label label = new Label(stringRename.getNewString().getName() + " : " + stringRename.getNewString().getContent());
Member
Author
There was a problem hiding this comment.
Since this PR has already been merged, this could be addressed in another PR while working on the external changes resolver dialog.
Member
There was a problem hiding this comment.
Yes, you can change the name as a side quest to the test PR.
Siedlerchr
reviewed
Aug 26, 2022
| } | ||
|
|
||
| private ExternalChangeDetailsView createDetailsViewOrLoadFromCache(ExternalChange externalChange) { | ||
| ExternalChangeDetailsView cachedDetailsView = DETAILS_VIEW_CACHE.get(externalChange); |
Member
There was a problem hiding this comment.
Use the new computeIfAbsent method of the Map?
Siedlerchr
reviewed
Aug 29, 2022
Siedlerchr
reviewed
Aug 29, 2022
| import org.jabref.gui.util.OptionalObjectProperty; | ||
| import org.jabref.model.database.BibDatabaseContext; | ||
|
|
||
| public sealed abstract class ExternalChange permits EntryAdd, EntryChange, EntryDelete, GroupChange, MetadataChange, PreambleChange, BibTexStringAdd, BibTexStringChange, BibTexStringDelete, BibTexStringRename { |
Member
There was a problem hiding this comment.
Making an abstract class sealed imho defies its purpose to be extended. Sealed only make sense to prevent a normal class from being extended further or to use with interfaces and soon pattern matching
Member
There was a problem hiding this comment.
see ExternalChangeDetailsViewFactory
Siedlerchr
reviewed
Aug 29, 2022
Siedlerchr
reviewed
Aug 29, 2022
Siedlerchr
reviewed
Aug 29, 2022
Co-authored-by: Christoph <siedlerkiller@gmail.com>
Siedlerchr
reviewed
Aug 29, 2022
Siedlerchr
reviewed
Aug 29, 2022
Member
|
I only got some minor comments left, will need to test it but I think overall this is an excellent improvement |
Siedlerchr
approved these changes
Aug 30, 2022
Siedlerchr
left a comment
Member
There was a problem hiding this comment.
Okay, tested it also with a shared database and two instances of JabRef. Works fine!
Member
|
I'll have the honor. |
Siedlerchr
added a commit
that referenced
this pull request
Sep 2, 2022
* upstream/main: (387 commits) Show a warning in the merge dialog when authors are the same but formatted differently (#9088) Fix subdatabase from aux on cli (#9117) Visual improvements to LinkedFilesEditor (#9114) SLR Remove "last-search-date" (#9116) Hide diffs when one of the field values is blank a.k.a no conflict (#9110) Squashed 'buildres/csl/csl-locales/' changes from e637746677..b2afeb4d87 Squashed 'buildres/csl/csl-styles/' changes from c750b6e..8d69f16 Fix title case capitalization after en-dash characters (#9102) Update journal abbrev list (#9109) Fix CSL rendering in case of article (#8607) [WIP][GSOC22] - C - Improve the external changes resolver dialog (#9021) Bump jsoup from 1.15.1 to 1.15.3 (#9103) Bump checkstyle from 10.3.2 to 10.3.3 (#9104) Bump postgresql from 42.4.2 to 42.5.0 (#9105) Bump unirest-java from 3.13.10 to 3.13.11 (#9106) Include check for TimeStamp (#9089) Close OO connection on JabRef exit (#9076) Bump slf4j-tinylog from 2.4.1 to 2.5.0 (#9085) Bump bcprov-jdk18on from 1.71 to 1.71.1 (#9079) Bump tinylog-impl from 2.4.1 to 2.5.0 (#9086) ... # Conflicts: # src/main/java/org/jabref/gui/shared/SharedDatabaseUIManager.java # src/main/java/org/jabref/gui/util/DefaultTaskExecutor.java # src/main/java/org/jabref/logic/shared/DBMSSynchronizer.java
This was referenced Jan 2, 2023
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Contributes to #6190
does not fix:
Screenshots
Before:
After:
When clicking "Merge..":
CHANGELOG.mddescribed in a way that is understandable for the average user (if applicable)