Verified Owner
Top Description Fields Constructors Methods
org.jabref.gui.git

public Class GitConflictResolverDialog

extends Object
Class Inheritance
Imports
java.util.Optional, org.jabref.gui.DialogService, .StateManager, org.jabref.gui.mergeentries.threewaymerge.MergeEntriesDialog, .ShowDiffConfig, org.jabref.gui.mergeentries.threewaymerge.diffhighlighter.DiffHighlighter, org.jabref.gui.mergeentries.threewaymerge.toolbar.ThreeWayMergeToolbar, org.jabref.gui.preferences.GuiPreferences, org.jabref.logic.git.conflicts.ThreeWayEntryConflict, org.jabref.logic.l10n.Localization, org.jabref.model.entry.BibEntry
A wrapper around MergeEntriesDialog for Git feature

Receives a semantic conflict (ThreeWayEntryConflict), pops up an interactive GUI (belonging to mergeentries), and returns a user-confirmed BibEntry merge result.

Field Summary

Modifier and TypeField and Description
private final DialogService
dialogService

private final GuiPreferences
preferences

private final StateManager
stateManager

Constructor Summary

AccessConstructor and Description
public
GitConflictResolverDialog(DialogService dialogService, GuiPreferences preferences, StateManager stateManager)

Method Summary

Modifier and TypeMethod and Description
public Optional<BibEntry>
resolveConflict(ThreeWayEntryConflict conflict)

Inherited from java.lang.Object:
cloneequalsfinalizegetClasshashCodenotifynotifyAlltoStringwaitwaitwait

Field Detail

dialogServiceback to summary
private final DialogService dialogService
preferencesback to summary
private final GuiPreferences preferences
stateManagerback to summary
private final StateManager stateManager

Constructor Detail

GitConflictResolverDialogback to summary
public GitConflictResolverDialog(DialogService dialogService, GuiPreferences preferences, StateManager stateManager)

Method Detail

resolveConflictback to summary
public Optional<BibEntry> resolveConflict(ThreeWayEntryConflict conflict)