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
|
/*******************************************************************************
* Copyright (c) 2013, 2016 Obeo 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:
* Obeo - initial API and implementation
* Stefan Dirix - bug 488941
* Simon Delisle, Edgar Mueller - bug 486923
*******************************************************************************/
package org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl;
import static com.google.common.base.Predicates.and;
import static com.google.common.collect.Iterables.any;
import static com.google.common.collect.Iterators.concat;
import static com.google.common.collect.Iterators.filter;
import static com.google.common.collect.Iterators.transform;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.fromSide;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.hasConflict;
import static org.eclipse.emf.compare.utils.EMFComparePredicates.hasState;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Sets;
import com.google.common.collect.UnmodifiableIterator;
import java.util.Collection;
import java.util.Iterator;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.compare.Comparison;
import org.eclipse.emf.compare.Conflict;
import org.eclipse.emf.compare.ConflictKind;
import org.eclipse.emf.compare.Diff;
import org.eclipse.emf.compare.DifferenceSource;
import org.eclipse.emf.compare.DifferenceState;
import org.eclipse.emf.compare.provider.utils.ComposedStyledString;
import org.eclipse.emf.compare.provider.utils.IStyledString;
import org.eclipse.emf.compare.provider.utils.IStyledString.IComposedStyledString;
import org.eclipse.emf.compare.provider.utils.IStyledString.Style;
import org.eclipse.emf.compare.rcp.ui.internal.EMFCompareRCPUIMessages;
import org.eclipse.emf.compare.rcp.ui.internal.configuration.SideLabelProvider;
import org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.nodes.ConflictNode;
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.EObject;
import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
import org.eclipse.emf.ecore.util.EcoreUtil;
/**
* This implementation of a
* {@link org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider} will be used to
* group the differences by their {@link DifferenceSource side} : left, right and conflicts.
*
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
* @since 4.0
*/
public class ThreeWayComparisonGroupProvider extends AbstractDifferenceGroupProvider {
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.structuremergeviewer.groups.IDifferenceGroupProvider#isEnabled(org
* .eclipse.emf.compare.scope.IComparisonScope, org.eclipse.emf.compare.Comparison)
*/
@Override
public boolean isEnabled(IComparisonScope scope, Comparison comparison) {
if (comparison != null && comparison.isThreeWay()) {
return true;
}
return false;
}
/**
* Specialized {@link BasicDifferenceGroupImpl} for Conflicts.
*
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
*/
public static class ConflictsGroupImpl extends BasicDifferenceGroupImpl {
/**
* {@inheritDoc}.
*
* @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl.BasicDifferenceGroupImpl#BasicDifferenceGroupImpl(org.eclipse.emf.compare.Comparison,
* java.lang.Iterable, com.google.common.base.Predicate, java.lang.String)
*/
public ConflictsGroupImpl(Comparison comparison, Predicate<? super Diff> filter, String name,
ECrossReferenceAdapter crossReferenceAdapter) {
super(comparison, filter, name, crossReferenceAdapter);
}
/**
* In conflicts, a special case must be handled for refining diffs: If they are not part of the same
* conflict then they should not be in the same group as the refined diff.
*
* @param diff
* The difference
* @return <code>true</code> if the diff refines nothing or if its conflict does not contain all the
* diffs it refines.
*/
@Override
protected boolean mustDisplayAsDirectChildOfMatch(Diff diff) {
return diff.getRefines().isEmpty() || (diff.getConflict() != null
&& !diff.getConflict().getDifferences().containsAll(diff.getRefines()));
}
@Override
protected void doBuildSubTrees() {
for (Conflict conflict : getComparison().getConflicts()) {
ConflictNodeBuilder builder = new ConflictNodeBuilder(conflict, this);
ConflictNode conflictNode = builder.buildNode();
children.add(conflictNode);
}
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl.BasicDifferenceGroupImpl#getStyledName()
*/
@Override
public IComposedStyledString getStyledName() {
final IStyledString.IComposedStyledString ret = new ComposedStyledString();
Iterator<EObject> eAllContents = concat(transform(getChildren().iterator(), E_ALL_CONTENTS));
Iterator<EObject> eAllData = transform(eAllContents, TREE_NODE_DATA);
UnmodifiableIterator<Diff> eAllDiffData = filter(eAllData, Diff.class);
Collection<Diff> diffs = Sets.newHashSet(eAllDiffData);
boolean unresolvedDiffs = any(diffs, and(hasState(DifferenceState.UNRESOLVED),
hasConflict(ConflictKind.REAL, ConflictKind.PSEUDO)));
if (unresolvedDiffs) {
ret.append("> ", Style.DECORATIONS_STYLER); //$NON-NLS-1$
}
ret.append(getName());
return ret;
}
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.structuremergeviewer.groups.impl.AbstractBuildingDifferenceGroupProvider#buildGroups(org.eclipse.emf.compare.Comparison)
*/
@Override
protected Collection<? extends IDifferenceGroup> buildGroups(Comparison comparison2) {
Adapter adapter = EcoreUtil.getAdapter(getComparison().eAdapters(), SideLabelProvider.class);
final String leftLabel, rightLabel;
if (adapter instanceof SideLabelProvider) {
SideLabelProvider labelProvider = (SideLabelProvider)adapter;
leftLabel = labelProvider.getLeftLabel();
rightLabel = labelProvider.getRightLabel();
} else {
leftLabel = EMFCompareRCPUIMessages.getString("ThreeWayComparisonGroupProvider.left.label"); //$NON-NLS-1$
rightLabel = EMFCompareRCPUIMessages.getString("ThreeWayComparisonGroupProvider.right.label"); //$NON-NLS-1$
}
final ConflictsGroupImpl conflicts = new ConflictsGroupImpl(getComparison(),
hasConflict(ConflictKind.REAL, ConflictKind.PSEUDO),
EMFCompareRCPUIMessages.getString("ThreeWayComparisonGroupProvider.conflicts.label"), //$NON-NLS-1$
getCrossReferenceAdapter());
conflicts.buildSubTree();
final BasicDifferenceGroupImpl leftSide = new BasicDifferenceGroupImpl(getComparison(),
Predicates.and(fromSide(DifferenceSource.LEFT),
Predicates.not(hasConflict(ConflictKind.REAL, ConflictKind.PSEUDO))),
leftLabel, getCrossReferenceAdapter());
leftSide.buildSubTree();
final BasicDifferenceGroupImpl rightSide = new BasicDifferenceGroupImpl(getComparison(),
Predicates.and(fromSide(DifferenceSource.RIGHT),
Predicates.not(hasConflict(ConflictKind.REAL, ConflictKind.PSEUDO))),
rightLabel, getCrossReferenceAdapter());
rightSide.buildSubTree();
return ImmutableList.of(conflicts, leftSide, rightSide);
}
}
|
