Adopt spreadsheet changes made in Balas development

[simantics/platform.git] / bundles / org.simantics.spreadsheet / src / org / simantics / spreadsheet / solver / formula / IfErrorFormulaFunction.java

diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/formula/IfErrorFormulaFunction.java b/bundles/org.simantics.spreadsheet/src/org/simantics/spreadsheet/solver/formula/IfErrorFormulaFunction.java
similarity index 63%
rename from bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/formula/IfErrorFormulaFunction.java
rename to bundles/org.simantics.spreadsheet/src/org/simantics/spreadsheet/solver/formula/IfErrorFormulaFunction.java
index 891992c7d23c93f588a6ed7f61247cb373a643bd..9c79234826369753dc169ab69f65322318dc4d5b 100644 (file)
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/formula/IfErrorFormulaFunction.java
+++ b/bundles/org.simantics.spreadsheet/src/org/simantics/spreadsheet/solver/formula/IfErrorFormulaFunction.java
@@ -1,16 +1,14 @@
-package org.simantics.spreadsheet.graph.formula;
+package org.simantics.spreadsheet.solver.formula;
 
-import org.simantics.spreadsheet.graph.CellFormulaFunction;
-import org.simantics.spreadsheet.graph.CellValueVisitor;
-import org.simantics.spreadsheet.graph.parser.ast.AstArgList;
+import org.simantics.spreadsheet.solver.formula.parser.ast.AstArgList;
 
 public class IfErrorFormulaFunction implements CellFormulaFunction<Object> {
-       
-       @Override
+
+    @Override
     public Object evaluate(CellValueVisitor visitor, AstArgList args) {
-               
+
         if (args.values.size() != 2) throw new IllegalStateException();
-        
+
         Object condition = args.values.get(0).accept(visitor);
         FormulaError2 error = FormulaError2.forObject(condition);
         if(error!=null) return error.getString();