aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwsudol2013-08-22 11:25:48 (EDT)
committerwsudol2013-08-22 11:25:48 (EDT)
commitef975490b97706f6cb3b4749eda5160c9292c572 (patch)
treebe9456c2788d0d0839c856f46855fc522a2f38b1
parent1e3198b48b51a9b2cdb4b3dca7818ee767853fec (diff)
downloadeclipse.platform.ui-ef975490b97706f6cb3b4749eda5160c9292c572.zip
eclipse.platform.ui-ef975490b97706f6cb3b4749eda5160c9292c572.tar.gz
eclipse.platform.ui-ef975490b97706f6cb3b4749eda5160c9292c572.tar.bz2
Bug 414912 - CoreException: No property tester contributes a property Xrefs/changes/74/15774/3
to type class Y using Eclipse 4.4 Change-Id: I8cc9b1f49b3fb8272318b3f57e7f4ea1a9e1b457 Signed-off-by: wsudo <wojciech.sudol@pl.ibm.com>
-rw-r--r--bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java21
1 files changed, 7 insertions, 14 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java
index 8ca0cc6..16192e9 100644
--- a/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java
+++ b/bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java
@@ -20,8 +20,6 @@ import org.eclipse.core.expressions.EvaluationResult;
import org.eclipse.core.expressions.Expression;
import org.eclipse.core.expressions.ExpressionInfo;
import org.eclipse.core.internal.expressions.ReferenceExpression;
-import org.eclipse.core.runtime.ISafeRunnable;
-import org.eclipse.core.runtime.SafeRunner;
import org.eclipse.e4.core.commands.ExpressionContext;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.model.application.MApplication;
@@ -245,18 +243,13 @@ public final class ContributionsAnalyzer {
for (String name : names) {
eContext.getVariable(name + ".evaluationServiceLink"); //$NON-NLS-1$
}
- final boolean[] ret = new boolean[1];
- ret[0] = false;
- SafeRunner.run(new ISafeRunnable() {
- public void run() throws Exception {
- ret[0] = ref.evaluate(eContext) != EvaluationResult.FALSE;
- }
-
- public void handleException(Throwable exception) {
- trace("isVisible exception", exception); //$NON-NLS-1$
- }
- });
- return ret[0];
+ boolean ret = false;
+ try {
+ ret = ref.evaluate(eContext) != EvaluationResult.FALSE;
+ } catch (Exception e) {
+ trace("isVisible exception", e); //$NON-NLS-1$
+ }
+ return ret;
}
public static void addMenuContributions(final MMenu menuModel,