blob: fe2213660e25a41e4f77f058b27d05af28d4acd2 (
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
|
/*******************************************************************************
* Copyright (c) 2013 Obeo.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
* http://www.eclipse.org/legal/epl-v10.html
*
* Contributors:
* Obeo - initial API and implementation
*******************************************************************************/
package org.eclipse.emf.compare.domain;
import java.util.List;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.merge.IMerger.Registry;
/**
* Interface for executing merge commands from the {@link ICompareEditingDomain}.
*
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
*/
public interface IMergeRunnable {
/**
* Execute the merge operation.
*
* @param differences
* the differences to merge.
* @param leftToRight
* whether the merge has to be merge from left to right or right to left.
* @param mergerRegistry
* the merger registry to query to get the appropriate mergers for each difference to be
* merged.
*/
void merge(List<? extends Diff> differences, boolean leftToRight, Registry mergerRegistry);
}
|
