Fix NPE #1929

basilevs · HeikoKlare · commit 1989d41fc464 · 2025-03-27T20:20:33.000+01:00
This is a fixup for ab1d119 The contract of `openDialog()` is to throw on error, and return Optional of user action. Null return value is not expected.
diff --git a/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DirectoryDialog.java b/bundles/org.eclipse.swt/Eclipse SWT/cocoa/org/eclipse/swt/widgets/DirectoryDialog.java
@@ -195,7 +195,7 @@ public Optional<String> openDialog () {
 	directoryPath = null;
 	panel = NSOpenPanel.openPanel();
 	if (panel == null) {
-		return null;
+		throw new SWTException(SWT.ERROR_INVALID_RETURN_VALUE);
 	}
 
 	callback_performKeyEquivalent = new Callback(this, "_performKeyEquivalent", 3);

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ public Optional<String> openDialog () {`
`195`	`195`	`directoryPath = null;`
`196`	`196`	`panel = NSOpenPanel.openPanel();`
`197`	`197`	`if (panel == null) {`
`198`		`- return null;`
	`198`	`+ throw new SWTException(SWT.ERROR_INVALID_RETURN_VALUE);`
`199`	`199`	`}`
`200`	`200`
`201`	`201`	`callback_performKeyEquivalent = new Callback(this, "_performKeyEquivalent", 3);`