X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.spreadsheet.ui%2Fsrc%2Forg%2Fsimantics%2Fspreadsheet%2Fui%2FClientModelImpl.java;h=98335a529126d1e3c784dec6ea4665a5d2a3d617;hb=f56d8b5c5225ef421009dadca4cec0ac56aef019;hp=86fda3d5a7634933efff640a2690ba99de19773b;hpb=89b915a237d980f62d9ffe2caeb8a69170e0ce56;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/ClientModelImpl.java b/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/ClientModelImpl.java
index 86fda3d5a..98335a529 100644
--- a/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/ClientModelImpl.java
+++ b/bundles/org.simantics.spreadsheet.ui/src/org/simantics/spreadsheet/ui/ClientModelImpl.java
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.simantics.spreadsheet.ui;
 
-import gnu.trove.map.hash.THashMap;
-
 import java.awt.Rectangle;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -23,10 +21,12 @@ import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import org.simantics.spreadsheet.ClientModel;
-import org.simantics.spreadsheet.util.SpreadsheetUtils;
+import org.simantics.spreadsheet.Spreadsheets;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.datastructures.collections.CollectionUtils;
 
+import gnu.trove.map.hash.THashMap;
+
 public class ClientModelImpl implements ClientModel {
 	
 	final private Map<String, Map<String, Object>> properties = new THashMap<String, Map<String, Object>>();
@@ -226,7 +226,7 @@ public class ClientModelImpl implements ClientModel {
 			Map<String, Object> cls = cells.remove(location);
 			if(cls == null) return;
 			
-			long l = SpreadsheetUtils.decodeCellCoded(location);
+			long l = Spreadsheets.decodeCellCoded(location);
 			int row = (int)(l & 0xffffffff) - 1;
 			int column = (int)((l>>32) & 0xffffffff);
 			
@@ -280,7 +280,7 @@ public class ClientModelImpl implements ClientModel {
 
 				cls.put(property, value);
 
-				long l = SpreadsheetUtils.decodeCellCoded(location);
+				long l = Spreadsheets.decodeCellCoded(location);
 				int row = (int)(l & 0xffffffff) - 1;
 				int column = (int)((l>>32) & 0xffffffff);