blob: 2929d5702409aa0b531feae5d098aa4aa8b4eb9a (
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
|
/*******************************************************************************
* 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.ide.ui.internal.structuremergeviewer.handler;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceSource;
/**
* Handler that manages a merge of all non-conflicting differences in case of one side of the comparison is
* not editable.
*
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
* @since 3.0
*/
public class AcceptAllChanges extends AbstractAcceptRejectAllChanges {
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.handler.AbstractAcceptRejectAllChanges#isCopyDiffCase(org.eclipse.emf.compare.Diff,
* boolean)
*/
@Override
protected boolean isCopyDiffCase(Diff diff, boolean leftToRight) {
if (leftToRight) {
return fromSide(DifferenceSource.LEFT).apply(diff);
} else {
return fromSide(DifferenceSource.RIGHT).apply(diff);
}
}
}
|
