Changeset 33610 in osm

Timestamp:

2017-09-16T00:41:01+02:00 (7 years ago)

Author:

donvip

Message:

fix deprecation warnings

File:

• applications/editors/josm/plugins/geotools/src/org/openstreetmap/josm/plugins/geotools/GeoToolsPlugin.java (modified) (5 diffs)

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

@@ -15 +15 @@
 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;
@@ -48 +47 @@
         OperationRegistry registry = JAI.getDefaultInstance().getOperationRegistry();
         if (registry == null) {
-            Main.error("geotools: error in JAI initialization. Cannot access default operation registry");
+            Logging.error("geotools: error in JAI initialization. Cannot access default operation registry");
         } else {
             // Update registry with com.sun.media.jai.imageioimpl.ImageReadWriteSpi (only class listed javax.media.jai.OperationRegistrySpi)
@@ -56 +55 @@
             } catch (IllegalArgumentException e) {
                 // See #10652: IAE: A descriptor is already registered against the name "ImageRead" under registry mode "rendered"
-                Main.warn("geotools: error in JAI/ImageReadWriteSpi initialization: "+e.getMessage());
+                Logging.warn("geotools: error in JAI/ImageReadWriteSpi initialization: "+e.getMessage());
             }
 
@@ -62 +61 @@
             try (InputStream in = GeoToolsPlugin.class.getResourceAsStream("/META-INF/registryFile.jai")) {
                 if (in == null) {
-                    Main.error("geotools: error in JAI initialization. Cannot access META-INF/registryFile.jai");
+                    Logging.error("geotools: error in JAI initialization. Cannot access META-INF/registryFile.jai");
                 } else {
                     registry.updateFromStream(in);
                 }
             } catch (IOException | IllegalArgumentException e) {
-                Main.error("geotools: error in JAI/GeoTools initialization: "+e.getMessage());
+                Logging.error("geotools: error in JAI/GeoTools initialization: "+e.getMessage());
             }
         }
@@ -97 +96 @@
             CRS.decode("EPSG:4326");
         } catch (NoSuchAuthorityCodeException e) {
-            Main.error("geotools: error in EPSG database initialization. NoSuchAuthorityCodeException: "+e.getMessage());
+            Logging.error("geotools: error in EPSG database initialization. NoSuchAuthorityCodeException: "+e.getMessage());
         } catch (FactoryException e) {
-            Main.error("geotools: error in EPSG database initialization. FactoryException: "+e.getMessage());
+            Logging.error("geotools: error in EPSG database initialization. FactoryException: "+e.getMessage());
         }
     }