Top Fields Constructors Methods

org.jabref.gui.git

public Class GuiGitConflictResolverStrategy

Class Inheritance

extends Object
implements GitConflictResolverStrategy

java.lang.Object
org.jabref.gui.git.GuiGitConflictResolverStrategy

Imports

java.util.ArrayList, .List, .Optional, java.util.concurrent.Callable, .CompletableFuture, .ExecutionException, javafx.application.Platform, org.jabref.logic.git.conflicts.GitConflictResolverStrategy, .ThreeWayEntryConflict, org.jabref.model.entry.BibEntry, org.slf4j.Logger, .LoggerFactory

Field Summary

Modifier and Type	Field and Description
private final GitConflictResolverDialog	dialog
private static final Logger	LOGGER

Constructor Summary

Access	Constructor and Description
public	GuiGitConflictResolverStrategy(GitConflictResolverDialog dialog)

Method Summary

Modifier and Type	Method and Description
private static <T> T	callOnFxAndWait(Callable<T> supplier)
public List<BibEntry>	resolveConflicts(List<ThreeWayEntryConflict> conflicts)

Inherited from java.lang.Object:: clone equals finalize getClass hashCode notify notifyAll toString wait wait wait

Field Detail

dialog	back to summary
private final GitConflictResolverDialog dialog

LOGGER	back to summary
private static final Logger LOGGER

Constructor Detail

GuiGitConflictResolverStrategy	back to summary
public GuiGitConflictResolverStrategy(GitConflictResolverDialog dialog)

Method Detail

callOnFxAndWait	back to summary
private static <T> T callOnFxAndWait(Callable<T> supplier)

resolveConflicts	back to summary
public List<BibEntry> resolveConflicts(List<ThreeWayEntryConflict> conflicts) Annotations @Override