Changeset 7596 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2014-10-04T17:41:26+02:00 (10 years ago)

Author:

Don-vip

Message:

fix various warnings

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• FileImporter.java (modified) (3 diffs)
• NmeaReader.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/io/FileImporter.java

@@ -48 +48 @@
     /**
      * A batch importer is a file importer that prefers to read multiple files at the same time.
+     * @return {@code true} if this importer is a batch importer
      */
     public boolean isBatchImporter() {
@@ -55 +56 @@
     /**
      * Needs to be implemented if isBatchImporter() returns false.
+     * @param file file to import
+     * @param progressMonitor progress monitor
+     * @throws IOException if any I/O error occurs
+     * @throws IllegalDataException if invalid data is read
      */
     public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
@@ -62 +67 @@
     /**
      * Needs to be implemented if isBatchImporter() returns true.
+     * @param files files to import
+     * @param progressMonitor progress monitor
+     * @throws IOException if any I/O error occurs
+     * @throws IllegalDataException if invalid data is read
      */
     public void importData(List<File> files, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {

trunk/src/org/openstreetmap/josm/io/NmeaReader.java

@@ -3 +3 @@
 
 import java.io.BufferedReader;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
@@ -165 +166 @@
     }
 
-    public NmeaReader(InputStream source) {
+    public NmeaReader(InputStream source) throws IOException {
 
         // create the data tree
@@ -201 +202 @@
             data.tracks.add(new ImmutableGpxTrack(currentTrack, Collections.<String, Object>emptyMap()));
 
-        } catch (Exception e) {
+        } catch (IllegalDataException e) {
             Main.warn(e);
         }