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
|
/*******************************************************************************
* Copyright (c) 2000, 2006 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
* https://www.eclipse.org/legal/epl-2.0/
*
* SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
*******************************************************************************/
package org.eclipse.team.internal.ui.mapping;
import java.io.*;
import org.eclipse.compare.IStreamMerger;
import org.eclipse.core.resources.IEncodedStorage;
import org.eclipse.core.resources.IStorage;
import org.eclipse.core.runtime.*;
import org.eclipse.team.core.mapping.IStorageMerger;
import org.eclipse.team.internal.ui.TeamUIPlugin;
/**
* A merge context that performs three-way merges using the {@link IStreamMerger}
* interface.
* @since 3.2
*/
public class StorageStreamMerger implements IStorageMerger {
private IStreamMerger merger;
public StorageStreamMerger(IStreamMerger merger) {
this.merger = merger;
}
@Override
public IStatus merge(OutputStream output, String outputEncoding, IStorage ancestorStorage, IStorage targetStorage, IStorage otherStorage, IProgressMonitor monitor) throws CoreException {
InputStream ancestorStream = null;
InputStream remoteStream = null;
InputStream targetStream = null;
try {
ancestorStream = new BufferedInputStream(ancestorStorage.getContents());
remoteStream = new BufferedInputStream(otherStorage.getContents());
targetStream = new BufferedInputStream(targetStorage.getContents());
IStatus status = merger.merge(output, outputEncoding,
ancestorStream, getEncoding(ancestorStorage, outputEncoding),
targetStream, getEncoding(targetStorage, outputEncoding),
remoteStream, getEncoding(otherStorage, outputEncoding),
monitor);
if (status.isOK())
return status;
if (status.getCode() == IStreamMerger.CONFLICT)
return new Status(status.getSeverity(), status.getPlugin(), CONFLICT, status.getMessage(), status.getException());
return status;
} finally {
try {
if (ancestorStream != null)
ancestorStream.close();
} catch (IOException e) {
// Ignore
}
try {
if (remoteStream != null)
remoteStream.close();
} catch (IOException e) {
// Ignore
}
try {
if (targetStream != null)
targetStream.close();
} catch (IOException e) {
// Ignore
}
}
}
private String getEncoding(IStorage ancestorStorage, String outputEncoding) {
if (ancestorStorage instanceof IEncodedStorage) {
IEncodedStorage es = (IEncodedStorage) ancestorStorage;
try {
String charSet = es.getCharset();
if (charSet != null)
return charSet;
} catch (CoreException e) {
TeamUIPlugin.log(e);
}
}
return outputEncoding;
}
/* (non-Javadoc)
* @see org.eclipse.team.core.mapping.IStorageMerger#canMergeWithoutAncestor()
*/
@Override
public boolean canMergeWithoutAncestor() {
return false;
}
}
|
