X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fsrc%2Forg%2Fsimantics%2Fmodeling%2Fui%2Fexpression%2FInvertBasicExpressionVisitor.java;h=9101700d0c2dea734ab4f0022f07657c78f5fe7a;hp=3f4ccc20bfbe2bcc253f4f18ec81a2265432a3d3;hb=1819be12c9a971df1dea5daa8190162ac1e20bb6;hpb=38f8cf1831e50990f7053dfaa20db64a6342015f

diff --git a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/expression/InvertBasicExpressionVisitor.java b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/expression/InvertBasicExpressionVisitor.java
index 3f4ccc20b..9101700d0 100644
--- a/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/expression/InvertBasicExpressionVisitor.java
+++ b/bundles/org.simantics.modeling.ui/src/org/simantics/modeling/ui/expression/InvertBasicExpressionVisitor.java
@@ -1,109 +1,15 @@
 package org.simantics.modeling.ui.expression;
 
-import java.util.Stack;
-
-import org.simantics.basicexpression.analysis.DepthFirstAdapter;
-import org.simantics.basicexpression.node.AConstantValue;
-import org.simantics.basicexpression.node.ADivMultiplicative;
-import org.simantics.basicexpression.node.AMultMultiplicative;
-import org.simantics.basicexpression.node.APlusExpression;
 import org.simantics.basicexpression.node.AStringValue;
+import org.simantics.modeling.InvertBasicExpressionVisitorBase;
 import org.simantics.utils.datastructures.Triple;
 
-public class InvertBasicExpressionVisitor extends DepthFirstAdapter {
-
-	Stack<Object> stack = new Stack<Object>();
-
-	public Object getResult() {
-		return stack.pop();
-	}
-
-	public void outAConstantValue(AConstantValue node) {
-		stack.push(Double.valueOf(node.toString()));
-	}
+public class InvertBasicExpressionVisitor extends InvertBasicExpressionVisitorBase {
 
+	@Override
 	public void outAStringValue(AStringValue node) {
 		String value = node.toString();
 		stack.push(Triple.make(1.0, 0.0, value.substring(1, value.length() - 2).trim()));
 	}
 
-	@SuppressWarnings("unchecked")
-    public void outAPlusExpression(APlusExpression node) {
-		
-		final Object o1 = stack.pop();
-		final Object o2 = stack.pop();
-		
-		if(o1 instanceof Double && o2 instanceof Triple) {
-			Triple<Double, Double, String> p = (Triple<Double, Double, String>)o2;
-			stack.push(Triple.make(p.first, p.second + (Double)o1, p.third));
-		} else if (o2 instanceof Double && o1 instanceof Triple) {
-			Triple<Double, Double, String> p = (Triple<Double, Double, String>)o1;
-			stack.push(Triple.make(p.first, p.second + (Double)o2, p.third));
-		} else if (o2 instanceof Double && o1 instanceof Double) {
-			stack.push((Double)o1 + (Double)o2);
-		} else {
-			stack.push(Double.NaN);
-		}
-		
-	}
-
-	@SuppressWarnings("unchecked")
-    public void outAMinusExpression(APlusExpression node) {
-		
-		final Object o1 = stack.pop();
-		final Object o2 = stack.pop();
-		
-		if(o1 instanceof Double && o2 instanceof Triple) {
-			Triple<Double, Double, String> p = (Triple<Double, Double, String>)o2;
-			stack.push(Triple.make(-p.first, (Double)o1 - p.second, p.third ));
-		} else if (o2 instanceof Double && o1 instanceof Triple) {
-			Triple<Double, Double, String> p = (Triple<Double, Double, String>)o1;
-			stack.push(Triple.make(p.first, p.second - (Double)o2, p.third));
-		} else if (o2 instanceof Double && o1 instanceof Double) {
-			stack.push((Double)o1 - (Double)o2);
-		} else {
-			stack.push(Double.NaN);
-		}
-		
-	}
-
-	@SuppressWarnings("unchecked")
-    public void outAMultMultiplicative(AMultMultiplicative node) {
-		
-		final Object o1 = stack.pop();
-		final Object o2 = stack.pop();
-		
-		if(o1 instanceof Double && o2 instanceof Triple) {
-			Triple<Double, Double, String> p = (Triple<Double, Double, String>)o2;
-			stack.push(Triple.make(p.first * (Double)o1, p.second * (Double)o1, p.third));
-		} else if (o2 instanceof Double && o1 instanceof Triple) {
-			Triple<Double, Double, String> p = (Triple<Double, Double, String>)o1;
-			stack.push(Triple.make(p.first * (Double)o2, p.second * (Double)o2, p.third));
-		} else if (o2 instanceof Double && o1 instanceof Double) {
-			stack.push((Double)o1 * (Double)o2);
-		} else {
-			stack.push(Double.NaN);
-		}
-		
-	}
-
-	@SuppressWarnings("unchecked")
-    public void outADivMultiplicative(ADivMultiplicative node) {
-		
-		final Object o1 = stack.pop();
-		final Object o2 = stack.pop();
-		
-		if(o1 instanceof Double && o2 instanceof Triple) {
-			stack.push(Double.NaN);
-		} else if (o2 instanceof Double && o1 instanceof Triple) {
-			Triple<Double, Double, String> p = (Triple<Double,Double, String>)o1;
-			stack.push(Triple.make(p.first / (Double)o2, p.second / (Double)o2, p.third));
-		} else if (o2 instanceof Double && o1 instanceof Double) {
-			stack.push((Double)o1 / (Double)o2);
-		} else {
-			stack.push(Double.NaN);
-		}
-		
-	}
-	
 }