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
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
|
/*******************************************************************************
* Copyright (c) 2013 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.ide.ui.internal.structuremergeviewer.actions.util;
import static com.google.common.collect.Iterables.addAll;
import static com.google.common.collect.Iterables.filter;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableList;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.CompareNavigator;
import org.eclipse.compare.ICompareNavigator;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Conflict;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.DifferenceSource;
import org.eclipse.emf.compare.DifferenceState;
import org.eclipse.emf.compare.domain.ICompareEditingDomain;
import org.eclipse.emf.compare.internal.merge.DiffMergeDataAdapter;
import org.eclipse.emf.compare.internal.merge.IDiffMergeData;
import org.eclipse.emf.compare.internal.utils.DiffUtil;
import org.eclipse.emf.compare.rcp.EMFCompareRCPPlugin;
import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareConstants;
import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.IDifferenceFilter;
import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.filters.impl.CascadingDifferencesFilter;
import org.eclipse.emf.compare.utils.EMFComparePredicates;
import org.eclipse.emf.ecore.util.EcoreUtil;
/**
* Util class that provides utilities methods for IDE UI actions.
*
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
* @since 3.0
*/
public final class EMFCompareUIActionUtil {
/**
* Utility classes don't need a default constructor.
*/
private EMFCompareUIActionUtil() {
// Hides default constructor.
}
/**
* Checks the state of the cascading differences filter.
*
* @param configuration
* the compare configuration object.
* @return true, if the cascading differences filter is active, false otherwise.
*/
public static boolean isCascadingDifferencesFilterActive(CompareConfiguration configuration) {
Object property = configuration.getProperty(EMFCompareConstants.SELECTED_FILTERS);
final Collection<IDifferenceFilter> selectedFilters;
if (property != null) {
selectedFilters = (Collection<IDifferenceFilter>)property;
for (IDifferenceFilter iDifferenceFilter : selectedFilters) {
if (iDifferenceFilter instanceof CascadingDifferencesFilter) {
return true;
}
}
}
return false;
}
/**
* Copy the given diff.
*
* @param diffToCopy
* the given diff to copy.
* @param leftToRight
* the way of merge.
* @param configuration
* the compare configuration object.
*/
public static void copyDiff(Diff diffToCopy, boolean leftToRight, CompareConfiguration configuration) {
if (diffToCopy != null) {
List<Diff> diffsToCopy = new ArrayList<Diff>();
diffsToCopy.add(diffToCopy);
// Add merge data for required diffs
for (Diff require : DiffUtil.getRequires(diffToCopy, leftToRight)) {
EMFCompareUIActionUtil.setMergeDataForDiff(require, leftToRight, configuration
.isLeftEditable(), configuration.isRightEditable());
}
if (EMFCompareUIActionUtil.isCascadingDifferencesFilterActive(configuration)) {
addAll(diffsToCopy, org.eclipse.emf.compare.utils.DiffUtil.getSubDiffs(leftToRight).apply(
diffToCopy));
}
// Add merge data for subs diffs
for (Diff diff : diffsToCopy) {
EMFCompareUIActionUtil.setMergeDataForDiff(diff, leftToRight, configuration.isLeftEditable(),
configuration.isRightEditable());
}
// Add merge data for diffs in conflicts
addMergeDataForConflictedDiffs(diffToCopy, leftToRight, configuration);
// Execute merge
ICompareEditingDomain editingDomain = (ICompareEditingDomain)configuration
.getProperty(EMFCompareConstants.EDITING_DOMAIN);
Command copyCommand = editingDomain.createCopyCommand(diffsToCopy, leftToRight,
EMFCompareRCPPlugin.getDefault().getMergerRegistry());
editingDomain.getCommandStack().execute(copyCommand);
}
}
/**
* Add merge data for diffs in conflict with the given diff.
*
* @param diffToCopy
* the given diff.
* @param leftToRight
* the way of merge.
* @param configuration
* the compare configuration object.
*/
private static void addMergeDataForConflictedDiffs(Diff diffToCopy, boolean leftToRight,
CompareConfiguration configuration) {
Conflict conflict = diffToCopy.getConflict();
if (conflict != null) {
for (Diff conflictedDiff : conflict.getDifferences()) {
if (diffToCopy != conflictedDiff) {
if (diffToCopy.getKind() != DifferenceKind.MOVE
&& ((diffToCopy.getSource() == DifferenceSource.LEFT && conflictedDiff
.getSource() == DifferenceSource.RIGHT) || (diffToCopy.getSource() == DifferenceSource.RIGHT && conflictedDiff
.getSource() == DifferenceSource.LEFT))) {
EMFCompareUIActionUtil.setMergeDataForDiff(conflictedDiff, leftToRight, configuration
.isLeftEditable(), configuration.isRightEditable());
}
}
}
}
}
/**
* Copy all non-conflicting changes.
*
* @param leftToRight
* the way of merge.
* @param configuration
* the compare configuration object.
*/
public static void copyAllDiffs(final boolean leftToRight, CompareConfiguration configuration) {
final List<Diff> differences;
Comparison comparison = (Comparison)configuration.getProperty(EMFCompareConstants.COMPARE_RESULT);
if (comparison.isThreeWay()) {
differences = ImmutableList.copyOf(filter(comparison.getDifferences(), new Predicate<Diff>() {
public boolean apply(Diff diff) {
final boolean unresolved = diff.getState() == DifferenceState.UNRESOLVED;
final boolean nonConflictual = diff.getConflict() == null;
final boolean fromLeftToRight = leftToRight && diff.getSource() == DifferenceSource.LEFT;
final boolean fromRightToLeft = !leftToRight
&& diff.getSource() == DifferenceSource.RIGHT;
return unresolved && nonConflictual && (fromLeftToRight || fromRightToLeft);
}
}));
} else {
differences = ImmutableList.copyOf(filter(comparison.getDifferences(), EMFComparePredicates
.hasState(DifferenceState.UNRESOLVED)));
}
if (differences.size() > 0) {
for (Diff diff : differences) {
EMFCompareUIActionUtil.setMergeDataForDiff(diff, leftToRight, configuration.isLeftEditable(),
configuration.isRightEditable());
}
ICompareEditingDomain editingDomain = (ICompareEditingDomain)configuration
.getProperty(EMFCompareConstants.EDITING_DOMAIN);
final Command copyCommand = editingDomain.createCopyCommand(differences, leftToRight,
EMFCompareRCPPlugin.getDefault().getMergerRegistry());
editingDomain.getCommandStack().execute(copyCommand);
}
}
/**
* Called by the framework to navigate to the next (or previous) difference. This will open the content
* viewer for the next (or previous) diff displayed in the structure viewer.
*
* @param next
* <code>true</code> if we are to open the next structure viewer's diff, <code>false</code> if
* we should go to the previous instead.
* @param configuration
* the compare configuration object.
*/
public static void navigate(boolean next, CompareConfiguration configuration) {
final ICompareNavigator navigator = configuration.getContainer().getNavigator();
if (navigator instanceof CompareNavigator && ((CompareNavigator)navigator).hasChange(next)) {
navigator.selectChange(next);
}
}
/**
* Set the merge way for the given diff. After a merge, it allows to know the way of the merge.
*
* @param diff
* the given diff.
* @param leftToRight
* the way of the merge.
* @param leftEditable
* the left side of the difference is editable.
* @param rightEditable
* the right side of the difference is editable.
*/
public static void setMergeDataForDiff(Diff diff, boolean leftToRight, boolean leftEditable,
boolean rightEditable) {
Adapter adapter = EcoreUtil.getExistingAdapter(diff, IDiffMergeData.class);
if (adapter != null) {
((IDiffMergeData)adapter).setMergedTo(leftToRight);
((IDiffMergeData)adapter).setLeftEditable(leftEditable);
((IDiffMergeData)adapter).setRightEditable(rightEditable);
} else {
diff.eAdapters().add(new DiffMergeDataAdapter(leftToRight, leftEditable, rightEditable));
}
}
}
|
