blob: 1251dc8a82722998ccc1bd7ddf26291568dc07b2 (
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
|
/*
* Copyright (c) 2015 Eike Stepper (Berlin, Germany) and others.
* 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:
* Eike Stepper - initial API and implementation
*/
package org.eclipse.emf.cdo.ui.internal.compare;
import org.eclipse.emf.cdo.common.commit.CDOChangeSet;
import org.eclipse.emf.cdo.common.commit.CDOChangeSetData;
import org.eclipse.emf.cdo.common.id.CDOID;
import org.eclipse.emf.cdo.transaction.CDOMerger2;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.ui.compare.CDOCompareEditorUtil;
import org.eclipse.emf.cdo.view.CDOView;
import java.util.Set;
/**
* @author Eike Stepper
*/
public class CompareCDOMerger implements CDOMerger2
{
public CompareCDOMerger()
{
}
@Deprecated
public CDOChangeSetData merge(CDOChangeSet target, CDOChangeSet source) throws UnsupportedOperationException
{
throw new UnsupportedOperationException();
}
public void merge(final CDOTransaction localTransaction, CDOView remoteView, Set<CDOID> affectedIDs)
throws ConflictException
{
CDOCompareEditorUtil.closeTransactionAfterCommit(localTransaction);
CDOCompareEditorUtil.closeEditorWithTransaction(localTransaction);
CDOCompareEditorUtil.openEditor(remoteView, localTransaction, affectedIDs, true);
}
}
|
