Changeset 33864 in osm for applications

Timestamp:

2017-11-22T00:18:31+01:00 (7 years ago)

Author:

donvip

Message:

fix deprecation warnings

Location:

applications/editors/josm/plugins/ImportImagePlugin/test/unit/org/openstreetmap/josm/plugins/ImportImagePlugin

Files:

• GeoTiffReaderTest.java (modified) (2 diffs)
• ImageLayerTest.java (modified) (2 diffs)

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

@@ -17 +17 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
 import org.openstreetmap.josm.testutils.JOSMTestRules;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -37 +37 @@
         for (Path p : listDataFiles("tif")) {
             File file = p.toFile();
-            Main.info("Testing reading file "+file.getPath());
+            Logging.info("Testing reading file "+file.getPath());
             GridCoverage2D grid = PluginOperations.createGridFromFile(file, null, false);
             assertNotNull(grid);

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

@@ -10 +10 @@
 import org.junit.Rule;
 import org.junit.Test;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.TestUtils;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.io.OsmReader;
@@ -34 +34 @@
     @Test
     public void testTicket14894() throws Exception {
-        assertTrue(Main.getLayerManager().getLayers().isEmpty());
+        assertTrue(MainApplication.getLayerManager().getLayers().isEmpty());
         // Step 1: add .osm layer
         try (InputStream in = TestUtils.getRegressionDataStream(14894, "14894.osm")) {
-            Main.getLayerManager().addLayer(new OsmDataLayer(OsmReader.parseDataSet(in, null), "14894", null));
+            MainApplication.getLayerManager().addLayer(new OsmDataLayer(OsmReader.parseDataSet(in, null), "14894", null));
         }
         // Step 2: try to import image
-        Main.getLayerManager().addLayer(new ImageLayer(new File(TestUtils.getRegressionDataFile(14894, "14894.png"))));
-        assertEquals(2, Main.getLayerManager().getLayers().size());
+        MainApplication.getLayerManager().addLayer(new ImageLayer(new File(TestUtils.getRegressionDataFile(14894, "14894.png"))));
+        assertEquals(2, MainApplication.getLayerManager().getLayers().size());
     }
 }