Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPierre-Charles David2015-11-24 15:58:45 +0000
committerPierre-Charles David2015-11-24 15:58:47 +0000
commitfb80702008569a4ddc40f23ad8bb2012d3437914 (patch)
treeac89616358c26a6a94edb8b35df54f33eab7ba4d
parent40dbe8c44261c269827daab536f572c1bd3c2c2a (diff)
downloadorg.eclipse.sirius-fb80702008569a4ddc40f23ad8bb2012d3437914.tar.gz
org.eclipse.sirius-fb80702008569a4ddc40f23ad8bb2012d3437914.tar.xz
org.eclipse.sirius-fb80702008569a4ddc40f23ad8bb2012d3437914.zip
[482528] Return an empty IEvaluationResult instead of null
Bug: 482528 Change-Id: I9c4bd6e9d6411a68c086dee82efc71c219511345 Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>
-rw-r--r--incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInterpreter.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInterpreter.java b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInterpreter.java
index e4658253c6..73c9a25489 100644
--- a/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInterpreter.java
+++ b/incubation/org.eclipse.sirius.ui.properties/src/org/eclipse/sirius/ui/properties/internal/SiriusInterpreter.java
@@ -33,7 +33,17 @@ public class SiriusInterpreter implements IInterpreter {
}
}
- IEvaluationResult result = null;
+ IEvaluationResult result = new IEvaluationResult() {
+ @Override
+ public Object getValue() {
+ return null;
+ }
+
+ @Override
+ public Diagnostic getDiagnostic() {
+ return Diagnostic.CANCEL_INSTANCE;
+ }
+ };
Object object = variables.get("self");
if (object instanceof EObject) {

Back to the top