X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.spreadsheet.graph%2Fsrc%2Forg%2Fsimantics%2Fspreadsheet%2Fgraph%2Ffunction%2FSpreadsheetRootVariable.java;h=aad988fb94cbe10c9f6926730ebc04bf7d0ffa75;hb=f56d8b5c5225ef421009dadca4cec0ac56aef019;hp=5327d9b7cb389363fa9d88cc6e79963f04921657;hpb=89b915a237d980f62d9ffe2caeb8a69170e0ce56;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/function/SpreadsheetRootVariable.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/function/SpreadsheetRootVariable.java index 5327d9b7c..aad988fb9 100644 --- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/function/SpreadsheetRootVariable.java +++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/function/SpreadsheetRootVariable.java @@ -20,6 +20,7 @@ import org.simantics.db.layer0.variable.VariableNode; import org.simantics.db.layer0.variable.Variables; import org.simantics.spreadsheet.Range; import org.simantics.spreadsheet.SheetVariables; +import org.simantics.spreadsheet.Spreadsheets; import org.simantics.spreadsheet.common.matrix.VariantMatrix; import org.simantics.spreadsheet.graph.Ranges; import org.simantics.spreadsheet.resource.SpreadsheetResource; @@ -77,7 +78,7 @@ public class SpreadsheetRootVariable extends StandardGraphChildVariable { if(name.contains(":")) { - Range range = SpreadsheetUtils.decodeRange(name, 0, 0); + Range range = Spreadsheets.decodeRange(name, 0, 0); VariantMatrix matrix = new VariantMatrix(range.height(),range.width()); String rangeNames[][] = new String[range.height()][range.width()]; @@ -85,7 +86,7 @@ public class SpreadsheetRootVariable extends StandardGraphChildVariable { for(int x=range.startColumn;x<=range.endColumn;x++) { for(int y=range.startRow;y<=range.endRow;y++) { - String location = SpreadsheetUtils.cellName(y,x); + String location = Spreadsheets.cellName(y,x); Variable child = context.getPossibleChild(graph, location); Variant value = null; if(child != null)