Index: applications/editors/josm/plugins/piclayer/.classpath
===================================================================
--- applications/editors/josm/plugins/piclayer/.classpath	(revision 18597)
+++ applications/editors/josm/plugins/piclayer/.classpath	(revision 18597)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
+	<classpathentry kind="output" path="build"/>
+</classpath>
Index: applications/editors/josm/plugins/piclayer/.project
===================================================================
--- applications/editors/josm/plugins/piclayer/.project	(revision 18597)
+++ applications/editors/josm/plugins/piclayer/.project	(revision 18597)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>JOSM-piclayer</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
Index: applications/editors/josm/plugins/piclayer/build.xml
===================================================================
--- applications/editors/josm/plugins/piclayer/build.xml	(revision 18505)
+++ applications/editors/josm/plugins/piclayer/build.xml	(revision 18597)
@@ -81,5 +81,5 @@
                 <attribute name="Plugin-Date" value="${version.entry.commit.date}"/>
                 <attribute name="Plugin-Description" value="This plugin allows to display any picture as a background in the editor and align it with the map."/>
-                <attribute name="Plugin-Mainversion" value="2393"/>
+                <attribute name="Plugin-Mainversion" value="2450"/>
                 <attribute name="Plugin-Version" value="${version.entry.commit.revision}"/>
             </manifest>
Index: applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java
===================================================================
--- applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java	(revision 18505)
+++ applications/editors/josm/plugins/piclayer/src/org/openstreetmap/josm/plugins/piclayer/PicLayerAbstract.java	(revision 18597)
@@ -37,7 +37,8 @@
 import javax.swing.JSeparator;
 
+import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.MapView;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -70,5 +71,5 @@
     // Layer icon
     private Icon m_layericon = null;
-    
+
     // Keys for saving in Properties
     private final String INITIAL_POS_X = "INITIAL_POS_X";
@@ -186,7 +187,7 @@
 
     @Override
-    public void paint(Graphics arg0, MapView arg1) {
-
-        if ( m_image != null && arg0 instanceof Graphics2D) {
+    public void paint(Graphics2D g2, MapView mv, Bounds bounds) {
+
+        if ( m_image != null && g2 instanceof Graphics2D) {
 
             // Position image at the right graphical place
@@ -200,5 +201,5 @@
 
             // Let's use Graphics 2D
-            Graphics2D g = (Graphics2D)arg0.create();
+            Graphics2D g = (Graphics2D)g2.create();
             // Move
             g.translate( pic_offset_x, pic_offset_y );
@@ -294,5 +295,5 @@
     	props.put(ANGLE, "" + m_angle);
     }
-    
+
     /**
      * Loads calibration data from properties structure