Changeset 31752 in osm

Timestamp:

2015-11-16T01:43:15+01:00 (9 years ago)

Author:

donvip

Message:

[josm_geotools] add missing jars and add additional manual JAI initialization

Location:

applications/editors/josm/plugins/geotools

Files:

• .classpath (modified) (1 diff)
• jar/META-INF/registryFile.jaiext (added)
• lib/jt-colorconvert-1.0.6.jar (added)
• lib/jt-stats-1.0.6.jar (added)
• lib/jt-utilities-1.0.6.jar (added)
• lib/jt-warp-1.0.6.jar (added)
• lib/jt-zonal-1.0.6.jar (added)
• src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java (modified) (3 diffs)

applications/editors/josm/plugins/geotools/.classpath

@@ -72 +72 @@
         <classpathentry exported="true" kind="lib" path="lib/jdom-1.1.3.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/jsr-275-1.0-beta-2.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/jt-colorconvert-1.0.6.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/jt-contour-1.4.0.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/jt-rangelookup-1.4.0.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/jt-stats-1.0.6.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/jt-utilities-1.0.6.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/jt-utils-1.4.0.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/jt-vectorbinarize-1.4.0.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/jt-vectorize-1.4.0.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/jt-warp-1.0.6.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/jt-zonal-1.0.6.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/jt-zonalstats-1.4.0.jar"/>
         <classpathentry combineaccessrules="false" kind="src" path="/JOSM-jts"/>

applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java

@@ -4 +4 @@
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Iterator;
+import java.util.ServiceLoader;
 
+import javax.imageio.spi.IIORegistry;
+import javax.imageio.spi.IIOServiceProvider;
 import javax.media.jai.JAI;
 import javax.media.jai.OperationRegistry;
@@ -13 +17 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginHandler;
 import org.openstreetmap.josm.plugins.PluginInformation;
 
@@ -65 +70 @@
             }
         }
+
+        // Manual registering because plugin jar is not on application classpath
+        IIORegistry ioRegistry = IIORegistry.getDefaultInstance();
+        ClassLoader loader = PluginHandler.getPluginClassLoader();
+
+        Iterator<Class<?>> categories = ioRegistry.getCategories();
+        while (categories.hasNext()) {
+            @SuppressWarnings("unchecked")
+            Iterator<IIOServiceProvider> riter = ServiceLoader.load((Class<IIOServiceProvider>)categories.next(), loader).iterator();
+            while (riter.hasNext()) {
+                ioRegistry.registerServiceProvider(riter.next());
+            }
+        }
     }