Index: /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java
===================================================================
--- /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java	(revision 33924)
+++ /applications/editors/josm/plugins/OsmInspectorPlugin/src/org/openstreetmap/josm/plugins/osminspector/OsmInspectorLayer.java	(revision 33925)
@@ -53,8 +53,10 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
 import org.openstreetmap.josm.plugins.osminspector.gui.OsmInspectorDialog;
 import org.openstreetmap.josm.tools.ImageProvider;
+import org.openstreetmap.josm.tools.Logging;
 
 import com.vividsolutions.jts.geom.Envelope;
@@ -62,5 +64,4 @@
 import com.vividsolutions.jts.io.ParseException;
 
-@SuppressWarnings({ "deprecation"})
 public class OsmInspectorLayer extends Layer {
 
@@ -366,5 +367,5 @@
 			setGeometry(selectGeomType, typeName);
 
-			Main.info("Osm Inspector Features size: " + features.size());
+			Logging.info("Osm Inspector Features size: " + features.size());
 			Style style = createDefaultStyle(idx, selectedFeatures);
 
@@ -410,5 +411,5 @@
 		selectGeomType.add(GeomType.POINT);
 
-		ProgressMonitor monitor = new ProgressMonitor(Main.map.mapView,
+		ProgressMonitor monitor = new ProgressMonitor(MainApplication.getMap().mapView,
 				"Loading features", "", 0, 100);
 
@@ -422,5 +423,5 @@
 			setGeometry(selectGeomType, typeName);
 
-			Main.info("Osm Inspector Features size: " + features.size());
+			Logging.info("Osm Inspector Features size: " + features.size());
 
 			OSMIFeatureTracker tracker = arrFeatures.get(idx - layerOffset);
@@ -512,5 +513,5 @@
 
 	private void setGeometry(ArrayList<GeomType> selectedTypes, String typename) {
-	    Main.info("Passed type is" + typename);
+	    Logging.info("Passed type is" + typename);
 		if (typename.compareTo("duplicate_ways") == 0) {
 			geometryType = GeomType.LINE;
@@ -577,13 +578,12 @@
 	public void updateView() {
 		this.dialog.revalidate();
-		Main.map.mapView.revalidate();
-		Main.map.repaint();
+		invalidate();
 	}
 
 	public void selectFeatures(int x, int y) {
 		int pixelDelta = 2;
-		LatLon clickUL = Main.map.mapView.getLatLon(x - pixelDelta, y
+		LatLon clickUL = MainApplication.getMap().mapView.getLatLon(x - pixelDelta, y
 				- pixelDelta);
-		LatLon clickLR = Main.map.mapView.getLatLon(x + pixelDelta, y
+		LatLon clickLR = MainApplication.getMap().mapView.getLatLon(x + pixelDelta, y
 				+ pixelDelta);
 
@@ -618,5 +618,5 @@
 				try (FeatureIterator<SimpleFeature> iter = selectedFeatures.features()) {
     
-    				Main.info("Selected features " + selectedFeatures.size());
+    				Logging.info("Selected features " + selectedFeatures.size());
     
     				while (iter.hasNext()) {
@@ -630,5 +630,5 @@
 				content.addLayer(new FeatureLayer(features, style));
 			} catch (IOException e) {
-				Main.error(e);
+				Logging.error(e);
 			}
 		}
@@ -638,5 +638,5 @@
 
 	public void selectFeatures(LatLon center) {
-		Point point = Main.map.mapView.getPoint(center);
+		Point point = MainApplication.getMap().mapView.getPoint(center);
 		selectFeatures(point.x, point.y);
 	}