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
|
/*******************************************************************************
* Copyright (c) 2006, 2012 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.internal.core.mapping;
import java.io.*;
import org.eclipse.compare.rangedifferencer.RangeDifference;
import org.eclipse.compare.rangedifferencer.RangeDifferencer;
import org.eclipse.core.resources.IStorage;
import org.eclipse.core.runtime.*;
import org.eclipse.team.core.mapping.IStorageMerger;
import org.eclipse.team.internal.core.Messages;
import org.eclipse.team.internal.core.TeamPlugin;
public class TextStorageMerger implements IStorageMerger {
public IStatus merge(OutputStream output, String outputEncoding,
IStorage ancestor, IStorage target, IStorage other,
IProgressMonitor monitor) throws CoreException {
LineComparator a, t, o;
try {
a= LineComparator.create(ancestor, outputEncoding);
t= LineComparator.create(target, outputEncoding);
o= LineComparator.create(other,outputEncoding);
} catch (UnsupportedEncodingException e) {
throw new CoreException (new Status(IStatus.ERROR, TeamPlugin.ID, UNSUPPORTED_ENCODING, Messages.TextAutoMerge_inputEncodingError, e));
} catch (IOException e) {
throw new CoreException (new Status(IStatus.ERROR, TeamPlugin.ID, INTERNAL_ERROR, e.getMessage(), e));
}
try {
boolean firstLine = true;
String lineSeparator= System.getProperty("line.separator"); //$NON-NLS-1$
if (lineSeparator == null)
lineSeparator= "\n"; //$NON-NLS-1$
RangeDifference[] diffs= RangeDifferencer.findRanges(monitor, a, t, o);
for (int i= 0; i < diffs.length; i++) {
RangeDifference rd= diffs[i];
switch (rd.kind()) {
case RangeDifference.ANCESTOR: // pseudo conflict
case RangeDifference.NOCHANGE:
case RangeDifference.RIGHT:
for (int j= rd.rightStart(); j < rd.rightEnd(); j++) {
String s= o.getLine(j);
if (!firstLine)
output.write(lineSeparator.getBytes(outputEncoding));
output.write(s.getBytes(outputEncoding));
firstLine = false;
}
break;
case RangeDifference.LEFT:
for (int j= rd.leftStart(); j < rd.leftEnd(); j++) {
String s= t.getLine(j);
if (!firstLine)
output.write(lineSeparator.getBytes(outputEncoding));
output.write(s.getBytes(outputEncoding));
firstLine = false;
}
break;
case RangeDifference.CONFLICT:
return new Status(IStatus.WARNING, TeamPlugin.ID, CONFLICT, Messages.TextAutoMerge_conflict, null);
default:
break;
}
}
} catch (UnsupportedEncodingException e) {
throw new CoreException (new Status(IStatus.ERROR, TeamPlugin.ID, UNSUPPORTED_ENCODING, Messages.TextAutoMerge_outputEncodingError, e));
} catch (IOException e) {
return new Status(IStatus.ERROR, TeamPlugin.ID, INTERNAL_ERROR, Messages.TextAutoMerge_outputIOError, e);
}
return Status.OK_STATUS;
}
/* (non-Javadoc)
* @see org.eclipse.team.core.mapping.IStorageMerger#canMergeWithoutAncestor()
*/
public boolean canMergeWithoutAncestor() {
return false;
}
}
|
