- Add the Codota plugin to your IDE and get smart completions
private void myMethod () {Gson g =
new Gson()
- Smart code suggestions by Tabnine
}
private int createConflict(OutputStream result, QSequenceDifferenceBlock localStart, QSequenceDifferenceBlock localEnd, QSequenceDifferenceBlock latestStart, QSequenceDifferenceBlock latestEnd, QSequenceLineCache localLines, QSequenceLineCache latestLines, int baseLineIndex, List transformedLocalLines) throws IOException { final int minBaseFrom = Math.min(localStart.getLeftFrom(), latestStart.getLeftFrom()); final int maxBaseTo = Math.max(localEnd.getLeftTo(), latestEnd.getLeftTo()); appendTransformedLocalLines(baseLineIndex, minBaseFrom, transformedLocalLines, result); final int localFrom = Math.max(0, localStart.getRightFrom() - (localStart.getLeftFrom() - minBaseFrom)); final int localTo = Math.min(localLines.getLineCount() - 1, localEnd.getRightTo() + (maxBaseTo - localEnd.getLeftTo())); final int latestFrom = Math.max(0, latestStart.getRightFrom() - (latestStart.getLeftFrom() - minBaseFrom)); final int latestTo = Math.min(latestLines.getLineCount() - 1, latestEnd.getRightTo() + (maxBaseTo - latestEnd.getLeftTo())); writeBytesAndEol(result, myConflictStart); for (int index = localFrom; index <= localTo; index++) { writeLine(result, localLines.getLine(index)); } writeBytesAndEol(result, myConflictSeparator); for (int index = latestFrom; index <= latestTo; index++) { writeLine(result, latestLines.getLine(index)); } writeBytesAndEol(result, myConflictEnd); return maxBaseTo; }
private int createConflict(OutputStream result, QSequenceDifferenceBlock localStart, QSequenceDifferenceBlock localEnd, QSequenceDifferenceBlock latestStart, QSequenceDifferenceBlock latestEnd, QSequenceLineCache localLines, QSequenceLineCache latestLines, int baseLineIndex, List transformedLocalLines) throws IOException { final int minBaseFrom = Math.min(localStart.getLeftFrom(), latestStart.getLeftFrom()); final int maxBaseTo = Math.max(localEnd.getLeftTo(), latestEnd.getLeftTo()); appendTransformedLocalLines(baseLineIndex, minBaseFrom, transformedLocalLines, result); final int localFrom = Math.max(0, localStart.getRightFrom() - (localStart.getLeftFrom() - minBaseFrom)); final int localTo = Math.min(localLines.getLineCount() - 1, localEnd.getRightTo() + (maxBaseTo - localEnd.getLeftTo())); final int latestFrom = Math.max(0, latestStart.getRightFrom() - (latestStart.getLeftFrom() - minBaseFrom)); final int latestTo = Math.min(latestLines.getLineCount() - 1, latestEnd.getRightTo() + (maxBaseTo - latestEnd.getLeftTo())); writeBytesAndEol(result, myConflictStart); for (int index = localFrom; index <= localTo; index++) { writeLine(result, localLines.getLine(index)); } writeBytesAndEol(result, myConflictSeparator); for (int index = latestFrom; index <= latestTo; index++) { writeLine(result, latestLines.getLine(index)); } writeBytesAndEol(result, myConflictEnd); return maxBaseTo; }
writeBytesAndEol(result, myConflictStart); writeBytesAndEol(result, myOriginalMarker); writeBytesAndEol(result, myConflictSeparator); writeBytesAndEol(result, myConflictEnd);
private int createConflict(OutputStream result, QSequenceDifferenceBlock localStart, QSequenceDifferenceBlock localEnd, QSequenceDifferenceBlock latestStart, QSequenceDifferenceBlock latestEnd, QSequenceLineCache localLines, QSequenceLineCache latestLines, int baseLineIndex, List transformedLocalLines) throws IOException { final int minBaseFrom = Math.min(localStart.getLeftFrom(), latestStart.getLeftFrom()); final int maxBaseTo = Math.max(localEnd.getLeftTo(), latestEnd.getLeftTo()); appendTransformedLocalLines(baseLineIndex, minBaseFrom, transformedLocalLines, result); final int localFrom = Math.max(0, localStart.getRightFrom() - (localStart.getLeftFrom() - minBaseFrom)); final int localTo = Math.min(localLines.getLineCount() - 1, localEnd.getRightTo() + (maxBaseTo - localEnd.getLeftTo())); final int latestFrom = Math.max(0, latestStart.getRightFrom() - (latestStart.getLeftFrom() - minBaseFrom)); final int latestTo = Math.min(latestLines.getLineCount() - 1, latestEnd.getRightTo() + (maxBaseTo - latestEnd.getLeftTo())); writeBytesAndEol(result, myConflictStart); for (int index = localFrom; index <= localTo; index++) { writeLine(result, localLines.getLine(index)); } writeBytesAndEol(result, myConflictSeparator); for (int index = latestFrom; index <= latestTo; index++) { writeLine(result, latestLines.getLine(index)); } writeBytesAndEol(result, myConflictEnd); return maxBaseTo; }
writeBytesAndEol(result, localContext.getBytes()); originalContext = " (" + originalStartFrom + ")"; writeBytesAndEol(result, originalContext.getBytes()); writeBytesAndEol(result, myConflictSeparator); writeBytesAndEol(result, latestContext.getBytes());