Ticket #15226: josm-r12711-build-without-javafx.patch

build.xml

@@ -335 +335 @@
             <compilerarg value="-Xep:ShortCircuitBoolean:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg value="-Xep:LiteralClassName:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
+            <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
         </javac>
 
         <copy todir="build" failonerror="no" includeemptydirs="no">

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

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