mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Adapt compare control to CompareConfiguration

Browse source 
This is to accomodate a bug fix done in Eclipse Platform in
https://github.com/eclipse-platform/eclipse.platform.ui/pull/2629

Fixes https://github.com/eclipse-cdt/cdt/issues/1172
This commit is contained in:
Jonah Graham 2025-05-28 16:34:57 -04:00
parent 2d313f69b8
commit a553feed51
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -60,14 +60,26 @@ public class CTextEditChangePreviewViewer implements IChangePreviewViewer {
private static class CTextEditChangePane extends CompareViewerPane { private static class CTextEditChangePane extends CompareViewerPane {
private CompareConfiguration compConfig;
/** /**
* @param parent * @param parent
* @param style * @param style
* @param compConfig
*/ */
public CTextEditChangePane(Composite parent, int style) { public CTextEditChangePane(Composite parent, int style, CompareConfiguration compConfig) {
super(parent, style); super(parent, style);
this.compConfig = compConfig;
} }
@SuppressWarnings("unchecked")
@Override
public <T> T getAdapter(Class<T> adapter) {
if (CompareConfiguration.class.equals(adapter)) {
return (T) compConfig;
}
return super.getAdapter(adapter);
}
} }
private class CPPMergeViewer extends CMergeViewer { private class CPPMergeViewer extends CMergeViewer {
@ -257,7 +269,7 @@ public class CTextEditChangePreviewViewer implements IChangePreviewViewer {
CompareConfiguration compConfig = new CompareConfiguration(); CompareConfiguration compConfig = new CompareConfiguration();
compConfig.setLeftEditable(false); compConfig.setLeftEditable(false);
compConfig.setRightEditable(false); compConfig.setRightEditable(false);
viewerPane = new CTextEditChangePane(parent, SWT.BORDER | SWT.FLAT); viewerPane = new CTextEditChangePane(parent, SWT.BORDER | SWT.FLAT, compConfig);
viewer = new CPPMergeViewer(viewerPane, SWT.MULTI | SWT.FULL_SELECTION, compConfig); viewer = new CPPMergeViewer(viewerPane, SWT.MULTI | SWT.FULL_SELECTION, compConfig);
textEditChangeContentProvider = new CTextEditChangePreviewViewerContentProvider(); textEditChangeContentProvider = new CTextEditChangePreviewViewerContentProvider();
viewer.setContentProvider(textEditChangeContentProvider); viewer.setContentProvider(textEditChangeContentProvider);