From 7e2667ab451c86ead95171b08da983800d149cd4 Mon Sep 17 00:00:00 2001 From: David Huynh Date: Fri, 12 Mar 2010 00:23:01 +0000 Subject: [PATCH] Minor bug in Excel importer: we forgot to update the max cell index. git-svn-id: http://google-refine.googlecode.com/svn/trunk@281 7d457c2a-affb-35e4-300a-418c747d4874 --- .../java/com/metaweb/gridworks/importers/ExcelImporter.java | 2 ++ .../java/com/metaweb/gridworks/importers/TsvCsvImporter.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/metaweb/gridworks/importers/ExcelImporter.java b/src/main/java/com/metaweb/gridworks/importers/ExcelImporter.java index be9efe0f8..c417e0146 100644 --- a/src/main/java/com/metaweb/gridworks/importers/ExcelImporter.java +++ b/src/main/java/com/metaweb/gridworks/importers/ExcelImporter.java @@ -155,6 +155,8 @@ public class ExcelImporter implements Importer { if (skip <= 0 || rowsWithData > skip) { project.rows.add(newRow); + project.columnModel.setMaxCellIndex(newRow.cells.size()); + if (limit > 0 && project.rows.size() >= limit) { break; } diff --git a/src/main/java/com/metaweb/gridworks/importers/TsvCsvImporter.java b/src/main/java/com/metaweb/gridworks/importers/TsvCsvImporter.java index 895fdffb0..f91b3f9b6 100644 --- a/src/main/java/com/metaweb/gridworks/importers/TsvCsvImporter.java +++ b/src/main/java/com/metaweb/gridworks/importers/TsvCsvImporter.java @@ -62,7 +62,7 @@ public class TsvCsvImporter implements Importer { if (skip <= 0 || rowsWithData > skip) { project.rows.add(row); - project.columnModel.setMaxCellIndex(Math.max(project.columnModel.getMaxCellIndex(), row.cells.size())); + project.columnModel.setMaxCellIndex(row.cells.size()); if (limit > 0 && project.rows.size() >= limit) { break;