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

Timestamp:

2014-04-29T03:24:57+02:00 (9 years ago)

Author:

Don-vip

Message:

Sonar - fix various issues

Location:

trunk/src/org/openstreetmap/josm/tools

Files:

• AudioPlayer.java (modified) (2 diffs)
• AudioUtil.java (modified) (3 diffs)
• ImageProvider.java (modified) (1 diff)

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

@@ -11 +11 @@
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.DataLine;
+import javax.sound.sampled.LineUnavailableException;
 import javax.sound.sampled.SourceDataLine;
+import javax.sound.sampled.UnsupportedAudioFileException;
 import javax.swing.JOptionPane;
 
@@ -339 +341 @@
                     }
                     command.ok(stateChange);
-                } catch (Exception startPlayingException) {
+                } catch (LineUnavailableException | IOException | UnsupportedAudioFileException startPlayingException) {
                     command.failed(startPlayingException); // sets state
                 }

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

@@ -3 +3 @@
 
 import java.io.File;
+import java.io.IOException;
+import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -8 +10 @@
 import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
+import javax.sound.sampled.UnsupportedAudioFileException;
 
 import org.openstreetmap.josm.Main;
@@ -40 +43 @@
             double calibration = Main.pref.getDouble("audio.calibration", 1.0 /* default, ratio */);
             return naturalLength / calibration;
-        } catch (Exception e) {
+        } catch (UnsupportedAudioFileException | IOException e) {
             return 0.0;
         }

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

@@ -770 +770 @@
                 @Override
                 public void startElement(String uri, String localName, String qName, Attributes atts) throws SAXException {
-                    if (localName.equalsIgnoreCase("img")) {
+                    if ("img".equalsIgnoreCase(localName)) {
                         String val = atts.getValue("src");
                         if (val.endsWith(fn))