diff options
Diffstat (limited to 'plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFCompoundInterpreter.java')
| -rw-r--r-- | plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFCompoundInterpreter.java | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFCompoundInterpreter.java b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFCompoundInterpreter.java index f492f8bb8..c25368791 100644 --- a/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFCompoundInterpreter.java +++ b/plugins/org.eclipse.eef.core/src/org/eclipse/eef/core/internal/EEFCompoundInterpreter.java @@ -20,8 +20,6 @@ import java.util.Map; import org.eclipse.eef.interpreter.api.IEvaluationResult; import org.eclipse.eef.interpreter.api.IInterpreter; import org.eclipse.eef.interpreter.api.IInterpreterProvider; -import org.eclipse.eef.interpreter.api.IValidationResult; -import org.eclipse.sirius.expression.SiriusExpressionDescription; /** * Utility class encapsulating all the available interpreters. @@ -69,30 +67,13 @@ public class EEFCompoundInterpreter implements IInterpreter { /** * {@inheritDoc} * - * @see org.eclipse.eef.interpreter.api.IInterpreter#evaluateExpression(java.util.Map, - * org.eclipse.sirius.expression.ExpressionDescription, java.lang.String) + * @see org.eclipse.eef.interpreter.api.IInterpreter#evaluateExpression(java.util.Map, java.lang.String) */ @Override - public IEvaluationResult evaluateExpression(Map<String, Object> variables, SiriusExpressionDescription expressionDescription, - String expressionBody) { + public IEvaluationResult evaluateExpression(Map<String, Object> variables, String expressionBody) { IInterpreter interpreter = this.getInterpreterForExpression(expressionBody); if (interpreter != null) { - return interpreter.evaluateExpression(variables, expressionDescription, expressionBody); - } - return null; - } - - /** - * {@inheritDoc} - * - * @see org.eclipse.eef.interpreter.api.IInterpreter#validateExpression(org.eclipse.sirius.expression.ExpressionDescription, - * java.lang.String) - */ - @Override - public IValidationResult validateExpression(SiriusExpressionDescription expressionDescription, String expressionBody) { - IInterpreter interpreter = this.getInterpreterForExpression(expressionBody); - if (interpreter != null) { - return interpreter.validateExpression(expressionDescription, expressionBody); + return interpreter.evaluateExpression(variables, expressionBody); } return null; } |