Changeset 7004 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2014-04-26T15:28:16+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8465 - use multi-catch where applicable

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• ExifReader.java (modified) (1 diff)
• OsmUrlToBounds.java (modified) (2 diffs)
• PlatformHookUnixoid.java (modified) (1 diff)
• Utils.java (modified) (1 diff)

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

@@ -87 +87 @@
             final Directory dir = metadata.getDirectory(ExifIFD0Directory.class);
             return dir.getInt(ExifIFD0Directory.TAG_ORIENTATION);
-        } catch (JpegProcessingException e) {
-            Main.error(e);
-        } catch (MetadataException e) {
-            Main.error(e);
-        } catch (IOException e) {
+        } catch (JpegProcessingException | MetadataException | IOException e) {
             Main.error(e);
         }

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

@@ -28 +28 @@
                 url = URLDecoder.decode(url, "UTF-8");
             }
-        } catch (UnsupportedEncodingException x) {
-            Main.error(x);
-        } catch (IllegalArgumentException x) {
+        } catch (UnsupportedEncodingException | IllegalArgumentException x) {
             Main.error(x);
         }
@@ -72 +70 @@
                         z == null ? 18 : Integer.parseInt(z));
             }
-        } catch (NumberFormatException x) {
-            Main.error(x);
-        } catch (NullPointerException x) {
-            Main.error(x);
-        } catch (ArrayIndexOutOfBoundsException x) {
+        } catch (NumberFormatException | NullPointerException | ArrayIndexOutOfBoundsException x) {
             Main.error(x);
         }

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

@@ -57 +57 @@
                 }
                 return;
-            } catch (IOException e) {
-                Main.warn(e);
-            } catch (URISyntaxException e) {
+            } catch (IOException | URISyntaxException e) {
                 Main.warn(e);
             }

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

@@ -461 +461 @@
                 return (String) t.getTransferData(DataFlavor.stringFlavor);
             }
-        } catch (UnsupportedFlavorException ex) {
-            Main.error(ex);
-            return null;
-        } catch (IOException ex) {
+        } catch (UnsupportedFlavorException | IOException ex) {
             Main.error(ex);
             return null;