Changeset 28954 in osm for applications/editors/josm/plugins/ImportImagePlugin/src

Timestamp:

2012-11-18T22:21:44+01:00 (12 years ago)

Author:

donvip

Message:

[josm_importimage] Major refactoring/update of COTS in order to rely on GeoTools plugin

Location:

applications/editors/josm/plugins/ImportImagePlugin

Files:

• . (modified) (1 prop)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java (modified) (8 diffs)

applications/editors/josm/plugins/ImportImagePlugin

@@ -1 +1 @@
 build
+bin

@@ -1 +1 @@
 build
+bin

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java

@@ -11 +11 @@
 
 import javax.media.jai.PlanarImage;
+import javax.swing.AbstractAction;
 import javax.swing.Action;
-import javax.swing.AbstractAction;
 import javax.swing.Icon;
 import javax.swing.ImageIcon;
@@ -29 +29 @@
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
 import org.openstreetmap.josm.gui.ExtendedDialog;
@@ -208 +207 @@
 
             // Draw picture
-            g.drawImage(image, 0, 0, null);
+            try {
+                g.drawImage(image, 0, 0, null);
+            } catch (ArrayIndexOutOfBoundsException e) {
+                // TODO: prevents this to happen when displaying GeoTIFF images (see #7902)
+                e.printStackTrace();
+            }
 
         } else {

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java

@@ -87 +87 @@
             }
 
-            /* Change class path:
-             * Use java reflection methods to add URLs to the class-path.
-             * Changes take effect when calling methods of other plugin classes
-             * (new threads)
-             * */
-            URLClassLoader sysLoader = (URLClassLoader) ClassLoader.getSystemClassLoader();
-            String[] libraryNames = pluginProps.getProperty("libraries").split(",");
-            Class<URLClassLoader> sysclass = URLClassLoader.class;
-            Method method = sysclass.getDeclaredMethod("addURL", new Class[]{URL.class});
-            method.setAccessible(true);
-            for (int i = 0; i < libraryNames.length; i++) {
-                File library = new File(PLUGINLIBRARIES_DIR + "/" + libraryNames[i]);
-                method.invoke(sysLoader, new Object[]{library.toURI().toURL()});
-            }
-
-
             // load information about supported reference systems
             PluginOperations.loadCRSData(pluginProps);
@@ -113 +97 @@
             Main.main.menu.fileMenu.insert(loadFileAction, 8);
             Main.main.menu.fileMenu.insertSeparator(9);
-
 
         } catch (Exception e) {
@@ -125 +108 @@
 
         logger.info("Plugin successfully loaded.");
-
     }
 
@@ -136 +118 @@
     private void checkInstallation() throws IOException
     {
-
         // check plugin resource state
         boolean isInstalled = true;
@@ -186 +167 @@
             }
 
-
-            // Copy all needed JAR files to $PLUGIN_DIR$/lib/
-            String[] libStrings = pluginProps.getProperty("libraries").split(",");
-
-            for (int i = 0; i < libStrings.length; i++) {
-
-                URL url = pluginClassLoader.getResource("lib/" + libStrings[i]);
-
-                FileOutputStream out = null;
-
-                try{
-                    out = new FileOutputStream(new File(libDir, libStrings[i]));
-                } catch (FileNotFoundException e) {
-                    break;
-                }
-
-                BufferedInputStream in = null;
-                try
-                {
-                    in = new BufferedInputStream(url.openStream());
-
-                    byte[] buffer = new byte[1024];
-                    while (true)
-                    {
-                        int count = in.read(buffer);
-                        if (count == -1)
-                            break;
-                        out.write(buffer, 0, count);
-                    }
-                }
-                finally
-                {
-                    if (in != null)
-                        in.close();
-                }
-            }
             logger.debug("Plugin successfully installed");
         }

applications/editors/josm/plugins/ImportImagePlugin/src/org/openstreetmap/josm/plugins/ImportImagePlugin/PluginOperations.java

@@ -19 +19 @@
 import org.geotools.coverage.grid.GridCoverage2D;
 import org.geotools.coverage.grid.GridCoverageFactory;
-import org.geotools.coverage.processing.DefaultProcessor;
+import org.geotools.coverage.processing.CoverageProcessor;
 import org.geotools.data.DataSourceException;
 import org.geotools.data.WorldFileReader;
@@ -25 +25 @@
 import org.geotools.gce.geotiff.GeoTiffReader;
 import org.geotools.geometry.Envelope2D;
-import org.geotools.image.jai.Registry;
 import org.geotools.referencing.CRS;
-import org.geotools.referencing.crs.DefaultGeographicCRS;
-import org.opengis.metadata.content.ImageDescription;
 import org.opengis.parameter.ParameterValueGroup;
 import org.opengis.referencing.FactoryException;
@@ -34 +31 @@
 import org.opengis.referencing.crs.CRSAuthorityFactory;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
-import org.opengis.referencing.cs.CoordinateSystemAxis;
 import org.opengis.util.InternationalString;
-
-
 
 /**
@@ -84 +78 @@
         GridCoverage2D destination = null;
 
-        DefaultProcessor processor = new DefaultProcessor(null);
-        ParameterValueGroup resampleParams = processor.getOperation("Resample")
-                .getParameters();
+        CoverageProcessor processor = new CoverageProcessor();
+        ParameterValueGroup resampleParams = processor.getOperation("Resample").getParameters();
 
         // set parameters
         resampleParams.parameter("Source").setValue(coverage);
-        resampleParams.parameter("CoordinateReferenceSystem").setValue(
-                targetCrs);
+        resampleParams.parameter("CoordinateReferenceSystem").setValue(targetCrs);
 
         // resample coverage with given parameters
@@ -380 +372 @@
         CRSAuthorityFactory fac = CRS.getAuthorityFactory(false);
 
-        for (Iterator iterator = supportedCodes.iterator(); iterator.hasNext();) {
+        for (Iterator<String> iterator = supportedCodes.iterator(); iterator.hasNext();) {
             String string = (String) iterator.next();
             try {
@@ -387 +379 @@
                 }
                 InternationalString desc = fac.getDescriptionText("EPSG:" + string);
-
                 String description = desc.toString() + " [-EPSG:" + string + "-]";
-
                 crsDescriptions.add(description);
-
                 if(defaultcrsString != null && defaultcrsString.equalsIgnoreCase("EPSG:" + string)){
                     boolean isEastingFirst = Boolean.valueOf(pluginProps.getProperty("default_crs_eastingfirst"));
@@ -397 +386 @@
                     defaultSourceCRSDescription = description;
                 }
-            } catch (NoSuchAuthorityCodeException e) {
-                logger.error("Error while loading EPSG data: " + e.getMessage());
+
             } catch (FactoryException e) {
                 logger.error("Error while loading EPSG data: " + e.getMessage());
@@ -404 +392 @@
         }
     }
-
 }

@@ -1 +1 @@
 build
+bin