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 |
|---|---|
static int |
CONFLICT
Indicates that a change conflict prevented the merge from successful completion (value
1) |
static int |
INTERNAL_ERROR
Status code describing an internal error (value
2) |
static int |
OK
Indicates the successful completion of the merge operation (value
IStatus.OK) |
| Modifier and Type | Method and Description |
|---|---|
IStatus |
merge(OutputStream output,
String outputEncoding,
InputStream ancestor,
String ancestorEncoding,
InputStream target,
String targetEncoding,
InputStream other,
String otherEncoding,
IProgressMonitor monitor)
Performs a merge operation on the given input streams and writes the merge result to the output stream.
|
static final int OK
IStatus.OK)static final int CONFLICT
1)static final int INTERNAL_ERROR
2)IStatus merge(OutputStream output, String outputEncoding, InputStream ancestor, String ancestorEncoding, InputStream target, String targetEncoding, InputStream other, String otherEncoding, IProgressMonitor monitor)
IStatus.OK is 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 streamoutputEncoding - the encoding to use when writing to the output streamancestor - the byte stream from which the common ancestor is readancestorEncoding - the encoding of the ancestor input byte streamtarget - the byte stream containing the target of the mergetargetEncoding - the encoding of the target input byte streamother - the byte stream containing the target of the mergeotherEncoding - the encoding of the other input byte streammonitor - reports progress of the merge operationGuidelines for using Eclipse APIs. Copyright (c) IBM Corp. and others 2000, 2006. All rights reserved.