1 11 package org.eclipse.compare; 12 13 import java.io.InputStream ; 14 import java.io.OutputStream ; 15 16 import org.eclipse.core.runtime.IProgressMonitor; 17 import org.eclipse.core.runtime.IStatus; 18 19 29 public interface IStreamMerger { 30 31 34 public static final int OK= IStatus.OK; 35 36 39 public static final int CONFLICT= 1; 40 41 44 public static final int INTERNAL_ERROR= 2; 45 46 64 IStatus merge(OutputStream output, String outputEncoding, 65 InputStream ancestor, String ancestorEncoding, 66 InputStream target, String targetEncoding, 67 InputStream other, String otherEncoding, 68 IProgressMonitor monitor); 69 } 70 | Popular Tags |