Changeset 34713 in osm

Timestamp:

2018-11-01T15:24:19+01:00 (6 years ago)

Author:

donvip

Message:

see #josm16912 - functional version of javafx plugin (tested on Windows only)

Location:

applications/editors/josm/plugins/javafx

Files:

• build.xml (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/javafx/JavaFxPlugin.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/javafx/JavaFxPluginOsx.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/javafx/JavaFxPluginUnixoid.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/javafx/JavaFxPluginWindows.java (modified) (2 diffs)

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

@@ -22 +22 @@
     <property name="plugin.stage" value="5"/>
 
-    <!-- ** include targets that all plugins have in common ** -->
+    <condition property="isWindows"><os family="Windows"/></condition>
+    <condition property="isUnix"><os family="Unix"/></condition>
+    <condition property="isMac"><os family="Mac"/></condition>
+    <property name="plugin.dist.dir" location="../../dist"/>
+    <property name="plugin.jar"      location="${plugin.dist.dir}/${ant.project.name}-windows.jar" if:set="isWindows"/>
+    <property name="plugin.jar"      location="${plugin.dist.dir}/${ant.project.name}-osx.jar" if:set="isMac"/>
+    <property name="plugin.jar"      location="${plugin.dist.dir}/${ant.project.name}-unixoid.jar" if:set="isUnix"/>
+
+        <!-- ** include targets that all plugins have in common ** -->
     <import file="../build-common.xml"/>
 
@@ -78 +86 @@
             </jar>
             <delete dir="${plugin.lib.dir}/@{qualifier}" failonerror="false" />
-            <copy file="@{jar}" tofile="${plugin.jar}" if:set="@{copy}" />
         </sequential>
     </macrodef>

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

@@ -16 +16 @@
 import java.security.CodeSource;
 import java.util.Enumeration;
+import java.util.List;
 import java.util.Objects;
 import java.util.zip.ZipEntry;
@@ -37 +38 @@
      * @param info plugin info
      * @param ext native libraries extension
+     * @param orderedNativeLibraries native librarires that must be loaded in this order
      */
-    protected JavaFxPlugin(PluginInformation info, String ext) {
+    protected JavaFxPlugin(PluginInformation info, String ext, List<String> orderedNativeLibraries) {
         super(info);
         AudioPlayer.setSoundPlayerClass(JavaFxMediaPlayer.class);
         extractNativeLibs(ext);
-        loadNativeLibs(ext);
+        loadNativeLibs(ext, orderedNativeLibraries);
     }
 
@@ -80 +82 @@
         private final ClassLoader ccl = Thread.currentThread().getContextClassLoader();
         private final String ext;
+        private final List<String> orderedNativeLibraries;
 
-        public LibVisitor(String ext) {
+        public LibVisitor(String ext, List<String> orderedNativeLibraries) {
             this.ext = Objects.requireNonNull(ext);
+            this.orderedNativeLibraries = Objects.requireNonNull(orderedNativeLibraries);
         }
 
@@ -88 +92 @@
         public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
             if (ccl instanceof DynamicURLClassLoader) {
-                if (file.endsWith(ext)) {
-                    Logging.debug("Loading " + file);
-                    System.load(file.toAbsolutePath().toString());
-                } else if (file.endsWith(".jar")) {
-                    Logging.debug("Loading " + file);
+                String path = file.toAbsolutePath().toString();
+                if (path.endsWith(ext) && !orderedNativeLibraries.contains(file.getFileName().toString())) {
+                    loadNativeLib(path);
+                } else if (path.endsWith(".jar")) {
+                    Logging.debug("Loading {0}", path);
                     ((DynamicURLClassLoader) ccl).addURL(file.toUri().toURL());
                 }
@@ -103 +107 @@
     }
 
-    private void loadNativeLibs(String ext) {
+    private static void loadNativeLib(String absolutePath) {
         try {
-            Files.walkFileTree(getNativeDir(), new LibVisitor(ext));
+            Logging.debug("Loading {0}", absolutePath);
+            System.load(absolutePath);
+        } catch (LinkageError e) {
+            Logging.error(e);
+        }
+    }
+
+    private static void loadNativeLibs(String ext, List<String> orderedNativeLibraries) {
+        try {
+            Path nativeDir = getNativeDir();
+            Files.walkFileTree(nativeDir, new LibVisitor(ext, orderedNativeLibraries));
+            for (String lib : orderedNativeLibraries) {
+                loadNativeLib(nativeDir.resolve(lib).toAbsolutePath().toString());
+            }
         } catch (IOException e) {
             Logging.error(e);

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.javafx;
+
+import java.util.Arrays;
 
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -10 +12 @@
 
     /**
-     * Constructs a new {@code OpenJfxPlugin}.
+     * Constructs a new {@code JavaFxPluginOsx}.
      * @param info plugin info
      */
     public JavaFxPluginOsx(PluginInformation info) {
-        super(info, ".dylib");
+        super(info, ".dylib", Arrays.asList());
     }
 }

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.javafx;
+
+import java.util.Arrays;
 
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -10 +12 @@
 
     /**
-     * Constructs a new {@code OpenJfxPlugin}.
+     * Constructs a new {@code JavaFxPluginUnixoid}.
      * @param info plugin info
      */
     public JavaFxPluginUnixoid(PluginInformation info) {
-        super(info, ".so");
+        super(info, ".so", Arrays.asList());
     }
 }

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

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
 package org.openstreetmap.josm.plugins.javafx;
+
+import java.util.Arrays;
 
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -10 +12 @@
 
     /**
-     * Constructs a new {@code OpenJfxPlugin}.
+     * Constructs a new {@code JavaFxPluginWindows}.
      * @param info plugin info
      */
     public JavaFxPluginWindows(PluginInformation info) {
-        super(info, ".dll");
+        super(info, ".dll", Arrays.asList("fxplugins.dll"));
     }
 }