Changeset 35371 in osm for applications

Timestamp:

2020-03-16T23:15:34+01:00 (5 years ago)

Author:

donvip

Message:

fix #josm18925 - enable JavaFX plugin with Oracle Java 8 (patch by taylor.smock, modified)

Location:

applications/editors/josm/plugins/javafx

Files:

• . (modified) (1 prop)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/javafx/JavaFxPlugin.java (modified) (4 diffs)

applications/editors/josm/plugins/javafx

@@ -2 +2 @@
 build
 javadoc
+MANIFEST*

@@ -2 +2 @@
 build
 javadoc
+MANIFEST*

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

@@ -14 +14 @@
     <property name="plugin.class.osx" value="org.openstreetmap.josm.plugins.javafx.JavaFxPluginOsx"/>
     <property name="plugin.description" value="Provides the OpenJFX (JavaFX) library for JOSM core and other JOSM plugins. Provides additional features such as MP3 audio playback."/>
-    <property name="plugin.minimum.java.version" value="10"/>
+    <!--<property name="plugin.minimum.java.version" value="10"/>-->
     <property name="plugin.provides" value="javafx"/>
     <!--<property name="plugin.icon" value="..."/>-->

applications/editors/josm/plugins/javafx/src/org/openstreetmap/josm/plugins/javafx/JavaFxPlugin.java

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.javafx;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.File;
@@ -15 +16 @@
 import java.nio.file.attribute.BasicFileAttributes;
 import java.security.CodeSource;
+import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -22 +24 @@
 
 import org.openstreetmap.josm.data.Preferences;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.audio.AudioPlayer;
 import org.openstreetmap.josm.plugins.DynamicURLClassLoader;
 import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.plugins.PluginInformation;
 import org.openstreetmap.josm.plugins.javafx.io.audio.JavaFxMediaPlayer;
 import org.openstreetmap.josm.tools.Logging;
+import org.openstreetmap.josm.tools.PlatformManager;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
- * OpenJFX plugin brings OpenJFX (JavaFX) to other plugins.
+ * JavaFX plugin brings OpenJFX (JavaFX) to other plugins.
  */
 abstract class JavaFxPlugin extends Plugin {
@@ -38 +44 @@
      * @param info plugin info
      * @param ext native libraries extension
-     * @param orderedNativeLibraries native librarires that must be loaded in this order
+     * @param orderedNativeLibraries native libraries that must be loaded in this order
      */
     protected JavaFxPlugin(PluginInformation info, String ext, List<String> orderedNativeLibraries) {
         super(info);
+        boolean isJavaFx = Utils.getSystemProperty("javafx.runtime.version") != null || ("Oracle Corporation".equals(Utils.getSystemProperty("java.vendor")) && Utils.getJavaVersion() < 11);
+        if (!isJavaFx && Utils.getJavaVersion() >= 10) {
+            extractNativeLibs(ext);
+            loadNativeLibs(ext, orderedNativeLibraries);
+        } else if (!isJavaFx) {
+            Logging.error("JavaFX is not available");
+            StringBuilder message = new StringBuilder(tr("JavaFX is not available."));
+            PlatformManager.getPlatform();
+            if (PlatformManager.isPlatformUnixoid()) {
+                message.append(tr(" Please install OpenJFX through your package manager."));
+            } else {
+                message.append(tr(" Please update to Java 11+."));
+            }
+            if (PluginHandler.confirmDisablePlugin(MainApplication.getMainFrame(), message.toString(), info.getName())) {
+                PluginHandler.removePlugins(Collections.singletonList(info));
+            }
+            return;
+        }
         AudioPlayer.setSoundPlayerClass(JavaFxMediaPlayer.class);
-        extractNativeLibs(ext);
-        loadNativeLibs(ext, orderedNativeLibraries);
     }
 

@@ -2 +2 @@
 build
 javadoc
+MANIFEST*