Verified Owner
Top Constructors Methods
org.jabref.logic.git.merge.planning.util

public final Class ConflictRules

extends Object
Class Inheritance
Imports
java.util.Objects, .Optional, .Set, java.util.stream.Collectors, .Stream, org.jabref.logic.git.conflicts.ThreeWayEntryConflict, org.jabref.model.entry.BibEntry, org.jabref.model.entry.field.Field

Constructor Summary

AccessConstructor and Description
private
ConflictRules()

Method Summary

Modifier and TypeMethod and Description
public static boolean
addedOnBothSidesWithDisagreement(String baseVal, String localVal, String remoteVal)

public static Optional<ThreeWayEntryConflict>

Returns:

optional conflict (if detected)
detectEntryConflict(BibEntry
the entry in the common ancestor
base, BibEntry
the entry in the local version
local, BibEntry
the entry in the remote version
remote)

Detect entry-level conflicts among base, local, and remote versions of an entry.

public static boolean
entryTypeChangedDifferently(BibEntry base, BibEntry local, BibEntry remote)

public static boolean
hasConflictingFields(BibEntry base, BibEntry local, BibEntry remote)

public static boolean
modifiedOnBothSidesWithDisagreement(String baseVal, String localVal, String remoteVal)

public static boolean
notEqual(String a, String b)

public static boolean
oneSideDeletedOneSideModified(String baseVal, String localVal, String remoteVal)

Inherited from java.lang.Object:
cloneequalsfinalizegetClasshashCodenotifynotifyAlltoStringwaitwaitwait

Constructor Detail

ConflictRulesback to summary
private ConflictRules()

Method Detail

addedOnBothSidesWithDisagreementback to summary
public static boolean addedOnBothSidesWithDisagreement(String baseVal, String localVal, String remoteVal)
detectEntryConflictback to summary
public static Optional<ThreeWayEntryConflict> detectEntryConflict(BibEntry base, BibEntry local, BibEntry remote)

Detect entry-level conflicts among base, local, and remote versions of an entry.

Parameters
base:BibEntry

the entry in the common ancestor

local:BibEntry

the entry in the local version

remote:BibEntry

the entry in the remote version

Returns:Optional<ThreeWayEntryConflict>

optional conflict (if detected)

entryTypeChangedDifferentlyback to summary
public static boolean entryTypeChangedDifferently(BibEntry base, BibEntry local, BibEntry remote)
hasConflictingFieldsback to summary
public static boolean hasConflictingFields(BibEntry base, BibEntry local, BibEntry remote)
modifiedOnBothSidesWithDisagreementback to summary
public static boolean modifiedOnBothSidesWithDisagreement(String baseVal, String localVal, String remoteVal)
notEqualback to summary
public static boolean notEqual(String a, String b)
oneSideDeletedOneSideModifiedback to summary
public static boolean oneSideDeletedOneSideModified(String baseVal, String localVal, String remoteVal)