Changeset 34072 in osm for applications/editors/josm/plugins/opendata/src/org

Timestamp:

2018-02-19T23:17:09+01:00 (7 years ago)

Author:

donvip

Message:

fix #josm15980 - bad support of empty cells in Excel files

File:

• applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsReader.java (modified) (1 diff)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/XlsReader.java

@@ -58 +58 @@
             if (row != null) {
                 List<String> result = new ArrayList<>();
-                for (Cell cell : row) {
-                    switch (cell.getCellType()) {
-                        case Cell.CELL_TYPE_STRING:
-                            result.add(cell.getRichStringCellValue().getString());
-                            break;
-                        case Cell.CELL_TYPE_NUMERIC:
-                            if (DateUtil.isCellDateFormatted(cell)) {
-                                result.add(cell.getDateCellValue().toString());
-                            } else {
-                                result.add(Double.toString(cell.getNumericCellValue()));
-                            }
-                            break;
-                        case Cell.CELL_TYPE_BOOLEAN:
-                            result.add(Boolean.toString(cell.getBooleanCellValue()));
-                            break;
-                        case Cell.CELL_TYPE_FORMULA:
-                            result.add(cell.getCellFormula());
-                            break;
-                        default:
-                            result.add("");
+                // Do not use iterator! It skips null values
+                for (int i = 0; i < row.getLastCellNum(); i++) {
+                    Cell cell = row.getCell(i);
+                    if (cell != null) {
+                        switch (cell.getCellType()) {
+                            case Cell.CELL_TYPE_STRING:
+                                result.add(cell.getRichStringCellValue().getString());
+                                break;
+                            case Cell.CELL_TYPE_NUMERIC:
+                                if (DateUtil.isCellDateFormatted(cell)) {
+                                    result.add(cell.getDateCellValue().toString());
+                                } else {
+                                    result.add(Double.toString(cell.getNumericCellValue()));
+                                }
+                                break;
+                            case Cell.CELL_TYPE_BOOLEAN:
+                                result.add(Boolean.toString(cell.getBooleanCellValue()));
+                                break;
+                            case Cell.CELL_TYPE_FORMULA:
+                                result.add(cell.getCellFormula());
+                                break;
+                            default:
+                                result.add("");
+                        }
+                    } else {
+                        result.add("");
                     }
                 }