Spreadsheet changes

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

diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetFormula.java b/bundles/org.simantics.spreadsheet/src/org/simantics/spreadsheet/solver/SpreadsheetFormula.java
similarity index 62%
rename from bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetFormula.java
rename to bundles/org.simantics.spreadsheet/src/org/simantics/spreadsheet/solver/SpreadsheetFormula.java
index d171fd87e83bc72bfb6bea49f28813fa741dd7c2..6933356698bec1d5e1562d2eb20b925b17e5db9a 100644 (file)
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/SpreadsheetFormula.java
+++ b/bundles/org.simantics.spreadsheet/src/org/simantics/spreadsheet/solver/SpreadsheetFormula.java
@@ -1,21 +1,25 @@
-package org.simantics.spreadsheet.graph;
+package org.simantics.spreadsheet.solver;
 
 import java.io.Serializable;
 
-import org.simantics.spreadsheet.graph.parser.ast.AstValue;
+import org.simantics.databoard.Bindings;
+import org.simantics.databoard.binding.Binding;
+import org.simantics.spreadsheet.solver.formula.parser.ast.AstValue;
 
 public class SpreadsheetFormula implements Serializable {
-       
-       private static final long serialVersionUID = -3369406031425959191L;
-       
-       public AstValue value;
-       public String expression;
-       public Object result;
-       
-       public SpreadsheetFormula(AstValue value, String expression) {
-               this.value = value;
-               this.expression = expression;
-       }
+
+    public static Binding BINDING = Bindings.getBindingUnchecked(SpreadsheetFormula.class);
+    
+    private static final long serialVersionUID = -3369406031425959191L;
+
+    public AstValue value;
+    public String expression;
+    public Object result;
+
+    public SpreadsheetFormula(AstValue value, String expression) {
+        this.value = value;
+        this.expression = expression;
+    }
 
     @Override
     public int hashCode() {
@@ -41,7 +45,7 @@ public class SpreadsheetFormula implements Serializable {
             return false;
         return true;
     }
-    
+
     @Override
     public String toString() {
         return getClass().getSimpleName() + " [" + expression +" => " + result != null ? result.toString() : "" + "]";