Changeset 13838 in josm for trunk/src/org

Timestamp:

2018-05-26T02:47:41+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16316 - catch InvalidPathException

Location:

trunk/src/org/openstreetmap/josm

Files:

• Main.java (modified) (2 diffs)
• data/Preferences.java (modified) (3 diffs)
• gui/io/importexport/GpxExporter.java (modified) (2 diffs)
• gui/io/importexport/OsmExporter.java (modified) (3 diffs)
• gui/preferences/advanced/AdvancedPreference.java (modified) (2 diffs)
• io/Compression.java (modified) (2 diffs)
• tools/Utils.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/Main.java

@@ -9 +9 @@
 import java.lang.ref.WeakReference;
 import java.net.URL;
+import java.nio.file.InvalidPathException;
 import java.util.Collection;
 import java.util.Collections;
@@ -347 +348 @@
         try {
             pref.saveDefaults();
-        } catch (IOException ex) {
+        } catch (IOException | InvalidPathException ex) {
             Logging.log(Logging.LEVEL_WARN, tr("Failed to save default preferences."), ex);
         }

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -14 +14 @@
 import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.InvalidPathException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -594 +595 @@
                 save();
             }
-        } catch (IOException e) {
+        } catch (IOException | InvalidPathException e) {
             Logging.error(e);
             if (!GraphicsEnvironment.isHeadless()) {
@@ -698 +699 @@
                 try {
                     save();
-                } catch (IOException e) {
+                } catch (IOException | InvalidPathException e) {
                     File file = getPreferenceFile();
                     try {

trunk/src/org/openstreetmap/josm/gui/io/importexport/GpxExporter.java

@@ -11 +11 @@
 import java.io.IOException;
 import java.io.OutputStream;
+import java.nio.file.InvalidPathException;
 import java.text.MessageFormat;
 import java.time.Year;
@@ -209 +210 @@
             new GpxWriter(fo).write(gpxData);
             fo.flush();
-        } catch (IOException ex) {
+        } catch (IOException | InvalidPathException ex) {
             Logging.error(ex);
             JOptionPane.showMessageDialog(Main.parent, tr("Error while exporting {0}:\n{1}", fn, ex.getMessage()),

trunk/src/org/openstreetmap/josm/gui/io/importexport/OsmExporter.java

@@ -11 +11 @@
 import java.io.Writer;
 import java.nio.charset.StandardCharsets;
+import java.nio.file.InvalidPathException;
 import java.text.MessageFormat;
 
@@ -95 +96 @@
             }
             layer.onPostSaveToFile();
-        } catch (IOException e) {
+        } catch (IOException | InvalidPathException e) {
             Logging.error(e);
             JOptionPane.showMessageDialog(
@@ -110 +111 @@
                     Utils.copyFile(tmpFile, file);
                 }
-            } catch (IOException e2) {
+            } catch (IOException | InvalidPathException e2) {
                 Logging.error(e2);
                 JOptionPane.showMessageDialog(

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -10 +10 @@
 import java.io.File;
 import java.io.IOException;
+import java.nio.file.InvalidPathException;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -341 +342 @@
                     try {
                         Main.pref.save();
-                    } catch (IOException e) {
-                        Logging.log(Logging.LEVEL_WARN, "IOException while saving preferences:", e);
+                    } catch (IOException | InvalidPathException e) {
+                        Logging.log(Logging.LEVEL_WARN, "Exception while saving preferences:", e);
                     }
                     readPreferences(Main.pref);

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

@@ -8 +8 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
@@ -213 +214 @@
      *
      * @throws IOException if any I/O error occurs
+     * @throws InvalidPathException if a Path object cannot be constructed from the abstract path
      */
     public static OutputStream getCompressedFileOutputStream(File file) throws IOException {

trunk/src/org/openstreetmap/josm/tools/Utils.java

@@ -24 +24 @@
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -392 +393 @@
      * @throws IOException if any I/O error occurs
      * @throws IllegalArgumentException if {@code in} or {@code out} is {@code null}
+     * @throws InvalidPathException if a Path object cannot be constructed from the abstract path
      * @since 7003
      */