Skip to content

Commit abe4d1b

Browse files
authored
Adapt compare control to CompareConfiguration (#1173)
This is to accomodate a bug fix done in Eclipse Platform in eclipse-platform/eclipse.platform.ui#2629 Fixes #1172
1 parent 2d313f6 commit abe4d1b

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/CTextEditChangePreviewViewer.java

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,14 +60,26 @@ public class CTextEditChangePreviewViewer implements IChangePreviewViewer {
6060

6161
private static class CTextEditChangePane extends CompareViewerPane {
6262

63+
private CompareConfiguration compConfig;
64+
6365
/**
6466
* @param parent
6567
* @param style
68+
* @param compConfig
6669
*/
67-
public CTextEditChangePane(Composite parent, int style) {
70+
public CTextEditChangePane(Composite parent, int style, CompareConfiguration compConfig) {
6871
super(parent, style);
72+
this.compConfig = compConfig;
6973
}
7074

75+
@SuppressWarnings("unchecked")
76+
@Override
77+
public <T> T getAdapter(Class<T> adapter) {
78+
if (CompareConfiguration.class.equals(adapter)) {
79+
return (T) compConfig;
80+
}
81+
return super.getAdapter(adapter);
82+
}
7183
}
7284

7385
private class CPPMergeViewer extends CMergeViewer {
@@ -257,7 +269,7 @@ public void createControl(Composite parent) {
257269
CompareConfiguration compConfig = new CompareConfiguration();
258270
compConfig.setLeftEditable(false);
259271
compConfig.setRightEditable(false);
260-
viewerPane = new CTextEditChangePane(parent, SWT.BORDER | SWT.FLAT);
272+
viewerPane = new CTextEditChangePane(parent, SWT.BORDER | SWT.FLAT, compConfig);
261273
viewer = new CPPMergeViewer(viewerPane, SWT.MULTI | SWT.FULL_SELECTION, compConfig);
262274
textEditChangeContentProvider = new CTextEditChangePreviewViewerContentProvider();
263275
viewer.setContentProvider(textEditChangeContentProvider);

0 commit comments

Comments
 (0)