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
231
232
233
234
235
236
237
238
239
240
241
|
/*******************************************************************************
* Copyright (c) 2013, 2014 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.rcp.ui.internal.structuremergeviewer.groups.impl;
import static com.google.common.base.Predicates.and;
import static com.google.common.base.Predicates.not;
import static com.google.common.base.Predicates.or;
import static com.google.common.collect.Collections2.filter;
import static com.google.common.collect.Lists.newArrayList;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.CONTAINMENT_REFERENCE_CHANGE;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.ofKind;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import java.util.Collection;
import java.util.List;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceKind;
import org.eclipse.emf.compare.Match;
import org.eclipse.emf.compare.MatchResource;
import org.eclipse.emf.compare.ReferenceChange;
import org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.AbstractDifferenceGroupProvider;
import org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroup;
import org.eclipse.emf.compare.scope.IComparisonScope;
import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
import org.eclipse.emf.edit.tree.TreeNode;
/**
* This implementation of a
* {@link org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider} will be used to
* group the differences by their Resource.
*
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
* @since 4.0
*/
public class ByResourceGroupProvider extends AbstractDifferenceGroupProvider {
/** The initial activation state of the group provider. */
private boolean activeByDefault;
/** The unique group provided by this provider. */
private IDifferenceGroup group;
/** The comparison object. */
private Comparison comp;
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#getGroups(org.eclipse.emf.compare.Comparison)
*/
public Collection<? extends IDifferenceGroup> getGroups(Comparison comparison) {
if (group == null || !comparison.equals(comp)) {
dispose();
this.comp = comparison;
group = new ResourceGroup(comparison, getCrossReferenceAdapter());
}
return ImmutableList.of(group);
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#isEnabled(org
* .eclipse.emf.compare.scope.IComparisonScope, org.eclipse.emf.compare.Comparison)
*/
public boolean isEnabled(IComparisonScope scope, Comparison comparison) {
return true;
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#dispose()
*/
public void dispose() {
this.comp = null;
if (this.group != null) {
this.group.dispose();
this.group = null;
}
}
/**
* Specialized {@link BasicDifferenceGroupImpl} for Resources.
*
* @author <a href="mailto:mikael.barbero@obeo.fr">Mikael Barbero</a>
*/
public static class ResourceGroup extends BasicDifferenceGroupImpl {
/**
* {@inheritDoc}.
*
* @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl.BasicDifferenceGroupImpl#BasicDifferenceGroupImpl(org.eclipse.emf.compare.Comparison)
*/
public ResourceGroup(Comparison comparison, ECrossReferenceAdapter crossReferenceAdapter) {
super(comparison, Predicates.<Diff> alwaysTrue(), crossReferenceAdapter);
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl.BasicDifferenceGroupImpl#getChildren()
*/
@Override
public List<? extends TreeNode> getChildren() {
if (children == null) {
children = newArrayList();
for (MatchResource matchResource : getComparison().getMatchedResources()) {
children.add(buildSubTree(matchResource));
}
registerCrossReferenceAdapter(children);
}
return children;
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl.BasicDifferenceGroupImpl#buildSubTree(org.eclipse.emf.compare.MatchResource)
*/
@Override
protected TreeNode buildSubTree(MatchResource matchResource) {
TreeNode ret = wrap(matchResource);
for (Match match : getComparison().getMatches()) {
ret.getChildren().addAll(buildSubTree(matchResource, match));
}
return ret;
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl.BasicDifferenceGroupImpl#buildSubTree(org.eclipse.emf.compare.MatchResource,
* org.eclipse.emf.compare.Match)
*/
@Override
protected List<TreeNode> buildSubTree(MatchResource matchResource, Match match) {
List<TreeNode> ret = newArrayList();
if (isRootOfResourceURI(match.getLeft(), matchResource.getLeftURI())
|| isRootOfResourceURI(match.getRight(), matchResource.getRightURI())
|| isRootOfResourceURI(match.getOrigin(), matchResource.getOriginURI())) {
ret.addAll(buildSubTree((Match)null, match));
} else {
for (Match subMatch : match.getSubmatches()) {
ret.addAll(buildSubTree(matchResource, subMatch));
}
}
return ret;
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl.BasicDifferenceGroupImpl#buildSubTree(org.eclipse.emf.compare.Match,
* org.eclipse.emf.compare.Match)
*/
@Override
public List<TreeNode> buildSubTree(Match parentMatch, Match match) {
final List<TreeNode> ret = Lists.newArrayList();
boolean isContainment = false;
if (parentMatch != null) {
Collection<Diff> containmentChanges = filter(parentMatch.getDifferences(),
containmentReferenceForMatch(match));
if (!containmentChanges.isEmpty()) {
isContainment = true;
for (Diff diff : containmentChanges) {
ret.add(wrap(diff));
}
}
} else {
Collection<Diff> resourceAttachmentChanges = filter(match.getDifferences(),
resourceAttachmentChange());
if (!resourceAttachmentChanges.isEmpty()) {
for (Diff diff : resourceAttachmentChanges) {
ret.add(wrap(diff));
}
}
}
if (ret.isEmpty() && !matchWithLeftAndRightInDifferentContainer(match)) {
ret.add(wrap(match));
}
Collection<TreeNode> toRemove = Lists.newArrayList();
for (TreeNode treeNode : ret) {
boolean hasDiff = false;
boolean hasNonEmptySubMatch = false;
for (Diff diff : filter(match.getDifferences(), and(filter, not(or(
CONTAINMENT_REFERENCE_CHANGE, resourceAttachmentChange()))))) {
hasDiff = true;
treeNode.getChildren().add(wrap(diff));
}
for (Match subMatch : match.getSubmatches()) {
List<TreeNode> buildSubTree = buildSubTree(match, subMatch);
if (!buildSubTree.isEmpty()) {
hasNonEmptySubMatch = true;
treeNode.getChildren().addAll(buildSubTree);
}
}
for (Diff diff : filter(match.getDifferences(), and(filter, and(CONTAINMENT_REFERENCE_CHANGE,
ofKind(DifferenceKind.MOVE))))) {
if (!containsChildrenWithDataEqualsToDiff(treeNode, diff)) {
TreeNode buildSubTree = buildSubTree(diff);
if (buildSubTree != null) {
hasDiff = true;
treeNode.getChildren().add(buildSubTree);
List<TreeNode> matchSubTree = buildSubTree((Match)null, getComparison().getMatch(
((ReferenceChange)diff).getValue()));
for (TreeNode matchSubTreeNode : matchSubTree) {
buildSubTree.getChildren().addAll(matchSubTreeNode.getChildren());
}
}
}
}
if (!(isContainment || hasDiff || hasNonEmptySubMatch || filter.equals(Predicates
.alwaysTrue()))) {
toRemove.add(treeNode);
}
}
ret.removeAll(toRemove);
return ret;
}
}
}
|
