Adopt spreadsheet changes made in Balas development

[simantics/platform.git] / bundles / org.simantics.spreadsheet.graph / src / org / simantics / spreadsheet / graph / request / SpreadsheetExpressionVisitor.java

diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/request/SpreadsheetExpressionVisitor.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/request/SpreadsheetExpressionVisitor.java
index be73a741cdb633532055ff67ccd6878b13dece54..71466070ef099d03bbfc947570d43980b98f117a 100644 (file)
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/request/SpreadsheetExpressionVisitor.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/request/SpreadsheetExpressionVisitor.java
@@ -29,7 +29,7 @@ import org.simantics.db.layer0.variable.Variable;
 import org.simantics.db.layer0.variable.Variables;
 import org.simantics.layer0.Layer0;
 import org.simantics.spreadsheet.Range;
-import org.simantics.spreadsheet.util.SpreadsheetUtils;
+import org.simantics.spreadsheet.Spreadsheets;
 
 public class SpreadsheetExpressionVisitor extends DepthFirstAdapter {
 
@@ -220,13 +220,13 @@ public class SpreadsheetExpressionVisitor extends DepthFirstAdapter {
                
                String identifier = node.toString().trim();
 
-               Range range = SpreadsheetUtils.decodeRange(identifier, row, column);
+               Range range = Spreadsheets.decodeRange(identifier, row, column);
                if (range.size() != 1) {
                        ArrayList<Object> value = new ArrayList<Object>();
                        for (int c = range.startColumn; c <= range.endColumn; c++) {
                                for (int r = range.startRow; r <= range.endRow; r++) {
                                        try {
-                                               String location = SpreadsheetUtils.cellName(r, c);
+                                               String location = Spreadsheets.cellName(r, c);
                                                Variable cell = cellVariable.getChild(graph, location);
                                                System.out.println("cell=" + cell.getURI(graph));
                                                String label = cell.getPossiblePropertyValue(graph, "Label");