Changeset 13819 in josm

Timestamp:

2018-05-22T22:38:21+02:00 (6 years ago)

Author:

Don-vip

Message:

see #2089, see #16047 - move JavaFX classes to their own package in order to exclude them automatically when JavaFX is not on the classpath (needed for Java 11+ now that FX is gone)

Location:

trunk

Files:

• build.xml (modified) (3 diffs)
• src/org/openstreetmap/josm/io/audio/AudioListener.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/audio/AudioPlayer.java (modified) (4 diffs)
• src/org/openstreetmap/josm/io/audio/SoundPlayer.java (modified) (1 diff)
• src/org/openstreetmap/josm/io/audio/fx (added)
• src/org/openstreetmap/josm/io/audio/fx/JavaFxMediaPlayer.java (moved) (moved from trunk/src/org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java ) (3 diffs)
• src/org/openstreetmap/josm/io/audio/fx/package-info.java (added)

trunk/build.xml

@@ -20 +20 @@
         <property name="test.dir" location="${base.dir}/test"/>
         <property name="src.dir" location="${base.dir}/src"/>
-        <condition property="noJavaFX" value="${env.JOSM_NOJAVAFX}" else="0">
+        <condition property="noJavaFX">
+            <or>
                 <isset property="env.JOSM_NOJAVAFX"/>
+                <not>
+                    <available classname="javafx.scene.media.Media"/>
+                </not>
+            </or>
         </condition>
         <property name="build.dir" location="${base.dir}/build"/>
@@ -370 +375 @@
             <compilerarg value="-Xep:JdkObsolete:OFF" compiler="com.google.errorprone.ErrorProneAntCompilerAdapter"/>
             <compilerarg line="-Xmaxwarns 1000"/>
-            <exclude name="org/openstreetmap/josm/io/audio/JavaFxMediaPlayer.java" if:set="noJavaFX"/>
+            <exclude name="org/openstreetmap/josm/io/audio/fx/*.java" if:set="noJavaFX"/>
         </javac>
 
@@ -405 +410 @@
             <arg value="--add-exports" if:set="isJava9" />
             <arg value="javafx.graphics/com.sun.javafx.application=ALL-UNNAMED" if:set="isJava9" />
+            <excludepackage name="org/openstreetmap/josm/io/audio/fx" if:set="noJavaFX" />
         </javadoc>
     </target>

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

@@ -8 +8 @@
  * @since 12328
  */
-interface AudioListener {
+public interface AudioListener {
 
     /**

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

@@ -20 +20 @@
     private static volatile AudioPlayer audioPlayer;
 
-    enum State { INITIALIZING, NOTPLAYING, PLAYING, PAUSED, INTERRUPTED }
-
-    enum Command { PLAY, PAUSE }
-
-    enum Result { WAITING, OK, FAILED }
+    /**
+     * Audio player state.
+     */
+    public enum State {
+        /** Initializing */
+        INITIALIZING,
+        /** Not playing */
+        NOTPLAYING,
+        /** Playing */
+        PLAYING,
+        /** Paused */
+        PAUSED,
+        /** Interrupted */
+        INTERRUPTED
+    }
+
+    /**
+     * Audio player command.
+     */
+    public enum Command { /** Audio play */ PLAY, /** Audio pause */ PAUSE }
+
+    /**
+     * Audio player result.
+     */
+    public enum Result { /** In progress */ WAITING, /** Success */ OK, /** Failure */ FAILED }
 
     private State state;
@@ -33 +53 @@
      * Passes information from the control thread to the playing thread
      */
-    class Execute {
+    public class Execute {
         private Command command;
         private Result result;
@@ -84 +104 @@
         }
 
-        protected double offset() {
+        /**
+         * Returns the offset.
+         * @return the offset, in seconds
+         */
+        public double offset() {
             return offset;
         }
 
-        protected double speed() {
+        /**
+         * Returns the speed.
+         * @return the speed (ratio)
+         */
+        public double speed() {
             return speed;
         }
 
-        protected URL url() {
+        /**
+         * Returns the URL.
+         * @return The resource to play, which must be a WAV file or stream
+         */
+        public URL url() {
             return url;
         }
 
-        protected Command command() {
+        /**
+         * Returns the command.
+         * @return the command
+         */
+        public Command command() {
             return command;
         }
@@ -237 +273 @@
         double calibration = Config.getPref().getDouble("audio.calibration", 1.0 /* default, ratio */);
         try {
-            soundPlayer = (SoundPlayer) Class.forName("org.openstreetmap.josm.io.audio.JavaFxMediaPlayer")
+            soundPlayer = (SoundPlayer) Class.forName("org.openstreetmap.josm.io.audio.fx.JavaFxMediaPlayer")
                     .getDeclaredConstructor().newInstance();
         } catch (ReflectiveOperationException | IllegalArgumentException | SecurityException e) {

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

@@ -12 +12 @@
  * @since 12328
  */
-interface SoundPlayer {
+public interface SoundPlayer {
 
     /**

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.io.audio;
+package org.openstreetmap.josm.io.audio.fx;
 
 import java.io.File;
@@ -9 +9 @@
 import java.util.concurrent.CountDownLatch;
 
+import org.openstreetmap.josm.io.audio.AudioException;
+import org.openstreetmap.josm.io.audio.AudioListener;
 import org.openstreetmap.josm.io.audio.AudioPlayer.Execute;
 import org.openstreetmap.josm.io.audio.AudioPlayer.State;
+import org.openstreetmap.josm.io.audio.SoundPlayer;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.ListenerList;
@@ -32 +35 @@
  * @since 12328
  */
-class JavaFxMediaPlayer implements SoundPlayer {
+public class JavaFxMediaPlayer implements SoundPlayer {
 
     private final ListenerList<AudioListener> listeners = ListenerList.create();