switch (rd.kind()) { case RangeDifference.ANCESTOR: // pseudo conflict case RangeDifference.NOCHANGE:
switch (rd.kind()) { case RangeDifference.ANCESTOR: // pseudo conflict case RangeDifference.NOCHANGE:
switch (rd.kind()) { case RangeDifference.ANCESTOR: // pseudo conflict case RangeDifference.NOCHANGE:
switch (rd.kind()) { case RangeDifference.ANCESTOR: // pseudo conflict case RangeDifference.NOCHANGE:
private List<RangeDifference> preProcess(RangeDifference[] differences, int span) { List<RangeDifference> newRanges = new LinkedList<RangeDifference>(); for (int i = 0; i < differences.length; i++) { int leftStart = differences[i].leftStart(); int leftEnd = differences[i].leftEnd(); int rightStart = differences[i].rightStart(); int rightEnd = differences[i].rightEnd(); int kind = differences[i].kind(); while (i + 1 < differences.length && differences[i + 1].kind() == kind && differences[i + 1].leftStart() <= leftEnd + span && differences[i + 1].rightStart() <= rightEnd + span) { leftEnd = differences[i + 1].leftEnd(); rightEnd = differences[i + 1].rightEnd(); i++; } newRanges.add(new RangeDifference(kind, rightStart, rightEnd - rightStart, leftStart, leftEnd - leftStart)); } return newRanges; }
int start= ((JavaTokenComparator)leftSide).getTokenStart(curr.leftStart()); int end= ((JavaTokenComparator)leftSide).getTokenStart(curr.leftEnd()); if (curr.kind() == RangeDifference.CHANGE && curr.leftLength() > 0) { buf.append("<b>"); //$NON-NLS-1$ appendContent(previewContent, start, end, buf, false); buf.append("</b>"); //$NON-NLS-1$ } else if (curr.kind() == RangeDifference.NOCHANGE) { appendContent(previewContent, start, end, buf, true);
for (int i= 0; i < differences.length; i++) { RangeDifference curr= differences[i]; if (curr.kind() == RangeDifference.CHANGE && curr.rightLength() > 0) { int startLine= curr.rightStart(); int endLine= curr.rightEnd() - 1;
for (int i= 0; i < differences.length; i++) { RangeDifference curr= differences[i]; if (curr.kind() == RangeDifference.CHANGE && curr.rightLength() > 0) { int startLine= curr.rightStart(); int endLine= curr.rightEnd() - 1;
private List<RangeDifference> preProcess(RangeDifference[] differences) { List<RangeDifference> newRanges = new LinkedList<RangeDifference>(); for (int i = 0; i < differences.length; i++) { int ancestorStart = differences[i].ancestorStart(); int ancestorEnd = differences[i].ancestorEnd(); int leftStart = differences[i].leftStart(); int leftEnd = differences[i].leftEnd(); int rightStart = differences[i].rightStart(); int rightEnd = differences[i].rightEnd(); int kind = differences[i].kind(); int ancestorLength = ancestorEnd - ancestorStart; int leftLength = leftEnd - leftStart; int rightLength = rightEnd - rightStart; while (i + 1 < differences.length && differences[i + 1].kind() == kind && score(leftLength, differences[i + 1].leftLength(), rightLength, differences[i + 1].rightLength()) > (differences[i + 1] .leftStart() - leftEnd)) { leftEnd = differences[i + 1].leftEnd(); rightEnd = differences[i + 1].rightEnd(); ancestorEnd = differences[i + 1].ancestorEnd(); leftLength = leftEnd - leftStart; rightLength = rightEnd - rightStart; ancestorLength = ancestorEnd - ancestorStart; i++; } newRanges.add(new RangeDifference(kind, rightStart, rightLength, leftStart, leftLength, ancestorStart, ancestorLength)); } return newRanges; }
for (int i = 0; i < ranges.length; i++) { RangeDifference diff = ranges[i]; if (diff.kind() == RangeDifference.NOCHANGE) continue;
RangeDifference es= e[i]; int kind= es.kind();
for (int ii= start; ii < end; ii++) { es= r[ii]; if (useChange(es.kind())) { first= es; break; for (int ii= end-1; ii >= start; ii--) { es= r[ii]; if (useChange(es.kind())) { last= es; break; Diff diff= new Diff(baseDiff, first.kind(), ancestorDoc, null, ancestorStart2, ancestorEnd2, leftDoc, null, leftStart2, leftEnd2,
for (int ii= start; ii < end; ii++) { es= r[ii]; if (useChange(es.kind())) { first= es; break; for (int ii= end-1; ii >= start; ii--) { es= r[ii]; if (useChange(es.kind())) { last= es; break; Diff diff= new Diff(baseDiff, first.kind(), ancestorDoc, null, ancestorStart2, ancestorEnd2, leftDoc, null, leftStart2, leftEnd2,
for (int i= 0; i < e.length; i++) { RangeDifference es= e[i]; int kind= es.kind(); if (kind != RangeDifference.NOCHANGE) {
for (int i= 0; i < e.length; i++) { RangeDifference es= e[i]; int kind= es.kind(); if (kind != RangeDifference.NOCHANGE) {
RangeDifference es= e[i]; int kind= es.kind();
for (RangeDifference d : pdifferences) { int tempKind = d.kind(); if (tempKind == RangeDifference.ANCESTOR) {