Changeset 34185 in osm

Timestamp:

2018-05-10T14:03:02+02:00 (6 years ago)

Author:

donvip

Message:

fix #josm16269 - use correct exception

Location:

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io

Files:

• geographic/TabReader.java (modified) (3 diffs)
• tabular/CsvReader.java (modified) (2 diffs)
• tabular/OdsReader.java (modified) (2 diffs)
• tabular/SpreadSheetReader.java (modified) (5 diffs)
• tabular/XlsReader.java (modified) (2 diffs)

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/geographic/TabReader.java

@@ -17 +17 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
@@ -37 +38 @@
 
     public static DataSet parseDataSet(InputStream in, File file,
-            AbstractDataSetHandler handler, ProgressMonitor instance) throws IOException {
+            AbstractDataSetHandler handler, ProgressMonitor instance) throws IOException, IllegalDataException {
         return new TabReader(handler).parse(in, file, instance, Charset.forName(OdConstants.ISO8859_15));
     }
@@ -74 +75 @@
     }
 
-    private DataSet parse(InputStream in, File file, ProgressMonitor instance, Charset charset) throws IOException {
+    private DataSet parse(InputStream in, File file, ProgressMonitor instance, Charset charset) throws IOException, IllegalDataException {
         headerReader = new BufferedReader(new InputStreamReader(in, charset));
         parseHeader();

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

@@ -10 +10 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.plugins.opendata.core.OdConstants;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
@@ -33 +34 @@
     }
 
-    public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance) throws IOException {
+    public static DataSet parseDataSet(InputStream in, AbstractDataSetHandler handler, ProgressMonitor instance)
+            throws IOException, IllegalDataException {
         CsvHandler csvHandler = null;
         if (handler != null && handler.getSpreadSheetHandler() instanceof CsvHandler) {

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

@@ -15 +15 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
 import org.openstreetmap.josm.tools.Logging;
@@ -32 +33 @@
 
     public static DataSet parseDataSet(InputStream in,
-            AbstractDataSetHandler handler, ProgressMonitor instance) throws IOException {
+            AbstractDataSetHandler handler, ProgressMonitor instance) throws IOException, IllegalDataException {
         return new OdsReader(handler != null ? handler.getSpreadSheetHandler() : null).parse(in, instance);
     }

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

@@ -94 +94 @@
     }
 
-    public DataSet doParse(String[] header, ProgressMonitor progressMonitor) throws IOException {
+    public DataSet doParse(String[] header, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
         Logging.info("Header: "+Arrays.toString(header));
 
@@ -150 +150 @@
             if (!handlerOK) {
                 if (GraphicsEnvironment.isHeadless()) {
-                    throw new IllegalArgumentException("No valid coordinates have been found and cannot prompt user in headless mode.");
+                    throw new IllegalDataException("No valid coordinates have been found and cannot prompt user in headless mode.");
                 }
                 // TODO: filter proposed projections with min/max values ?
@@ -163 +163 @@
 
         } else {
-            throw new IllegalArgumentException(tr("No valid coordinates have been found."));
+            throw new IllegalDataException(tr("No valid coordinates have been found."));
         }
 
@@ -195 +195 @@
 
             if (fields.length > header.length) {
-                Logging.warn(tr("Invalid file. Bad length on line {0}. Expected {1} columns, got {2}.", lineNumber, header.length, fields.length));
+                Logging.warn(
+                        tr("Invalid file. Bad length on line {0}. Expected {1} columns, got {2}.", lineNumber, header.length, fields.length));
                 Logging.warn(Arrays.toString(fields));
             }
@@ -268 +269 @@
     }
 
-    public final DataSet parse(InputStream in, ProgressMonitor progressMonitor) throws IOException {
+    public final DataSet parse(InputStream in, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
 
         initResources(in, progressMonitor);

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

@@ -16 +16 @@
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.progress.ProgressMonitor;
+import org.openstreetmap.josm.io.IllegalDataException;
 import org.openstreetmap.josm.plugins.opendata.core.datasets.AbstractDataSetHandler;
 import org.openstreetmap.josm.tools.Logging;
@@ -30 +31 @@
 
     public static DataSet parseDataSet(InputStream in,
-            AbstractDataSetHandler handler, ProgressMonitor instance) throws IOException {
+            AbstractDataSetHandler handler, ProgressMonitor instance) throws IOException, IllegalDataException {
         return new XlsReader(handler != null ? handler.getSpreadSheetHandler() : null).parse(in, instance);
     }