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

Timestamp:

2016-05-15T00:51:10+02:00 (9 years ago)

Author:

Don-vip

Message:

sonar - squid:S2221 - "Exception" should not be caught when not required by called methods

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• AudioPlayer.java (modified) (4 diffs)
• ExifReader.java (modified) (1 diff)
• ImageProvider.java (modified) (4 diffs)
• OpenBrowser.java (modified) (3 diffs)
• XmlObjectParser.java (modified) (2 diffs)
• bugreport/BugReportExceptionHandler.java (modified) (1 diff)
• date/DateUtils.java (modified) (1 diff)

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

@@ -207 +207 @@
             audioPlayer = new AudioPlayer();
             return audioPlayer;
-        } catch (Exception ex) {
+        } catch (RuntimeException ex) {
             Main.error(ex);
             return null;
@@ -249 +249 @@
         AudioInputStream audioInputStream = null;
         SourceDataLine audioOutputLine = null;
-        AudioFormat audioFormat = null;
+        AudioFormat audioFormat;
         byte[] abData = new byte[(int) chunk];
 
@@ -266 +266 @@
                         command.possiblyInterrupt();
                         for (;;) {
-                            int nBytesRead = 0;
+                            int nBytesRead;
                             nBytesRead = audioInputStream.read(abData, 0, abData.length);
                             position += nBytesRead / bytesPerSecond;
@@ -362 +362 @@
                     command.failed(startPlayingException); // sets state
                 }
-            } catch (Exception e) {
+            } catch (IOException e) {
                 state = State.NOTPLAYING;
+                Main.error(e);
             }
         }

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

@@ -78 +78 @@
                 return date;
             }
-        } catch (Exception e) {
+        } catch (UncheckedParseException | JpegProcessingException | IOException e) {
             Main.error(e);
         }

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

@@ -83 +83 @@
 
 import com.kitfox.svg.SVGDiagram;
+import com.kitfox.svg.SVGException;
 import com.kitfox.svg.SVGUniverse;
 
@@ -986 +987 @@
                 }
             }
-        } catch (Exception e) {
+        } catch (IOException e) {
             Main.warn(tr("Failed to handle zip file ''{0}''. Exception was: {1}", archive.getName(), e.toString()));
         }
@@ -1153 +1154 @@
         } catch (SAXReturnException r) {
             return r.getResult();
-        } catch (Exception e) {
+        } catch (IOException | SAXException e) {
             Main.warn("Parsing " + base + fn + " failed:\n" + e);
             return null;
@@ -1427 +1428 @@
                 svg.render(g);
             }
-        } catch (Exception ex) {
+        } catch (SVGException ex) {
             Main.error("Unable to load svg: {0}", ex.getMessage());
             return null;

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

@@ -7 +7 @@
 import java.io.IOException;
 import java.net.URI;
+import java.net.URISyntaxException;
 
 import org.openstreetmap.josm.Main;
@@ -62 +63 @@
                     }
                 }
-            } catch (Exception e) {
+            } catch (IOException e) {
                 Main.warn(e);
                 return e.getMessage();
@@ -88 +89 @@
         try {
             return displayUrl(new URI(url));
-        } catch (Exception e) {
+        } catch (URISyntaxException e) {
             return e.getMessage();
         }

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

@@ -8 +8 @@
 import java.io.Reader;
 import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
@@ -156 +157 @@
                     }
                 }
-            } catch (Exception e) {
+            } catch (IllegalAccessException | IllegalArgumentException | InvocationTargetException e) {
                 Main.error(e); // SAXException does not dump inner exceptions.
                 throwException(e);

trunk/src/org/openstreetmap/josm/tools/bugreport/BugReportExceptionHandler.java

@@ -144 +144 @@
                     JPanel p = buildPanel(e);
                     JOptionPane.showMessageDialog(Main.parent, p, tr("You have encountered a bug in JOSM"), JOptionPane.ERROR_MESSAGE);
-                } catch (Exception ex) {
+                } catch (RuntimeException ex) {
                     Main.error(ex);
                 }

trunk/src/org/openstreetmap/josm/tools/date/DateUtils.java

@@ -136 +136 @@
         try {
             return XML_DATE.newXMLGregorianCalendar(str).toGregorianCalendar().getTimeInMillis();
-        } catch (Exception ex) {
+        } catch (IllegalArgumentException ex) {
             throw new UncheckedParseException("The date string (" + str + ") could not be parsed.", ex);
         }