Skip to main content
summaryrefslogtreecommitdiffstats
blob: 90af61a4049b7a9f54d39111bb74598abe99206a (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
/*******************************************************************************
 * Copyright (c) 2004 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials 
 * are made available under the terms of the Common Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/cpl-v10.html
 * 
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.compare;

import java.io.InputStream;
import java.io.OutputStream;

import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;

/**
 * This interface defines a single operation for performing a three-way merge on three
 * input streams. The merged result is written to an output stream.
 * <p>
 * Clients must implement this interface when contributing new mergers to the
 * <code>org.eclipse.compare.streamMergers</code> extension point.
 * </p>
 * 
 * @see org.eclipse.compare.internal.merge.TextStreamMerger
 * 
 * @since 3.0
 */
public interface IStreamMerger {

    /**
     * Indicates the successful completion of the merge operation (value <code>IStatus.OK</code>)
     */
    public static final int OK= IStatus.OK;
    
    /**
     * Indicates that a change conflict prevented the merge from successful completion (value <code>1</code>)
     */
    public static final int CONFLICT= 1;
    
    /**
     * Status code describing an internal error (value <code>2</code>)
     */
   public static final int INTERNAL_ERROR= 2;
	
    /**
     * Performs a merge operation on the given input streams and writes the merge result to the output stream.
     * On success a status <code>IStatus.OK</code> is returned, on error a status <code>IStatus.ERROR</code>. 
     * If the merge operation cannot deal with conflicts, the code of the error status has the value <code>IStreamMerger.CONFLICT</code>.
     * For text oriented mergers the encoding for the input and output streams is honored.
     * 
     * @param output the byte stream to which the merge result is written; the merger will not close the stream
     * @param outputEncoding the encoding to use when writing to the output stream
     * @param ancestor the byte stream from which the common ancestor is read
     * @param ancestorEncoding the encoding of the ancestor input byte stream
     * @param target the byte stream containing the target of the merge
     * @param targetEncoding the encoding of the target input byte stream
     * @param other the byte stream containing the target of the merge
     * @param otherEncoding the encoding of the other input byte stream
     * @param monitor reports progress of the merge operation
     * @return returns an ISta
     */
	IStatus merge(OutputStream output, String outputEncoding,
			InputStream ancestor, String ancestorEncoding,
			InputStream target, String targetEncoding,
			InputStream other, String otherEncoding,
	        	IProgressMonitor monitor);
}

Back to the top