Changeset 36486 in osm

Timestamp:

2026-02-12T22:20:13+01:00 (5 days ago)

Author:

stoecker

Message:

fix javadoc for JavaFX, increase javafx to 21.0.10 (current java 17 version)

Location:

applications/editors/josm/plugins

Files:

• build-common.xml (modified) (4 diffs)
• javafx/pom.xml (modified) (1 diff)
• javafx/src/org/openstreetmap/josm/plugins/javafx/gui/JavaFxWrapper.java (modified) (1 diff)

applications/editors/josm/plugins/build-common.xml

@@ -113 +113 @@
         <!-- to be overridden by plugins that need to perform additional tasks before compiling -->
     </target>
-    <target name="compile" depends="init, pre-compile, resolve-tools" unless="skip-compile">
+    <target name="plugin-classpath-actual">
         <condition property="plugin.classpath.actual.defined">
             <isreference refid="plugin.classpath.actual" type="path"/>
@@ -120 +120 @@
             <path refid="plugin.classpath"/>
         </path>
+    </target>
+    <target name="compile" depends="init, pre-compile, resolve-tools, plugin-classpath-actual" unless="skip-compile">
         <echo message="compiling sources for ${plugin.jar} ..."/>
         <path id="jdk.boot.classpath">
@@ -293 +295 @@
         <!-- to be overridden by plugins that need to perform additional tasks before generating javadoc -->
     </target>
-    <target name="javadoc" depends="pre-javadoc,pre-compile" unless="skip-javadoc">
+    <target name="javadoc" depends="pre-javadoc,pre-compile,plugin-classpath-actual" unless="skip-javadoc">
         <mkdir dir="${plugin.doc.dir}"/>
         <javadoc destdir="${plugin.doc.dir}"
@@ -305 +307 @@
             <classpath refid="plugin.classpath" unless:set="plugin.classpath.dependencies"/>
             <classpath refid="plugin.classpath.dependencies" if:set="plugin.classpath.dependencies"/>
+            <classpath refid="plugin.classpath.actual"/>
             <sourcepath>
                 <pathelement path="${plugin.src.dir}" />

applications/editors/josm/plugins/javafx/pom.xml

@@ -22 +22 @@
         <plugin.stage>5</plugin.stage>
         <plugin.minimum.java.version>17</plugin.minimum.java.version>
-        <javafx.version>21.0.2</javafx.version>
+        <javafx.version>21.0.10</javafx.version>
     </properties>
     <!-- These dependencies should be installed on the host machine - our installers bundle them -->

applications/editors/josm/plugins/javafx/src/org/openstreetmap/josm/plugins/javafx/gui/JavaFxWrapper.java

@@ -30 +30 @@
     private static class UncaughtExceptionHandler implements Thread.UncaughtExceptionHandler {
         private final Thread.UncaughtExceptionHandler currentHandler;
-        public UncaughtExceptionHandler() {
+        UncaughtExceptionHandler() {
             currentHandler = Thread.currentThread().getUncaughtExceptionHandler();
             Thread.currentThread().setUncaughtExceptionHandler(this);
         }
+
         @Override
         public void uncaughtException(Thread t, Throwable e) {