X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.spreadsheet.graph%2Fsrc%2Forg%2Fsimantics%2Fspreadsheet%2Fgraph%2Fadapter%2FSpreadsheetVariable.java;h=f3d8c1c2bbe961e7c774e04b24d5b64dfc40e544;hp=0244d5c07949fc897b01f9fc37f7ddf3dbe675a1;hb=5c67a96d34fe904b8c4b0375cd08ff1d543bf369;hpb=9a37dabc6c0212ed3e14499c88df3208cd06f9b0 diff --git a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/adapter/SpreadsheetVariable.java b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/adapter/SpreadsheetVariable.java index 0244d5c07..f3d8c1c2b 100644 --- a/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/adapter/SpreadsheetVariable.java +++ b/bundles/org.simantics.spreadsheet.graph/src/org/simantics/spreadsheet/graph/adapter/SpreadsheetVariable.java @@ -15,8 +15,8 @@ import org.simantics.db.layer0.variable.Variables; import org.simantics.layer0.Layer0; 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.util.SpreadsheetUtils; public class SpreadsheetVariable extends ExtendedGraphChildVariable { @@ -90,13 +90,13 @@ public class SpreadsheetVariable extends ExtendedGraphChildVariable { @Override public Variable getPossibleSpecialChild(ReadGraph graph, String name) throws DatabaseException { 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()); 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 = getPossibleChild(graph, location); Variant value = null; if(child != null)