Fix NPE when viewer control doesn't adapt to CompareConfiguration

jonahgraham · jonahgraham · commit 96c4beda19d8 · 2025-05-28T16:41:05.000-04:00
Follow up to #2629 which introduced an NPE when doing refactor->rename in CDT: eclipse-cdt/cdt#1172
diff --git a/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java b/bundles/org.eclipse.ltk.ui.refactoring/src/org/eclipse/ltk/internal/ui/refactoring/PreviewWizardPage.java
@@ -673,7 +673,9 @@ private void showPreview(PreviewNode element) {
 						if (container != null) {
 							if (newViewer.getControl() instanceof IAdaptable adaptable) {
 								CompareConfiguration config = adaptable.getAdapter(CompareConfiguration.class);
-								config.setContainer(new WizardCompareContainer(container));
+								if (config != null) {
+									config.setContainer(new WizardCompareContainer(container));
+								}
 							}
 						}
 					} else {

Original file line number	Diff line number	Diff line change
`@@ -673,7 +673,9 @@ private void showPreview(PreviewNode element) {`
`673`	`673`	`if (container != null) {`
`674`	`674`	`if (newViewer.getControl() instanceof IAdaptable adaptable) {`
`675`	`675`	`CompareConfiguration config = adaptable.getAdapter(CompareConfiguration.class);`
`676`		`- config.setContainer(new WizardCompareContainer(container));`
	`676`	`+ if (config != null) {`
	`677`	`+ config.setContainer(new WizardCompareContainer(container));`
	`678`	`+ }`
`677`	`679`	`}`
`678`	`680`	`}`
`679`	`681`	`} else {`