[482528] Use IEvaluationResult.success() to simplify EEFViewImpl

Bug: 482528
Change-Id: I4ef92005047b9783ecacd090c0dbd45fa6a9e9f3
Signed-off-by: Pierre-Charles David <pierre-charles.david@obeo.fr>

1 files changed, 3 insertions, 4 deletions

diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFViewImpl.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFViewImpl.java
index 5cc32cb90..bcad88703 100644
--- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFViewImpl.java
+++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFViewImpl.java
@@ -21,7 +21,6 @@ import org.eclipse.eef.core.api.EEFPage;
 import org.eclipse.eef.core.api.EEFView;
 import org.eclipse.emf.common.command.Command;
 import org.eclipse.emf.common.command.CommandStack;
-import org.eclipse.emf.common.util.Diagnostic;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.transaction.RecordingCommand;
 import org.eclipse.emf.transaction.TransactionalEditingDomain;
@@ -124,7 +123,7 @@ public class EEFViewImpl implements EEFView {
 		if (!isBlank(semanticCandidateExpression)) {
 			IEvaluationResult evaluationResult = this.interpreter
 					.evaluateExpression(this.variableManager.getVariables(), semanticCandidateExpression);
-			if (Diagnostic.OK == evaluationResult.getDiagnostic().getSeverity() && evaluationResult.getValue() != null) {
+			if (evaluationResult.success()) {
 				IVariableManager childVariableManager = this.variableManager.createChild();
 				childVariableManager.put(EEFExpressionUtils.SELF, evaluationResult.getValue());
 				page = new EEFPageImpl(this, description, childVariableManager, this.interpreter, this.editingDomain);
@@ -153,7 +152,7 @@ public class EEFViewImpl implements EEFView {
 				if (!isBlank(pageSemanticCandidateExpression)) {
 					IEvaluationResult evaluationResult = this.interpreter.evaluateExpression(this.variableManager.getVariables(),
 							pageSemanticCandidateExpression);
-					if (Diagnostic.OK == evaluationResult.getDiagnostic().getSeverity() && evaluationResult.getValue() != null) {
+					if (evaluationResult.success()) {
 						eefPage.getVariableManager().put(EEFExpressionUtils.SELF, evaluationResult.getValue());
 					} else {
 						// Something is very wrong here...
@@ -166,7 +165,7 @@ public class EEFViewImpl implements EEFView {
 					if (!isBlank(groupSemanticCandidateExpression)) {
 						IEvaluationResult evaluationResult = this.interpreter.evaluateExpression(eefPage.getVariableManager().getVariables(),
 								groupSemanticCandidateExpression);
-						if (Diagnostic.OK == evaluationResult.getDiagnostic().getSeverity() && evaluationResult.getValue() != null) {
+						if (evaluationResult.success()) {
 							eefGroup.getVariableManager().put(EEFExpressionUtils.SELF, evaluationResult.getValue());
 						} else {
 							// Something is very wrong here...