Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/GenericPicTransformAction.java
===================================================================
--- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/GenericPicTransformAction.java	(revision 33148)
+++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/actions/GenericPicTransformAction.java	(revision 33384)
@@ -79,5 +79,5 @@
             prevMousePoint = new Point(e.getPoint());
             prevEastNorth = Main.map.mapView.getEastNorth(e.getX(), e.getY());
-            Main.map.mapView.repaint();
+            currentLayer.invalidate();
         }
     }
@@ -102,6 +102,6 @@
         if (active instanceof PicLayerAbstract) {
             ((PicLayerAbstract) active).setDrawPoints(value);
+            active.invalidate();
         }
-        Main.map.mapView.repaint();
     }
 }
Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/command/TransformCommand.java
===================================================================
--- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/command/TransformCommand.java	(revision 33148)
+++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/command/TransformCommand.java	(revision 33384)
@@ -36,5 +36,5 @@
     public boolean executeCommand() {
         placeTransform(afterTransform);
-        Main.map.mapView.repaint();
+        layer.invalidate();
         return true;
     }
@@ -43,5 +43,5 @@
     public void undoCommand() {
         placeTransform(beforeTransform);
-        Main.map.mapView.repaint();
+        layer.invalidate();
     }
 
Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java
===================================================================
--- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java	(revision 33148)
+++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/layer/PicLayerAbstract.java	(revision 33384)
@@ -462,5 +462,5 @@
 
         // Refresh
-        Main.map.mapView.repaint();
+        invalidate();
     }
 
@@ -497,5 +497,5 @@
 
             initialImageScale = 1;
-            Main.map.mapView.repaint();
+            invalidate();
         }
     }