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
|
/*******************************************************************************
* Copyright (c) 2000, 2008 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.core.diff.provider;
import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.IPath;
import org.eclipse.osgi.util.NLS;
import org.eclipse.team.core.diff.*;
import org.eclipse.team.internal.core.Messages;
import org.eclipse.team.internal.core.mapping.SyncInfoToDiffConverter;
/**
* Implementation of {@link IThreeWayDiff}.
*
* @since 3.2
* @noextend This class is not intended to be subclassed by clients.
*/
public class ThreeWayDiff extends Diff implements IThreeWayDiff {
private final ITwoWayDiff localChange;
private final ITwoWayDiff remoteChange;
/**
* Create a three-way delta from the two changes. At least one change
* must be provided (i.e. either change may be <code>null</code>
* but at least one must be non-<code>null</code>).
* @param localChange the local change in the model object or <code>null</code> if there is no local change
* @param remoteChange the remote change in the model object or <code>null</code> if there is no local change
*/
public ThreeWayDiff(ITwoWayDiff localChange, ITwoWayDiff remoteChange) {
super(calculatePath(localChange, remoteChange), calculateKind(localChange, remoteChange) | calculateDirection(localChange, remoteChange));
this.localChange = localChange;
this.remoteChange = remoteChange;
}
private static IPath calculatePath(ITwoWayDiff localChange, ITwoWayDiff remoteChange) {
if (localChange != null && remoteChange != null)
Assert.isTrue(localChange.getPath().equals(remoteChange.getPath()));
if (localChange != null)
return localChange.getPath();
if (remoteChange != null)
return remoteChange.getPath();
Assert.isLegal(false, "Either or local or remote change must be supplied"); //$NON-NLS-1$
return null; // Will never be reached
}
private static int calculateDirection(ITwoWayDiff localChange, ITwoWayDiff remoteChange) {
int direction = 0;
if (localChange != null && localChange.getKind() != NO_CHANGE) {
direction |= OUTGOING;
}
if (remoteChange != null && remoteChange.getKind() != NO_CHANGE) {
direction |= INCOMING;
}
return direction;
}
private static int calculateKind(ITwoWayDiff localChange, ITwoWayDiff remoteChange) {
int localKind = NO_CHANGE;
if (localChange != null)
localKind = localChange.getKind();
int remoteKind = NO_CHANGE;
if (remoteChange != null)
remoteKind = remoteChange.getKind();
if (localKind == NO_CHANGE || localKind == remoteKind)
return remoteKind;
if (remoteKind == NO_CHANGE)
return localKind;
return CHANGE;
}
/* (non-Javadoc)
* @see org.eclipse.team.core.synchronize.IThreeWayDelta#getLocalChange()
*/
public ITwoWayDiff getLocalChange() {
return localChange;
}
/* (non-Javadoc)
* @see org.eclipse.team.core.synchronize.IThreeWayDelta#getRemoteChange()
*/
public ITwoWayDiff getRemoteChange() {
return remoteChange;
}
/* (non-Javadoc)
* @see org.eclipse.team.core.synchronize.IThreeWayDelta#getDirection()
*/
public int getDirection() {
return getStatus() & CONFLICTING;
}
/* (non-Javadoc)
* @see org.eclipse.team.core.diff.IDiffNode#toDiffString()
*/
public String toDiffString() {
int kind = getKind();
String label = ""; //$NON-NLS-1$
if(kind==IDiff.NO_CHANGE) {
label = super.toDiffString();
} else {
label = SyncInfoToDiffConverter.diffDirectionToString(getDirection());
label = NLS.bind(Messages.concatStrings, new String[] { label, super.toDiffString() });
}
return label;
}
/* (non-Javadoc)
* @see org.eclipse.team.core.diff.provider.Diff#equals(java.lang.Object)
*/
public boolean equals(Object obj) {
if (obj == this)
return true;
if (super.equals(obj)) {
if (obj instanceof ThreeWayDiff) {
ThreeWayDiff other = (ThreeWayDiff) obj;
return changesEqual(getLocalChange(), other.getLocalChange())
&& changesEqual(getRemoteChange(), other.getRemoteChange());
}
}
return false;
}
private boolean changesEqual(ITwoWayDiff diff, ITwoWayDiff diff2) {
if (diff == null)
return diff2 == null;
if (diff2 == null)
return false;
return diff.equals(diff2);
}
}
|
