Changeset 12715 in josm for trunk/src/org

Timestamp:

2017-09-03T21:49:05+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #15226 - see #2089 - support for compiling without JavaFX (modified patch by ris)

Location:

trunk/src/org/openstreetmap/josm/io/audio

Files:

• AudioPlayer.java (modified) (1 diff)
• JavaFxMediaPlayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/audio/AudioPlayer.java

@@ -237 +237 @@
         double calibration = Main.pref.getDouble("audio.calibration", 1.0 /* default, ratio */);
         try {
-            soundPlayer = new JavaFxMediaPlayer();
-        } catch (NoClassDefFoundError | InterruptedException e) {
+            soundPlayer = (SoundPlayer) Class.forName("org.openstreetmap.josm.io.audio.JavaFxMediaPlayer").getConstructor().newInstance();
+        } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException e) {
+            Logging.debug(e);
+            Logging.warn("JOSM compiled without Java FX support. Falling back to Java Sound API");
+        } catch (NoClassDefFoundError | JosmRuntimeException e) {
             Logging.debug(e);
             Logging.warn("Java FX is unavailable. Falling back to Java Sound API");
+        }
+        if (soundPlayer == null) {
             soundPlayer = new JavaSoundPlayer(leadIn, calibration);
         }

trunk/src/org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java

@@ -11 +11 @@
 import org.openstreetmap.josm.io.audio.AudioPlayer.Execute;
 import org.openstreetmap.josm.io.audio.AudioPlayer.State;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.ListenerList;
 
@@ -37 +38 @@
     private MediaPlayer mediaPlayer;
 
-    JavaFxMediaPlayer() throws InterruptedException {
-        initFxPlatform();
+    JavaFxMediaPlayer() throws JosmRuntimeException {
+        try {
+            initFxPlatform();
+        } catch (InterruptedException e) {
+            throw new JosmRuntimeException(e);
+        }
     }