Bug 575823 - use Display.syncCall(SwtCallable)
Change-Id: I0a27d176cc1c82461920bacfa3cdb2b809aea7bc
Signed-off-by: Joerg Kubitz <jkubitz-eclipse@gmx.de>
Reviewed-on: https://git.eclipse.org/r/c/equinox/rt.equinox.bundles/+/185027
Tested-by: Equinox Bot <equinox-bot@eclipse.org>
Reviewed-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF
index 9969680..9907cde 100644
--- a/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.security.ui/META-INF/MANIFEST.MF
@@ -17,6 +17,7 @@
org.osgi.util.tracker;version="[1.3.3,2.0.0)"
Require-Bundle: org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)",
org.eclipse.equinox.preferences;bundle-version="[3.2.200,4.0.0)",
+ org.eclipse.swt;bundle-version="[3.118.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.runtime; bundle-version="[3.4.0,4.0.0)"
Bundle-Activator: org.eclipse.equinox.internal.security.ui.Activator
diff --git a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/UICallbackProvider.java b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/UICallbackProvider.java
index 2df31af..dca3ba9 100644
--- a/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/UICallbackProvider.java
+++ b/bundles/org.eclipse.equinox.security.ui/src/org/eclipse/equinox/internal/security/ui/storage/UICallbackProvider.java
@@ -136,12 +136,8 @@
if (!StorageUtils.showUI(null)) // container-independent operation
return null;
- final Boolean[] result = new Boolean[1];
- PlatformUI.getWorkbench().getDisplay().syncExec(() -> {
- boolean reply = MessageDialog.openConfirm(StorageUtils.getShell(), SecUIMessages.generalDialogTitle, msg);
- result[0] = Boolean.valueOf(reply);
- });
- return result[0];
+ return PlatformUI.getWorkbench().getDisplay().syncCall(
+ () -> MessageDialog.openConfirm(StorageUtils.getShell(), SecUIMessages.generalDialogTitle, msg));
}
@Override
