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
|
/*******************************************************************************
* Copyright (c) 2012, 2014 Tasktop Technologies 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:
* Tasktop Technologies - initial API and implementation
* Sebastien Dubois (Ericsson) - Improvements for bug 400266
*******************************************************************************/
package org.eclipse.mylyn.internal.reviews.ui.compare;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import org.eclipse.compare.CompareConfiguration;
import org.eclipse.compare.contentmergeviewer.TextMergeViewer;
import org.eclipse.compare.structuremergeviewer.DiffNode;
import org.eclipse.compare.structuremergeviewer.Differencer;
import org.eclipse.compare.structuremergeviewer.ICompareInput;
import org.eclipse.compare.structuremergeviewer.IDiffElement;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.mylyn.reviews.core.model.IFileItem;
import org.eclipse.mylyn.reviews.core.model.IReviewItem;
import org.eclipse.mylyn.reviews.core.model.IReviewItemSet;
import org.eclipse.mylyn.reviews.ui.ReviewBehavior;
import org.eclipse.swt.widgets.Composite;
/**
* @author Steffen Pingel
* @author Sebastien Dubois
* @author Miles Parker
*/
public class ReviewItemSetCompareEditorInput extends ReviewItemCompareEditorInput {
private final IReviewItemSet items;
private DiffNode root;
public ReviewItemSetCompareEditorInput(CompareConfiguration configuration, IReviewItemSet items,
IFileItem selection, ReviewBehavior behavior) {
super(configuration, behavior);
this.items = items;
setTitle(items.getName());
}
@Override
protected Object prepareInput(IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
if (root != null) {
return root;
}
root = new DiffNode(Differencer.NO_CHANGE);
for (IReviewItem item : items.getItems()) {
if (!(item instanceof IFileItem)) {
continue;
}
FileItemNode node = new FileItemNode(behavior, (IFileItem) item, monitor);
DiffNode parent = findNode(root, node.getPath());
parent.add(node);
}
for (IDiffElement child : root.getChildren()) {
if (child instanceof FileItemNode) {
flattenTree((FileItemNode) child);
}
}
return root;
}
private void flattenTree(FileItemNode node) {
mergeChild(node);
for (IDiffElement child : node.getChildren()) {
if (child instanceof FileItemNode) {
flattenTree((FileItemNode) child);
}
}
}
public void mergeChild(FileItemNode node) {
if (node.getChildren().length == 1 && isDirectory(node.getChildren()[0])) {
FileItemNode child = (FileItemNode) node.getChildren()[0];
node.setName(node.getName() + "/" + child.getName()); //$NON-NLS-1$
node.remove(child);
for (IDiffElement element : child.getChildren()) {
node.add(element);
}
mergeChild(node);
}
}
private boolean isDirectory(IDiffElement element) {
return element instanceof FileItemNode && ((FileItemNode) element).getFileItem() == null;
}
private DiffNode findNode(DiffNode root, IPath path) {
if (path.segmentCount() == 1) {
return root;
}
String name = path.segment(0);
// try to find existing path segment
IDiffElement child = root.findChild(name);
if (child instanceof DiffNode) {
return findNode((DiffNode) child, path.removeFirstSegments(1));
}
// create new path segment
FileItemNode node = new FileItemNode(name);
root.add(node);
return findNode(node, path.removeFirstSegments(1));
}
@Override
public Viewer findContentViewer(Viewer oldViewer, ICompareInput input, Composite parent) {
Viewer contentViewer = super.findContentViewer(oldViewer, input, parent);
if (input instanceof FileItemNode && ((FileItemNode) input).getFileItem() != null) {
getCompareConfiguration().setLabelProvider(input, ((FileItemNode) input).getLabelProvider());
//NOTE: This solves the problem described in bug 402060, but causes a bad listener leak in AbstractTextEditor so we remove it for now
//updateViewerConfig(contentViewer, (FileItemNode) input);
}
return contentViewer;
}
//NOTE: This is a temporary hack to work around the problem described in bug 402060. It should be removed when the bug is fixed
protected void updateViewerConfig(Viewer aContentViewer, FileItemNode input) {
if (aContentViewer instanceof TextMergeViewer) {
final TextMergeViewer textMergeViewer = (TextMergeViewer) aContentViewer;
try {
final Class<TextMergeViewer> clazz = TextMergeViewer.class;
Field declaredField = clazz.getDeclaredField("isConfigured"); //$NON-NLS-1$
declaredField.setAccessible(true);
declaredField.setBoolean(textMergeViewer, false);
Method declaredMethod = clazz.getDeclaredMethod("updateContent", Object.class, Object.class, //$NON-NLS-1$
Object.class);
declaredMethod.setAccessible(true);
declaredMethod.invoke(textMergeViewer, null, input.getLeft(), input.getRight());
} catch (Throwable t) {
//do nothing for now
}
}
}
}
|
