Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVictor Rubezhny2021-11-18 11:01:30 +0000
committerMickael Istria2021-11-29 11:04:13 +0000
commit98257be30568adb8063497d86a5af459aa354254 (patch)
tree605a87becea3ad461389fa2c52d9cbb0ecc910df
parent34cc626c0956f31f4ba2821e957dc2645e83df8b (diff)
downloadeclipse.platform.text-I20211129-1800.tar.gz
eclipse.platform.text-I20211129-1800.tar.xz
eclipse.platform.text-I20211129-1800.zip
Bug 577330 - Unexpected Widget is disposed exception in thrown onI20211129-1800
AbstractInformationControl.isFocusControl() Fix prevents an unexpected not decrared exception to be thrown in AbstractInformationControl.isFocusControl() org.eclipse.jface.text.AbstractInformationControl.isFocusControl() doesn't declare any exceptions to be thrown, while it could throw SWTException.ERROR_WIDGET_DISPOSED exception. Change-Id: I1199af8ae4c5c7a9204b02e44f42baf39cbe45d8 Signed-off-by: Victor Rubezhny <vrubezhny@redhat.com> Reviewed-on: https://git.eclipse.org/r/c/platform/eclipse.platform.text/+/187871 Tested-by: Platform Bot <platform-bot@eclipse.org> Reviewed-by: Mickael Istria <mistria@redhat.com>
-rw-r--r--org.eclipse.jface.text/META-INF/MANIFEST.MF2
-rw-r--r--org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java2
2 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jface.text/META-INF/MANIFEST.MF b/org.eclipse.jface.text/META-INF/MANIFEST.MF
index 947f041b2db..377e97e3900 100644
--- a/org.eclipse.jface.text/META-INF/MANIFEST.MF
+++ b/org.eclipse.jface.text/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.jface.text
-Bundle-Version: 3.19.0.qualifier
+Bundle-Version: 3.19.100.qualifier
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Export-Package:
diff --git a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
index 36fe3ff9a5b..feed6d258a4 100644
--- a/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
+++ b/org.eclipse.jface.text/src/org/eclipse/jface/text/AbstractInformationControl.java
@@ -636,7 +636,7 @@ public abstract class AbstractInformationControl implements IInformationControl,
*/
@Override
public boolean isFocusControl() {
- return fShell.getDisplay().getActiveShell() == fShell;
+ return !fShell.isDisposed() && fShell.getDisplay().getActiveShell() == fShell;
}
/**

Back to the top