Changeset 34701 in osm for applications/editors/josm

Timestamp:

2018-10-28T17:28:36+01:00 (6 years ago)

Author:

donvip

Message:

openjfx => javafx

Location:

applications/editors/josm/plugins/javafx

Files:

• .classpath (modified) (1 diff)
• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/javafx/JavaFxPlugin.java (moved) (moved from applications/editors/josm/plugins/javafx/src/org/openstreetmap/josm/plugins/javafx/JavafxPlugin.java ) (4 diffs)

applications/editors/josm/plugins/javafx/.classpath

@@ -6 +6 @@
         <classpathentry exported="true" kind="lib" path="lib/javafx-base-11-win.jar" sourcepath="lib/javafx-base-11-sources.jar">
                 <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-openjfx/lib/javafx-base-11-javadoc.jar!/"/>
+                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-javafx/lib/javafx-base-11-javadoc.jar!/"/>
                 </attributes>
         </classpathentry>
         <classpathentry exported="true" kind="lib" path="lib/javafx-controls-11-win.jar" sourcepath="lib/javafx-controls-11-sources.jar">
                 <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-openjfx/lib/javafx-controls-11-javadoc.jar!/"/>
+                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-javafx/lib/javafx-controls-11-javadoc.jar!/"/>
                 </attributes>
         </classpathentry>
         <classpathentry exported="true" kind="lib" path="lib/javafx-fxml-11-win.jar" sourcepath="lib/javafx-fxml-11-sources.jar">
                 <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-openjfx/lib/javafx-fxml-11-javadoc.jar!/"/>
+                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-javafx/lib/javafx-fxml-11-javadoc.jar!/"/>
                 </attributes>
         </classpathentry>
         <classpathentry exported="true" kind="lib" path="lib/javafx-graphics-11-win.jar" sourcepath="lib/javafx-graphics-11-sources.jar">
                 <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-openjfx/lib/javafx-graphics-11-javadoc.jar!/"/>
+                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-javafx/lib/javafx-graphics-11-javadoc.jar!/"/>
                 </attributes>
         </classpathentry>
         <classpathentry exported="true" kind="lib" path="lib/javafx-media-11-win.jar" sourcepath="lib/javafx-media-11-sources.jar">
                 <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-openjfx/lib/javafx-media-11-javadoc.jar!/"/>
+                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-javafx/lib/javafx-media-11-javadoc.jar!/"/>
                 </attributes>
         </classpathentry>
         <classpathentry exported="true" kind="lib" path="lib/javafx-swing-11-win.jar" sourcepath="lib/javafx-swing-11-sources.jar">
                 <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-openjfx/lib/javafx-swing-11-javadoc.jar!/"/>
+                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-javafx/lib/javafx-swing-11-javadoc.jar!/"/>
                 </attributes>
         </classpathentry>
         <classpathentry exported="true" kind="lib" path="lib/javafx-web-11-win.jar" sourcepath="lib/javafx-web-11-sources.jar">
                 <attributes>
-                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-openjfx/lib/javafx-web-11-javadoc.jar!/"/>
+                        <attribute name="javadoc_location" value="jar:platform:/resource/JOSM-javafx/lib/javafx-web-11-javadoc.jar!/"/>
                 </attributes>
         </classpathentry>

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

@@ -10 +10 @@
     -->
     <property name="plugin.author" value="Don-vip"/>
-    <property name="plugin.class" value="org.openstreetmap.josm.plugins.openjfx.OpenJfxPlugin"/>
+    <property name="plugin.class" value="org.openstreetmap.josm.plugins.javafx.JavaFxPlugin"/>
     <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="11"/>
+    <property name="plugin.provides" value="javafx"/>
     <!--<property name="plugin.icon" value="..."/>-->
     <!--<property name="plugin.link" value="..."/>-->

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

@@ -32 +32 @@
  * OpenJFX plugin brings OpenJFX (JavaFX) to other plugins.
  */
-public class JavafxPlugin extends Plugin {
+public class JavaFxPlugin extends Plugin {
 
     /**
@@ -38 +38 @@
      * @param info plugin info
      */
-    public JavafxPlugin(PluginInformation info) {
+    public JavaFxPlugin(PluginInformation info) {
         super(info);
         AudioPlayer.setSoundPlayerClass(JavaFxMediaPlayer.class);
@@ -54 +54 @@
 
     private static void extractNativeLibs(String ext) {
-        CodeSource src = JavafxPlugin.class.getProtectionDomain().getCodeSource();
+        CodeSource src = JavaFxPlugin.class.getProtectionDomain().getCodeSource();
         if (src != null) {
             try (ZipFile zf = new ZipFile(Paths.get(src.getLocation().toURI()).toFile(), StandardCharsets.UTF_8)) {
@@ -77 +77 @@
             }
         } else {
-            Logging.error("Unable to locate openjfx jar file");
+            Logging.error("Unable to locate javafx jar file");
         }
     }
 
     private static Path getNativeDir() throws IOException {
-        return Files.createDirectories(new File(Preferences.main().getPluginsDirectory(), "openjfx").toPath());
+        return Files.createDirectories(new File(Preferences.main().getPluginsDirectory(), "javafx").toPath());
     }