blob: 8b49d35cfb42f621a7e6f380a8dab66a9aeb4d13 (
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
|
/*******************************************************************************
* Copyright (c) 2006, 2012 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.diff.internal.merge.impl;
import org.eclipse.emf.compare.diff.merge.DefaultMerger;
/**
* Merger for an {@link DiffExtension} operation.<br/>
*
* @author <a href="mailto:cedric.brun@obeo.fr">Cedric Brun</a>
*/
public class DiffExtensionMerger extends DefaultMerger {
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.diff.merge.api.AbstractMerger#doApplyInOrigin()
*/
@Override
public void doApplyInOrigin() {
// TODO code diff extension merger
// final AbstractDiffExtension extension = (AbstractDiffExtension)this.diff;
// if (!extension.providesMerger()) {
// /*
// * No merger is provided so we'll browse the hidden elements and merge them..
// */
// for (final Iterator<DiffElement> iterator = extension.getHideElements().iterator();
// iterator.hasNext(); ) {
// final DiffElement hidden = iterator.next();
// final AbstractMerger merger = MergeFactory.createMerger(hidden);
// merger.applyInOrigin();
// }
// } else {
// extension.getMerger().applyInOrigin();
// }
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.diff.merge.api.AbstractMerger#doUndoInTarget()
*/
@Override
public void doUndoInTarget() {
// TODO code diff extension merger
// final AbstractDiffExtension extension = (AbstractDiffExtension)this.diff;
// if (!extension.providesMerger()) {
// /*
// * No merger is provided so we'll browse the hidden elements and merge them..
// */
// for (final Iterator<DiffElement> iterator = extension.getHideElements().iterator();
// iterator.hasNext(); ) {
// final DiffElement hidden = iterator.next();
// final AbstractMerger merger = MergeFactory.createMerger(hidden);
// merger.undoInTarget();
// }
// } else {
// extension.getMerger().undoInTarget();
// }
}
}
|
