Adopt spreadsheet changes made in Balas development

[simantics/platform.git] / bundles / org.simantics.spreadsheet.graph / src / org / simantics / spreadsheet / graph / adapter / DoubleArrayCells.java

diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/adapter/DoubleArrayCells.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/adapter/DoubleArrayCells.java
index 896fd6602cdaa39ff7721639b9a39d7765555d29..a6db85a5e45db34cfe8f9b74a4bf64460ded52e0 100644 (file)
--- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/adapter/DoubleArrayCells.java
+++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/adapter/DoubleArrayCells.java
@@ -5,7 +5,6 @@ import java.util.Collection;
 import java.util.Collections;
 
 import org.simantics.databoard.Bindings;
-import org.simantics.databoard.Datatypes;
 import org.simantics.databoard.binding.Binding;
 import org.simantics.databoard.binding.mutable.Variant;
 import org.simantics.db.ReadGraph;
@@ -16,8 +15,8 @@ import org.simantics.db.layer0.variable.Variable;
 import org.simantics.db.layer0.variable.VariableFactory;
 import org.simantics.db.layer0.variable.Variables;
 import org.simantics.spreadsheet.SheetVariables;
+import org.simantics.spreadsheet.Spreadsheets;
 import org.simantics.spreadsheet.resource.SpreadsheetResource;
-import org.simantics.spreadsheet.util.SpreadsheetUtils;
 import org.simantics.utils.datastructures.datatype.RGBInt8;
 
 public class DoubleArrayCells implements VariableFactory {
@@ -49,7 +48,7 @@ public class DoubleArrayCells implements VariableFactory {
                for(int offset=0,i=0;i<rows;i++) {
                        for(int j=0;j<width;j++) {
                                double value = data[offset++];
-                               String valueLocation = SpreadsheetUtils.offset(location, i, j);
+                               String valueLocation = Spreadsheets.offset(location, i, j);
                                result.add(new DoubleArrayCellVariable(variable, valueLocation, propertyNames, bindings, new Object[] { Variant.ofInstance(value), fore, back, configuration, String.valueOf(value), false }));
                        }
                }