X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.spreadsheet.common%2Fsrc%2Forg%2Fsimantics%2Fspreadsheet%2Futil%2FSpreadsheetUtils.java;h=4d6715dc5d57fd0635ed27e7cccd7d9f3db58767;hb=refs%2Fchanges%2F46%2F2046%2F5;hp=e3de813b46396a269272e648b822a133069e409b;hpb=e18cdb01663e3ebdae25e66bf158348bbf823a07;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.spreadsheet.common/src/org/simantics/spreadsheet/util/SpreadsheetUtils.java b/bundles/org.simantics.spreadsheet.common/src/org/simantics/spreadsheet/util/SpreadsheetUtils.java
index e3de813b4..4d6715dc5 100644
--- a/bundles/org.simantics.spreadsheet.common/src/org/simantics/spreadsheet/util/SpreadsheetUtils.java
+++ b/bundles/org.simantics.spreadsheet.common/src/org/simantics/spreadsheet/util/SpreadsheetUtils.java
@@ -22,7 +22,6 @@ import org.simantics.databoard.binding.error.BindingException;
 import org.simantics.databoard.binding.mutable.MutableVariant;
 import org.simantics.databoard.binding.mutable.Variant;
 import org.simantics.datatypes.utils.BTree;
-import org.simantics.datatypes.utils.BTreeUtils;
 import org.simantics.db.ReadGraph;
 import org.simantics.db.Resource;
 import org.simantics.db.WriteGraph;
@@ -30,8 +29,9 @@ import org.simantics.db.common.request.PossibleChild;
 import org.simantics.db.common.request.WriteRequest;
 import org.simantics.db.common.utils.Logger;
 import org.simantics.db.common.utils.NameUtils;
+import org.simantics.db.exception.AssumptionException;
 import org.simantics.db.exception.DatabaseException;
-import org.simantics.db.layer0.exception.VariableException;
+import org.simantics.db.exception.VariableException;
 import org.simantics.db.layer0.util.Layer0Utils;
 import org.simantics.db.layer0.variable.ProxyVariables;
 import org.simantics.db.layer0.variable.Variable;
@@ -48,8 +48,8 @@ import org.simantics.scl.runtime.function.Function1;
 import org.simantics.scl.runtime.tuple.Tuple;
 import org.simantics.spreadsheet.CellEditor;
 import org.simantics.spreadsheet.CellEditor.Transaction;
-import org.simantics.spreadsheet.ClientModel.OperationMode;
 import org.simantics.spreadsheet.ClientModel;
+import org.simantics.spreadsheet.ClientModel.OperationMode;
 import org.simantics.spreadsheet.Range;
 import org.simantics.spreadsheet.common.TableCell;
 import org.simantics.spreadsheet.common.cell.StringCellParser;
@@ -660,7 +660,7 @@ public class SpreadsheetUtils {
     	int w = 0; // name + fields 
     	int h = 0; // number or rows excluding headers
     	
-    	if(columns < 2) throw new DatabaseException("organizeCells: number of columns needs to be greater than 1");
+    	if(columns < 2) throw new AssumptionException("organizeCells: number of columns needs to be greater than 1");
     	
     	for(TableCell cell : cells) {
     		if((cell.column+1)>w) w = cell.column+1;