Changeset 30569 in osm for applications

Timestamp:

2014-08-06T19:52:20+02:00 (10 years ago)

Author:

donvip

Message:

[josm_geotools] update to geotools 11.2

Location:

applications/editors/josm/plugins/geotools

Files:

• .classpath (modified) (1 diff)
• README (modified) (1 diff)
• lib/gt-api-10.5.jar (deleted)
• lib/gt-api-11.2.jar (added)
• lib/gt-coverage-10.5.jar (deleted)
• lib/gt-coverage-11.2.jar (added)
• lib/gt-data-10.5.jar (deleted)
• lib/gt-data-11.2.jar (added)
• lib/gt-epsg-extension-10.5.jar (deleted)
• lib/gt-epsg-extension-11.2.jar (added)
• lib/gt-epsg-hsql-10.5.jar (deleted)
• lib/gt-epsg-hsql-11.2.jar (added)
• lib/gt-geotiff-10.5.jar (deleted)
• lib/gt-geotiff-11.2.jar (added)
• lib/gt-main-10.5.jar (deleted)
• lib/gt-main-11.2.jar (added)
• lib/gt-metadata-10.5.jar (deleted)
• lib/gt-metadata-11.2.jar (added)
• lib/gt-opengis-10.5.jar (deleted)
• lib/gt-opengis-11.2.jar (added)
• lib/gt-referencing-10.5.jar (deleted)
• lib/gt-referencing-11.2.jar (added)
• lib/gt-shapefile-10.5.jar (deleted)
• lib/gt-shapefile-11.2.jar (added)
• lib/hsqldb-1.8.0.7.jar (deleted)
• lib/hsqldb-2.2.8.jar (added)
• lib/imageio-ext-tiff-1.1.10.jar (added)
• lib/imageio-ext-tiff-1.1.8.jar (deleted)
• lib/imageio-ext-utilities-1.1.10.jar (added)
• lib/imageio-ext-utilities-1.1.8.jar (deleted)
• lib/jdom-1.0.jar (deleted)
• lib/jdom-1.1.3.jar (added)
• src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java (modified) (2 diffs)

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

@@ -6 +6 @@
         <classpathentry exported="true" kind="lib" path="lib/commons-beanutils-1.7.0.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/commons-pool-1.5.4.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-api-10.5.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-coverage-10.5.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-data-10.5.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-10.5.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-10.5.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-geotiff-10.5.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-main-10.5.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-metadata-10.5.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-opengis-10.5.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-referencing-10.5.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/gt-shapefile-10.5.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/hsqldb-1.8.0.7.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.8.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.8.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-api-11.2.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-coverage-11.2.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-data-11.2.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-epsg-extension-11.2.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-epsg-hsql-11.2.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-geotiff-11.2.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-main-11.2.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-metadata-11.2.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-opengis-11.2.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-referencing-11.2.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/gt-shapefile-11.2.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/hsqldb-2.2.8.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/imageio-ext-tiff-1.1.10.jar"/>
+        <classpathentry exported="true" kind="lib" path="lib/imageio-ext-utilities-1.1.10.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/jai_codec-1.1.3.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/jai_core-1.1.3.jar"/>
         <classpathentry exported="true" kind="lib" path="lib/jai_imageio-1.1.jar"/>
-        <classpathentry exported="true" kind="lib" path="lib/jdom-1.0.jar"/>
+        <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-contour-1.3.1.jar"/>

applications/editors/josm/plugins/geotools/README

@@ -4 +4 @@
     * Licensed under GPL v3 (see LICENSE)
 
-The current embedded version of GeoTools is 10.5.
+The current embedded version of GeoTools is 11.2.

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

@@ -11 +11 @@
 import org.opengis.referencing.FactoryException;
 import org.opengis.referencing.NoSuchAuthorityCodeException;
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
@@ -74 +75 @@
             CRS.decode("EPSG:4326");
         } catch (NoSuchAuthorityCodeException e) {
-            System.err.println("geotools: error in EPSG database initialization. NoSuchAuthorityCodeException: "+e.getMessage());
+            Main.error("geotools: error in EPSG database initialization. NoSuchAuthorityCodeException: "+e.getMessage());
         } catch (FactoryException e) {
-            System.err.println("geotools: error in EPSG database initialization. FactoryException: "+e.getMessage());
+            Main.error("geotools: error in EPSG database initialization. FactoryException: "+e.getMessage());
         }
     }