public class NotesMergeConflictException
extends java.io.IOException
NoteMerger
when a conflict on Notes content is
found during merge.Modifier and Type | Field and Description |
---|---|
private static long |
serialVersionUID |
Constructor and Description |
---|
NotesMergeConflictException(NonNoteEntry base,
NonNoteEntry ours,
NonNoteEntry theirs)
Constructs a NotesMergeConflictException for the specified base, ours and
theirs versions of the root note tree.
|
NotesMergeConflictException(Note base,
Note ours,
Note theirs)
Construct a NotesMergeConflictException for the specified base, ours and
theirs note versions.
|
Modifier and Type | Method and Description |
---|---|
private static java.lang.String |
name(NonNoteEntry e) |
private static java.lang.String |
noteData(Note n) |
private static java.lang.String |
noteOn(Note base,
Note ours,
Note theirs) |
private static final long serialVersionUID
public NotesMergeConflictException(Note base, Note ours, Note theirs)
base
- note versionours
- note versiontheirs
- note versionpublic NotesMergeConflictException(NonNoteEntry base, NonNoteEntry ours, NonNoteEntry theirs)
base
- version of the root note treeours
- version of the root note treetheirs
- version of the root note treeprivate static java.lang.String noteData(Note n)
private static java.lang.String name(NonNoteEntry e)