Changeset 11397 in josm for trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java

Timestamp:

2016-12-14T15:50:53+01:00 (7 years ago)

Author:

Don-vip

Message:

sonar - squid:S2259 - Null pointers should not be dereferenced

File:

• trunk/src/org/openstreetmap/josm/tools/AudioPlayer.java (modified) (9 diffs)

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

@@ -124 +124 @@
      */
     public static void play(URL url) throws Exception {
-        AudioPlayer.getInstance().command.play(url, 0.0, 1.0);
+        AudioPlayer instance = AudioPlayer.getInstance();
+        if (instance != null)
+            instance.command.play(url, 0.0, 1.0);
     }
 
@@ -134 +136 @@
      */
     public static void play(URL url, double seconds) throws Exception {
-        AudioPlayer.getInstance().command.play(url, seconds, 1.0);
+        AudioPlayer instance = AudioPlayer.getInstance();
+        if (instance != null)
+            instance.command.play(url, seconds, 1.0);
     }
 
@@ -145 +149 @@
      */
     public static void play(URL url, double seconds, double speed) throws Exception {
-        AudioPlayer.getInstance().command.play(url, seconds, speed);
+        AudioPlayer instance = AudioPlayer.getInstance();
+        if (instance != null)
+            instance.command.play(url, seconds, speed);
     }
 
@@ -153 +159 @@
      */
     public static void pause() throws Exception {
-        AudioPlayer.getInstance().command.pause();
+        AudioPlayer instance = AudioPlayer.getInstance();
+        if (instance != null)
+            instance.command.pause();
     }
 
@@ -161 +169 @@
      */
     public static URL url() {
-        return AudioPlayer.getInstance().playingUrl;
+        AudioPlayer instance = AudioPlayer.getInstance();
+        return instance == null ? null : instance.playingUrl;
     }
 
@@ -169 +178 @@
      */
     public static boolean paused() {
-        return AudioPlayer.getInstance().state == State.PAUSED;
+        AudioPlayer instance = AudioPlayer.getInstance();
+        return instance == null ? false : (instance.state == State.PAUSED);
     }
 
@@ -177 +187 @@
      */
     public static boolean playing() {
-        return AudioPlayer.getInstance().state == State.PLAYING;
+        AudioPlayer instance = AudioPlayer.getInstance();
+        return instance == null ? false : (instance.state == State.PLAYING);
     }
 
@@ -185 +196 @@
      */
     public static double position() {
-        return AudioPlayer.getInstance().position;
+        AudioPlayer instance = AudioPlayer.getInstance();
+        return instance == null ? -1 : instance.position;
     }
 
@@ -193 +205 @@
      */
     public static double speed() {
-        return AudioPlayer.getInstance().speed;
+        AudioPlayer instance = AudioPlayer.getInstance();
+        return instance == null ? -1 : instance.speed;
     }