public interface IStreamMerger
Clients must implement this interface when contributing new mergers to the
org.eclipse.compare.streamMergers extension point.
|Modifier and Type||Field and Description|
Indicates that a change conflict prevented the merge from successful completion (value
Status code describing an internal error (value
Indicates the successful completion of the merge operation (value
|Modifier and Type||Method and Description|
Performs a merge operation on the given input streams and writes the merge result to the output stream.
static final int OK
static final int CONFLICT
static final int INTERNAL_ERROR
IStatus merge(OutputStream output, String outputEncoding, InputStream ancestor, String ancestorEncoding, InputStream target, String targetEncoding, InputStream other, String otherEncoding, IProgressMonitor monitor)
IStatus.OKis returned, on error a status
IStatus.ERROR. If the merge operation cannot deal with conflicts, the code of the error status has the value
IStreamMerger.CONFLICT. For text oriented mergers the encoding for the input and output streams is honored. It is the responsibility of callers to close input and output streams.
output- the byte stream to which the merge result is written; the merger will not close the stream
outputEncoding- the encoding to use when writing to the output stream
ancestor- the byte stream from which the common ancestor is read
ancestorEncoding- the encoding of the ancestor input byte stream
target- the byte stream containing the target of the merge
targetEncoding- the encoding of the target input byte stream
other- the byte stream containing the target of the merge
otherEncoding- the encoding of the other input byte stream
monitor- reports progress of the merge operation
Copyright (c) 2000, 2014 Eclipse Contributors and others. All rights reserved.Guidelines for using Eclipse APIs.