Changeset 33372 in osm for applications/editors/josm/plugins

Timestamp:

2017-06-05T23:42:44+02:00 (7 years ago)

Author:

donvip

Message:

see #josm14894 - add non-regression unit test

Location:

applications/editors/josm/plugins/ImportImagePlugin

Files:

• src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayer.java (modified) (7 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (modified) (5 diffs)
• test/data/geotiff/josm (added)
• test/data/geotiff/josm/13083.tif (added)
• test/data/regress (added)
• test/data/regress/14894 (added)
• test/data/regress/14894/14894.osm (added)
• test/data/regress/14894/14894.png (added)
• test/data/regress/14894/14894.wld (added)
• test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/ImageLayerTest.java (added)

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

@@ -5 +5 @@
 
 import java.awt.Graphics2D;
+import java.awt.GraphicsEnvironment;
 import java.awt.Image;
 import java.awt.event.ActionEvent;
@@ -10 +11 @@
 import java.io.File;
 import java.io.IOException;
+import java.net.URL;
 
 import javax.media.jai.PlanarImage;
@@ -73 +75 @@
         this.imageFile = file;
         this.image = (BufferedImage) createImage();
-        layericon = new ImageIcon(ImportImagePlugin.pluginClassLoader.getResource("images/layericon.png"));
+        URL iconURL = ImportImagePlugin.pluginClassLoader.getResource("images/layericon.png");
+        if (iconURL != null) {
+            layericon = new ImageIcon(iconURL);
+        }
     }
 
@@ -96 +101 @@
         } catch (Exception e) {
             if (e.getMessage().contains("No projection file found")) {
-                ExtendedDialog ex = new ExtendedDialog(Main.parent, tr("Warning"), 
-                    new String[] {tr("Default image projection"), tr("JOSM''s current projection"), tr("Cancel")});
-                // CHECKSTYLE.OFF: LineLength
-                ex.setContent(tr("No projection file (.prj) found.<br>"
-                    + "You can choose the default image projection ({0}) or JOSM''s current editor projection ({1}) as original image projection.<br>"
-                    + "(It can be changed later from the right click menu of the image layer.)", 
-                    ImportImagePlugin.pluginProps.getProperty("default_crs_srid"), Main.getProjection().toCode()));
-                // CHECKSTYLE.ON: LineLength
-                ex.showDialog();
-                int val = ex.getValue();
-                if (val == 3) {
-                    logger.debug("No projection and user declined un-projected use");
-                    throw new LayerCreationCanceledException();
+                int val = 2;
+                if (!GraphicsEnvironment.isHeadless()) {
+                    ExtendedDialog ex = new ExtendedDialog(Main.parent, tr("Warning"), 
+                        new String[] {tr("Default image projection"), tr("JOSM''s current projection"), tr("Cancel")});
+                    // CHECKSTYLE.OFF: LineLength
+                    ex.setContent(tr("No projection file (.prj) found.<br>"
+                        + "You can choose the default image projection ({0}) or JOSM''s current editor projection ({1}) as original image projection.<br>"
+                        + "(It can be changed later from the right click menu of the image layer.)", 
+                        ImportImagePlugin.pluginProps.getProperty("default_crs_srid"), Main.getProjection().toCode()));
+                    // CHECKSTYLE.ON: LineLength
+                    val = ex.showDialog().getValue();
+                    if (val == 3) {
+                        logger.debug("No projection and user declined un-projected use");
+                        throw new LayerCreationCanceledException();
+                    }
                 }
                 CoordinateReferenceSystem src = null;
@@ -299 +306 @@
      *
      */
-    public class LayerPropertiesAction extends AbstractAction {
+    public static class LayerPropertiesAction extends AbstractAction {
         public ImageLayer imageLayer;
 
@@ -307 +314 @@
         }
 
+        @Override
         public void actionPerformed(ActionEvent arg0) {
             LayerPropertiesDialog layerProps = new LayerPropertiesDialog(imageLayer, PluginOperations.crsDescriptions);
@@ -317 +325 @@
      * Exception which represents that the layer creation has been canceled by the user.
      */
-    class LayerCreationCanceledException extends IOException{
+    static class LayerCreationCanceledException extends IOException{
     }
 

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

@@ -20 +20 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.tools.JosmRuntimeException;
 import org.openstreetmap.josm.tools.Utils;
 
@@ -37 +38 @@
     JosmAction loadFileAction = null;
 
-    // custom Classloader
-    static ClassLoader pluginClassLoader;
+    // custom Classloader to load resources from the main JAR
+    static ClassLoader pluginClassLoader = createPluginClassLoader();
 
     // plugin proerties
@@ -44 +45 @@
 
     // path constants
-    static final String PLUGIN_DIR = 
-            Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/";
-    static final String PLUGINPROPERTIES_PATH = 
-            Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/pluginProperties.properties";
-    static final String PLUGINLIBRARIES_DIR = 
-            Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/lib/";
+    static final String PLUGIN_DIR = Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/";
     static final String PLUGINPROPERTIES_FILENAME = "pluginProperties.properties";
-    static final String LOGGING_PROPERTIES_FILEPATH = 
-            Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin/log4j.properties/";
+    static final String PLUGINPROPERTIES_PATH = PLUGIN_DIR + PLUGINPROPERTIES_FILENAME;
+    static final String PLUGINLIBRARIES_DIR = PLUGIN_DIR + "lib/";
+    static final String LOGGING_PROPERTIES_FILEPATH = PLUGIN_DIR + "log4j.properties/";
 
     public Properties getPluginProps() {
@@ -67 +64 @@
 
         try {
-            // First create custom ClassLoader to load resources from the main JAR
-            pluginClassLoader = createPluginClassLoader();
-
             // Initialize logger
             initializeLogger(pluginClassLoader);
@@ -206 +200 @@
      * get a plugin-specific classloader.
      */
-    private ClassLoader createPluginClassLoader() throws MalformedURLException {
-        ClassLoader loader = null;
-        loader = URLClassLoader.newInstance(
-                new URL[] {new File(Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin.jar").toURI().toURL()},
-                ImportImagePlugin.class.getClassLoader()
-                );
-
-        return loader;
-    }
-
+    private static ClassLoader createPluginClassLoader() {
+        try {
+            return URLClassLoader.newInstance(
+                    new URL[] {new File(Main.pref.getPluginsDirectory().getAbsolutePath() + "/ImportImagePlugin.jar").toURI().toURL()},
+                    ImportImagePlugin.class.getClassLoader()
+                    );
+        } catch (MalformedURLException e) {
+            throw new JosmRuntimeException(e);
+        }
+    }
 }