Adopt spreadsheet changes made in Balas development

[simantics/platform.git] / bundles / org.simantics.spreadsheet.ui / src / org / simantics / spreadsheet / ui / editor / ExcelLink.java

diff --git a/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/editor/ExcelLink.java b/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/editor/ExcelLink.java
index 03467d6f67ff86f48ee12bd1da7ef37e38c8a39b..e68f115adf642b8663c11179d3f8a6fe0d48694f 100644 (file)
--- a/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/editor/ExcelLink.java
+++ b/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/editor/ExcelLink.java
@@ -29,10 +29,11 @@ import org.simantics.db.layer0.util.Layer0Utils;
 import org.simantics.excel.Excel;
 import org.simantics.excel.ExcelException;
 import org.simantics.layer0.Layer0;
+import org.simantics.spreadsheet.CellParseException;
 import org.simantics.spreadsheet.ClientModel;
 import org.simantics.spreadsheet.Range;
+import org.simantics.spreadsheet.Spreadsheets;
 import org.simantics.spreadsheet.common.client.ClientModelListenerAdapter;
-import org.simantics.spreadsheet.common.exception.CellParseException;
 import org.simantics.spreadsheet.resource.SpreadsheetResource;
 import org.simantics.spreadsheet.util.SpreadsheetUtils;
 import org.simantics.utils.FileUtils;
@@ -148,7 +149,7 @@ public class ExcelLink extends ClientModelListenerAdapter {
                if(ClientModel.CONTENT.equals(property) && value != null && value instanceof Variant) {
                        
                        if(handle == 0) return;
-                       Range range = SpreadsheetUtils.decodeCellAbsolute(location);
+                       Range range = Spreadsheets.decodeCellAbsolute(location);
                        excel.setString_(handle, range.startRow, range.startColumn, ((Variant)value).getValue().toString());
                        final String modis = excel.getModifications_(handle);
 
@@ -159,7 +160,7 @@ public class ExcelLink extends ClientModelListenerAdapter {
 
                                        String[] parts = (modis+"0").split("#");
                                        
-                                       Range range = SpreadsheetUtils.decodeRange(parts[0]);
+                                       Range range = Spreadsheets.decodeRange(parts[0]);
                                        
                                Layer0 L0 = Layer0.getInstance(graph);
                                SpreadsheetResource SHEET = SpreadsheetResource.getInstance(graph);
@@ -168,7 +169,7 @@ public class ExcelLink extends ClientModelListenerAdapter {
                                        for(int i=0;i<range.height();i++) {
                                                for(int j=0;j<range.width();j++) {
                                                        
-                                                       String addr = SpreadsheetUtils.cellName(range.startRow + i, range.startColumn + j);
+                                                       String addr = Spreadsheets.cellName(range.startRow + i, range.startColumn + j);
                                                        String content = parts[index++];
                                                        
                                                        Resource cell = Layer0Utils.getPossibleChild(graph, container, addr);
@@ -247,7 +248,7 @@ public class ExcelLink extends ClientModelListenerAdapter {
                                        
                                                for(Pair<String, Object> label : model.listAll(ClientModel.LABEL)) {
                                                        try {
-                                                               Range range = SpreadsheetUtils.decodeCellAbsolute(label.first);
+                                                               Range range = Spreadsheets.decodeCellAbsolute(label.first);
                                                                excel.setString_(handle, range.startRow, range.startColumn, (String)label.second);
 //                                                             System.err.println("excel.setString " + label.second);
                                                        } catch (CellParseException e) {
@@ -255,7 +256,7 @@ public class ExcelLink extends ClientModelListenerAdapter {
                                                }
                                                for(Pair<String, Object> label : model.listAll(ClientModel.CONTENT)) {
                                                        try {
-                                                               Range range = SpreadsheetUtils.decodeCellAbsolute(label.first);
+                                                               Range range = Spreadsheets.decodeCellAbsolute(label.first);
                                                                //excel.setString_(handle, range.startRow, range.startColumn, (String)label.second);
                                                                
                                                                String uri = (String)label.second;