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
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
|
/*******************************************************************************
* Copyright (c) 2000, 2017 IBM Corporation 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:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.team.internal.ui.mapping;
import java.lang.reflect.InvocationTargetException;
import java.util.Collections;
import org.eclipse.core.commands.*;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.swt.widgets.Event;
import org.eclipse.team.core.diff.*;
import org.eclipse.team.internal.ui.Utils;
import org.eclipse.team.ui.mapping.SaveableComparison;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
import org.eclipse.team.ui.synchronize.ModelParticipantAction;
import org.eclipse.ui.PlatformUI;
/**
* Action that performs an optimistic merge
*/
public class MergeIncomingChangesAction extends ModelParticipantAction implements IHandlerListener {
IHandler handler;
public MergeIncomingChangesAction(ISynchronizePageConfiguration configuration) {
super(null, configuration);
// TODO: We're past the API freeze so we need to access the property by string
handler = (IHandler)configuration.getProperty("org.eclipse.team.ui.mergeAll"); //$NON-NLS-1$
if (handler == null)
handler = new MergeAllActionHandler(configuration);
handler.addHandlerListener(this);
}
@Override
public void runWithEvent(Event event) {
if (handler == null || !handler.isEnabled())
return;
try {
handleTargetSaveableChange();
} catch (InvocationTargetException e) {
handle(e);
return;
} catch (InterruptedException e) {
// Canceled so return
return;
}
try {
handler.execute(new ExecutionEvent(null, Collections.EMPTY_MAP, event, null));
} catch (ExecutionException e) {
handle(e);
}
}
private void handle(Throwable throwable) {
if (throwable instanceof ExecutionException) {
ExecutionException ee = (ExecutionException) throwable;
if (ee.getCause() != null) {
throwable = ee.getCause();
}
}
Utils.handle(throwable);
}
@Override
protected boolean isEnabledForSelection(IStructuredSelection selection) {
return handler.isEnabled();
}
protected FastDiffFilter getDiffFilter() {
return new FastDiffFilter() {
@Override
public boolean select(IDiff node) {
if (node instanceof IThreeWayDiff) {
IThreeWayDiff twd = (IThreeWayDiff) node;
if (twd.getDirection() == IThreeWayDiff.CONFLICTING || twd.getDirection() == IThreeWayDiff.INCOMING) {
return true;
}
}
return false;
}
};
}
@Override
protected void handleTargetSaveableChange() throws InvocationTargetException, InterruptedException {
final SaveableComparison currentBuffer = getActiveSaveable();
if (currentBuffer != null && currentBuffer.isDirty()) {
PlatformUI.getWorkbench().getProgressService().run(true, true, monitor -> {
try {
handleTargetSaveableChange(getConfiguration().getSite().getShell(), null, currentBuffer, true,
monitor);
} catch (CoreException e) {
throw new InvocationTargetException(e);
}
});
}
setActiveSaveable(null);
}
public void dispose() {
handler.dispose();
}
/**
* @param handlerEvent
*/
@Override
public void handlerChanged(HandlerEvent handlerEvent) {
setEnabled(handler.isEnabled());
}
}
|