jscl without bsh

src/main/java/org/solovyev/android/calculator/jscl/JsclOperation.java

@@ -6,6 +6,7 @@
 package org.solovyev.android.calculator.jscl;
 
 
+import jscl.math.Expression;
 import org.jetbrains.annotations.NotNull;
 import org.solovyev.android.calculator.model.DummyTextProcessor;
 import org.solovyev.android.calculator.model.FromJsclSimplifyTextProcessor;
@@ -13,10 +14,30 @@ import org.solovyev.android.calculator.model.TextProcessor;
 
 public enum JsclOperation {
 
-	simplify(new FromJsclSimplifyTextProcessor()),
-	elementary(DummyTextProcessor.instance),
-	importCommands(DummyTextProcessor.instance),
-	numeric(new FromJsclNumericTextProcessor());
+	simplify(new FromJsclSimplifyTextProcessor()) {
+		@NotNull
+		@Override
+		public String evaluate(@NotNull Expression expression) {
+			return expression.simplify().toString();
+		}
+	},
+
+	elementary(DummyTextProcessor.instance) {
+		@NotNull
+		@Override
+		public String evaluate(@NotNull Expression expression) {
+			return expression.elementary().toString();
+
+		}
+	},
+
+	numeric(new FromJsclNumericTextProcessor()) {
+		@NotNull
+		@Override
+		public String evaluate(@NotNull Expression expression) {
+			return expression.numeric().toString();
+		}
+	};
 
 	@NotNull
 	private final TextProcessor<String> fromProcessor;
@@ -29,4 +50,7 @@ public enum JsclOperation {
 	public TextProcessor<String> getFromProcessor() {
 		return fromProcessor;
 	}
+
+	@NotNull
+	public abstract String evaluate(@NotNull Expression expression);
 }