Changeset 32402 in osm for applications/editors/josm/plugins/ImportImagePlugin

Timestamp:

2016-06-25T13:23:53+02:00 (9 years ago)

Author:

donvip

Message:

fix warnigns and unit test

Location:

applications/editors/josm/plugins/ImportImagePlugin

Files:

• .settings/org.sonarlint.eclipse.core.prefs (added)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImageFileImporter.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/ImportImagePlugin.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/ImportImagePlugin/LoadImageAction.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/GeoTiffReaderTest.java (modified) (2 diffs)

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

@@ -58 +58 @@
 
             // Add layer:
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
             layer.visitBoundingBox(boundingXYVisitor);

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

@@ -19 +19 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -123 +124 @@
             File pluginDir = new File(PLUGIN_DIR);
             if(!pluginDir.exists()){
-                pluginDir.mkdir();
+                Utils.mkDirs(pluginDir);
             }
 
@@ -129 +130 @@
             File libDir = new File(PLUGINLIBRARIES_DIR);
             if(!libDir.exists()){
-                libDir.mkdir();
+                Utils.mkDirs(libDir);
             }
 

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

@@ -56 +56 @@
 
             // Add layer:
-            Main.main.addLayer(layer);
+            Main.getLayerManager().addLayer(layer);
             BoundingXYVisitor boundingXYVisitor = new BoundingXYVisitor();
             layer.visitBoundingBox(boundingXYVisitor);

applications/editors/josm/plugins/ImportImagePlugin/test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin/GeoTiffReaderTest.java

@@ -14 +14 @@
 
 import org.geotools.coverage.grid.GridCoverage2D;
-import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
@@ -32 +31 @@
     @Rule
     public JOSMTestRules rules = new JOSMTestRules().preferences();
-
-    @Before
-    public void setUp() throws Exception {
-        new ImportImagePlugin(null);
-    }
 
     @Test