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
122
123
124
125
126
127
128
129
130
131
|
/*******************************************************************************
* Copyright (c) 2006, 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 org.eclipse.core.commands.ExecutionEvent;
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.MultiRule;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.core.diff.*;
import org.eclipse.team.core.mapping.IMergeContext;
import org.eclipse.team.internal.ui.TeamUIMessages;
import org.eclipse.team.ui.mapping.SynchronizationOperation;
import org.eclipse.team.ui.synchronize.ISynchronizePageConfiguration;
public class ResourceMarkAsMergedHandler extends ResourceMergeActionHandler {
private ResourceModelProviderOperation operation;
public ResourceMarkAsMergedHandler(ISynchronizePageConfiguration configuration) {
super(configuration);
}
@Override
protected synchronized SynchronizationOperation getOperation() {
if (operation == null) {
operation = new ResourceModelProviderOperation(getConfiguration(),
getStructuredSelection()) {
@Override
public void execute(IProgressMonitor monitor)
throws InvocationTargetException, InterruptedException {
try {
final IMergeContext context = (IMergeContext) getContext();
final IDiff[] deltas = getTargetDiffs();
ISchedulingRule rule = getMergeRule(context, deltas);
context.run(monitor1 -> markAsMerged(deltas, context, monitor1), rule, IResource.NONE, monitor);
} catch (CoreException e) {
throw new InvocationTargetException(e);
}
}
private ISchedulingRule getMergeRule(IMergeContext context,
IDiff[] deltas) {
ISchedulingRule result = null;
for (int i = 0; i < deltas.length; i++) {
IDiff node = deltas[i];
ISchedulingRule rule = context.getMergeRule(node);
if (result == null) {
result = rule;
} else {
result = MultiRule.combine(result, rule);
}
}
return result;
}
private void markAsMerged(IDiff[] deltas,
final IMergeContext context, IProgressMonitor monitor)
throws CoreException {
context.markAsMerged(deltas, false, monitor);
}
@Override
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 String getJobName() {
IDiff[] diffs = getTargetDiffs();
if (diffs.length == 1)
return TeamUIMessages.ResourceMarkAsMergedHandler_0;
return NLS.bind(TeamUIMessages.ResourceMarkAsMergedHandler_1, new Integer(diffs.length).toString());
}
};
}
return operation;
}
@Override
public void updateEnablement(IStructuredSelection selection) {
synchronized (this) {
operation = null;
}
super.updateEnablement(selection);
int mode = getConfiguration().getMode();
if ((mode == ISynchronizePageConfiguration.OUTGOING_MODE
&& getSynchronizationContext().getDiffTree().countFor(IThreeWayDiff.CONFLICTING, IThreeWayDiff.DIRECTION_MASK) == 0)
|| (getSynchronizationContext().getDiffTree().countFor(IThreeWayDiff.CONFLICTING, IThreeWayDiff.DIRECTION_MASK) == 0
&& getSynchronizationContext().getDiffTree().countFor(IThreeWayDiff.INCOMING, IThreeWayDiff.DIRECTION_MASK) == 0)) {
setEnabled(false);
return;
}
}
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
if (saveDirtyEditors())
return super.execute(event);
return null;
}
}
|
