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
|
/*******************************************************************************
* 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.rcp.ui.internal.contentmergeviewer.accessor.impl;
import com.google.common.collect.ImmutableList;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.compare.Comparison;
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.Match;
import org.eclipse.emf.compare.ResourceAttachmentChange;
import org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.IResourceContentsAccessor;
import org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.legacy.impl.AbstractTypedElementAdapter;
import org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.impl.TypeConstants;
import org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.IMergeViewer.MergeViewerSide;
import org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.IMergeViewerItem;
import org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl.MergeViewerItem;
import org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.item.impl.ResourceAttachmentChangeMergeViewerItem;
import org.eclipse.emf.compare.rcp.ui.internal.util.MergeViewerUtil;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.provider.EcoreEditPlugin;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.edit.ui.provider.ExtendedImageRegistry;
import org.eclipse.swt.graphics.Image;
/**
* @author <a href="mailto:axel.richard@obeo.fr">Axel Richard</a>
*/
public class ResourceContentsAccessorImpl extends AbstractTypedElementAdapter implements IResourceContentsAccessor {
/** The difference performed. */
private final Diff fDiff;
/** The side on which the difference is located. */
private final MergeViewerSide fSide;
/** The match associated to the performed difference. */
private final Match fOwnerMatch;
/**
* @param diff
* The difference performed.
* @param side
* The side on which the difference is located.
*/
public ResourceContentsAccessorImpl(AdapterFactory adapterFactory, Diff diff, MergeViewerSide side) {
super(adapterFactory);
fDiff = diff;
fSide = side;
fOwnerMatch = diff.getMatch();
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.IResourceContentsAccessor#getComparison()
*/
public Comparison getComparison() {
return fOwnerMatch.getComparison();
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.IResourceContentsAccessor#getInitialItem()
*/
public IMergeViewerItem getInitialItem() {
Diff initialDiff = fDiff;
EObject diffValue = (EObject)MergeViewerUtil.getResourceAttachmentChangeValue(
(ResourceAttachmentChange)initialDiff, getSide());
if (DifferenceState.MERGED == initialDiff.getState()) {
Object left = MergeViewerUtil.getValueFromResourceAttachmentChange(
(ResourceAttachmentChange)initialDiff, getComparison(), MergeViewerSide.LEFT);
Object right = MergeViewerUtil.getValueFromResourceAttachmentChange(
(ResourceAttachmentChange)initialDiff, getComparison(), MergeViewerSide.RIGHT);
DifferenceSource source = initialDiff.getSource();
DifferenceKind kind = initialDiff.getKind();
boolean b5 = source == DifferenceSource.LEFT && kind == DifferenceKind.ADD && right == null;
boolean b6 = source == DifferenceSource.LEFT && kind == DifferenceKind.DELETE && left == null;
boolean b7 = source == DifferenceSource.RIGHT && kind == DifferenceKind.ADD && left == null;
boolean b8 = source == DifferenceSource.RIGHT && kind == DifferenceKind.DELETE && right == null;
if (b5 || b8) {
left = null;
}
if (b6 || b7) {
right = null;
}
if (b5 || b8 || b6 || b7) {
Object ancestor = MergeViewerUtil.getValueFromResourceAttachmentChange(
(ResourceAttachmentChange)initialDiff, getComparison(), MergeViewerSide.ANCESTOR);
return new MergeViewerItem.Container(getComparison(), initialDiff, left, right, ancestor,
getSide(), getRootAdapterFactory());
}
}
if (diffValue == null && MergeViewerSide.ANCESTOR != getSide()) {
if (MergeViewerSide.LEFT == getSide()) {
diffValue = (EObject)MergeViewerUtil.getResourceAttachmentChangeValue(
(ResourceAttachmentChange)initialDiff, MergeViewerSide.RIGHT);
} else {
diffValue = (EObject)MergeViewerUtil.getResourceAttachmentChangeValue(
(ResourceAttachmentChange)initialDiff, MergeViewerSide.LEFT);
}
if (diffValue == null) {
diffValue = (EObject)MergeViewerUtil.getResourceAttachmentChangeValue(
(ResourceAttachmentChange)initialDiff, MergeViewerSide.ANCESTOR);
}
}
Match match = getComparison().getMatch(diffValue);
if (match != null) {
Object left = match.getLeft();
Object right = match.getRight();
Object ancestor = match.getOrigin();
// Manage case where the resource attachment change is between an existing resource and an unknown
// resource
if (MergeViewerUtil.getResource(getComparison(), MergeViewerSide.LEFT,
(ResourceAttachmentChange)initialDiff) == null) {
left = null;
}
if (MergeViewerUtil.getResource(getComparison(), MergeViewerSide.RIGHT,
(ResourceAttachmentChange)initialDiff) == null) {
right = null;
}
if (MergeViewerUtil.getResource(getComparison(), MergeViewerSide.ANCESTOR,
(ResourceAttachmentChange)initialDiff) == null) {
ancestor = null;
}
return new MergeViewerItem.Container(getComparison(), initialDiff, left, right, ancestor,
getSide(), getRootAdapterFactory());
}
return null;
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.IResourceContentsAccessor#getItems()
*/
public ImmutableList<? extends IMergeViewerItem> getItems() {
final ImmutableList<? extends IMergeViewerItem> ret = ImmutableList
.of(new ResourceAttachmentChangeMergeViewerItem(getComparison(), null,
getResource(MergeViewerSide.LEFT), getResource(MergeViewerSide.RIGHT),
getResource(MergeViewerSide.ANCESTOR), getSide(), getRootAdapterFactory()));
return ret;
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.IResourceContentsAccessor#getResource(org.eclipse.emf.compare.rcp.ui.internal.mergeviewer.IMergeViewer.MergeViewerSide)
*/
public Resource getResource(MergeViewerSide side) {
return MergeViewerUtil.getResource(fOwnerMatch.getComparison(), side, fDiff);
}
/**
* Returns the side of the content merge viewer on which the difference is performed.
*
* @return The side of the content merge viewer on which the difference is performed.
*/
protected final MergeViewerSide getSide() {
return fSide;
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.legacy.ITypedElement#getName()
*/
public String getName() {
return ResourceContentsAccessorImpl.class.getName();
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.legacy.ITypedElement#getImage()
*/
public Image getImage() {
return ExtendedImageRegistry.getInstance().getImage(
EcoreEditPlugin.getPlugin().getImage("full/obj16/EObject")); //$NON-NLS-1$
}
/**
* {@inheritDoc}
*
* @see org.eclipse.emf.compare.rcp.ui.internal.contentmergeviewer.accessor.legacy.ITypedElement#getType()
*/
public String getType() {
return TypeConstants.TYPE__ERESOURCE_DIFF;
}
}
|
