Skip to content

Adapt compare control to CompareConfiguration #1173

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 28, 2025
Merged

Adapt compare control to CompareConfiguration #1173

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions ....ui/src/org/eclipse/cdt/internal/ui/refactoring/dialogs/CTextEditChangePreviewViewer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,26 @@ public class CTextEditChangePreviewViewer implements IChangePreviewViewer {

private static class CTextEditChangePane extends CompareViewerPane {

private CompareConfiguration compConfig;

/**
* @param parent
* @param style
* @param compConfig
*/
public CTextEditChangePane(Composite parent, int style) {
public CTextEditChangePane(Composite parent, int style, CompareConfiguration compConfig) {
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 {
Expand Down Expand Up @@ -257,7 +269,7 @@ public void createControl(Composite parent) {
CompareConfiguration compConfig = new CompareConfiguration();
compConfig.setLeftEditable(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);
textEditChangeContentProvider = new CTextEditChangePreviewViewerContentProvider();
viewer.setContentProvider(textEditChangeContentProvider);
Expand Down
Loading