summaryrefslogtreecommitdiffstatsabout
diff options
context:
space:
mode:
authorSnjezana Peco2013-08-22 12:03:35 (EDT)
committer Gerrit Code Review @ Eclipse.org2013-08-27 18:11:27 (EDT)
commitbf2823b0754991d0caff660a7127abc77c1dde3a (patch)
treeb2efcc334f4b0273058d0a0591ddafc2ca888c9e
parent0b3e8dccda6d9ba42cd5ef79c68bc063142c931c (diff)
downloadeclipse.platform.ui-bf2823b0754991d0caff660a7127abc77c1dde3a.zip
eclipse.platform.ui-bf2823b0754991d0caff660a7127abc77c1dde3a.tar.gz
eclipse.platform.ui-bf2823b0754991d0caff660a7127abc77c1dde3a.tar.bz2
Bug 412927 - Context menu can be corrupted if there is an invalidM20130828-0800refs/changes/84/15784/2
property tester The original fix from Snjezana. Change-Id: Ie0641201387f145fc67311803758e53208957f23 Signed-off-by: Snjezana Peco <snjeza.peco@gmail.com>
-rw-r--r--bundles/org.eclipse.e4.ui.workbench/src/org/eclipse/e4/ui/internal/workbench/ContributionsAnalyzer.java6
1 files changed, 2 insertions, 4 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 3525c2a..5884f1a 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
@@ -11,8 +11,6 @@
package org.eclipse.e4.ui.internal.workbench;
-import org.eclipse.e4.core.commands.ExpressionContext;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
@@ -22,7 +20,7 @@ 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.CoreException;
+import org.eclipse.e4.core.commands.ExpressionContext;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.model.application.MApplication;
import org.eclipse.e4.ui.model.application.commands.MCommand;
@@ -247,7 +245,7 @@ public final class ContributionsAnalyzer {
eContext.getVariable(name + ".evaluationServiceLink"); //$NON-NLS-1$
}
return ref.evaluate(eContext) != EvaluationResult.FALSE;
- } catch (CoreException e) {
+ } catch (Exception e) {
trace("isVisible exception", e); //$NON-NLS-1$
}
return false;