/** {@inheritDoc} */ @Override public int size() { return base.size(); } }
private HashedSequence<S> wrap(S base) { final int end = base.size(); final int[] hashes = new int[end]; for (int ptr = 0; ptr < end; ptr++) hashes[ptr] = cmp.hash(base, ptr); return new HashedSequence<>(base, hashes); } }
/** {@inheritDoc} */ @Override public <S extends Sequence> EditList diffNonCommon( SequenceComparator<? super S> cmp, S a, S b) { HashedSequencePair<S> p = new HashedSequencePair<>(cmp, a, b); HashedSequenceComparator<S> hc = p.getComparator(); HashedSequence<S> ha = p.getA(); HashedSequence<S> hb = p.getB(); p = null; EditList res = new EditList(); Edit region = new Edit(0, a.size(), 0, b.size()); diffNonCommon(res, hc, ha, hb, region); return res; }
@Override public int size() { return base.size(); } }
/** {@inheritDoc} */ @Override public int size() { return base.size(); } }
MergeResult<S> result = new MergeResult<>(sequences); if (ours.size() == 0) { if (theirs.size() != 0) { EditList theirsEdits = diffAlg.diff(cmp, base, theirs); if (!theirsEdits.isEmpty()) { result.add(2, 0, theirs.size(), ConflictState.NEXT_CONFLICTING_RANGE); } else } else if (theirs.size() == 0) { EditList oursEdits = diffAlg.diff(cmp, base, ours); if (!oursEdits.isEmpty()) { result.add(1, 0, ours.size(), ConflictState.FIRST_CONFLICTING_RANGE); result.add(2, 0, 0, ConflictState.NEXT_CONFLICTING_RANGE); if (current < base.size()) { result.add(0, current, base.size(), ConflictState.NO_CONFLICT);
private HashedSequence<S> wrap(S base) { final int end = base.size(); final int[] hashes = new int[end]; for (int ptr = 0; ptr < end; ptr++) hashes[ptr] = cmp.hash(base, ptr); return new HashedSequence<S>(base, hashes); } }
private HashedSequence<S> wrap(S base) { final int end = base.size(); final int[] hashes = new int[end]; for (int ptr = 0; ptr < end; ptr++) hashes[ptr] = cmp.hash(base, ptr); return new HashedSequence<>(base, hashes); } }
@Override public <S extends Sequence> EditList diffNonCommon( SequenceComparator<? super S> cmp, S a, S b) { HashedSequencePair<S> p = new HashedSequencePair<S>(cmp, a, b); HashedSequenceComparator<S> hc = p.getComparator(); HashedSequence<S> ha = p.getA(); HashedSequence<S> hb = p.getB(); p = null; EditList res = new EditList(); Edit region = new Edit(0, a.size(), 0, b.size()); diffNonCommon(res, hc, ha, hb, region); return res; }
/** {@inheritDoc} */ @Override public <S extends Sequence> EditList diffNonCommon( SequenceComparator<? super S> cmp, S a, S b) { HashedSequencePair<S> p = new HashedSequencePair<>(cmp, a, b); HashedSequenceComparator<S> hc = p.getComparator(); HashedSequence<S> ha = p.getA(); HashedSequence<S> hb = p.getB(); p = null; EditList res = new EditList(); Edit region = new Edit(0, a.size(), 0, b.size()); diffNonCommon(res, hc, ha, hb, region); return res; }
MergeResult<S> result = new MergeResult<>(sequences); if (ours.size() == 0) { if (theirs.size() != 0) { EditList theirsEdits = diffAlg.diff(cmp, base, theirs); if (!theirsEdits.isEmpty()) { result.add(2, 0, theirs.size(), ConflictState.NEXT_CONFLICTING_RANGE); } else } else if (theirs.size() == 0) { EditList oursEdits = diffAlg.diff(cmp, base, ours); if (!oursEdits.isEmpty()) { result.add(1, 0, ours.size(), ConflictState.FIRST_CONFLICTING_RANGE); result.add(2, 0, 0, ConflictState.NEXT_CONFLICTING_RANGE); if (current < base.size()) { result.add(0, current, base.size(), ConflictState.NO_CONFLICT);
MergeResult<S> result = new MergeResult<S>(sequences); if (ours.size() == 0) { if (theirs.size() != 0) { EditList theirsEdits = diffAlg.diff(cmp, base, theirs); if (!theirsEdits.isEmpty()) { result.add(2, 0, theirs.size(), ConflictState.NEXT_CONFLICTING_RANGE); } else } else if (theirs.size() == 0) { EditList oursEdits = diffAlg.diff(cmp, base, ours); if (!oursEdits.isEmpty()) { result.add(1, 0, ours.size(), ConflictState.FIRST_CONFLICTING_RANGE); result.add(2, 0, 0, ConflictState.NEXT_CONFLICTING_RANGE); if (current < base.size()) { result.add(0, current, base.size(), ConflictState.NO_CONFLICT);
while (last.endB < b.size() && cmp.equals(b, last.beginB, b, last.endB)) { last.beginA++;