blob: bfce0d6ad78ac05fda4e51cd2630a920b1235a5e (
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
70
71
72
73
74
75
76
77
78
79
80
81
|
/*
* Copyright (c) 2015, 2016, 2018-2020 Eike Stepper (Loehne, 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.explorer.ui.checkouts;
import org.eclipse.emf.cdo.explorer.ui.bundle.OM;
import org.eclipse.emf.cdo.internal.ui.InteractiveConflictHandlerSelector;
import org.eclipse.emf.cdo.transaction.CDOTransaction;
import org.eclipse.emf.cdo.ui.CDOEditorOpener;
import org.eclipse.emf.cdo.ui.CDOEditorUtil;
import org.eclipse.emf.internal.cdo.transaction.CDOHandlingConflictResolver;
import org.eclipse.net4j.util.om.OMPlatform;
import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.spi.cdo.CDOMergingConflictResolver;
import org.eclipse.ui.IEditorPart;
import org.eclipse.ui.IWorkbenchPage;
import org.eclipse.ui.PartInitException;
/**
* @author Eike Stepper
*/
public class CDOModelEditorOpener extends CDOEditorOpener.Default
{
private static final boolean INTERACTIVE_CONFLICT_RESOLUTION = OMPlatform.INSTANCE.isProperty("cdo.interactive.conflict.resolution", true);
public CDOModelEditorOpener()
{
}
@Override
protected IEditorPart doOpenEditor(IWorkbenchPage page, URI uri)
{
CDOModelEditorInput editorInput = new CDOModelEditorInput(uri);
String editorID = CDOEditorUtil.getEditorID();
try
{
return page.openEditor(editorInput, editorID);
}
catch (PartInitException ex)
{
OM.LOG.error(ex);
return null;
}
}
/**
* @deprecated As of 4.6 no longer supported in favor of CDOCheckoutEditorInput.configureTransaction().
*/
@Deprecated
protected void configureTransaction(CDOTransaction transaction)
{
addConflictResolver(transaction);
}
public static void addConflictResolver(CDOTransaction transaction)
{
if (INTERACTIVE_CONFLICT_RESOLUTION)
{
CDOHandlingConflictResolver conflictResolver = new CDOHandlingConflictResolver();
conflictResolver.setConflictHandlerSelector(new InteractiveConflictHandlerSelector());
transaction.options().addConflictResolver(conflictResolver);
}
else
{
transaction.options().addConflictResolver(new CDOMergingConflictResolver());
}
}
}
|