Index: /applications/editors/josm/plugins/photo_geotagging/build.xml
===================================================================
--- /applications/editors/josm/plugins/photo_geotagging/build.xml	(revision 27400)
+++ /applications/editors/josm/plugins/photo_geotagging/build.xml	(revision 27401)
@@ -27,5 +27,5 @@
     <property name="commit.message" value="fixed josm bug 5800 - 'Override old backup files?' message window can't get focus"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="4549"/>
+    <property name="plugin.main.version" value="4762"/>
 
     <!--
Index: /applications/editors/josm/plugins/photo_geotagging/photo_geotaging.launch
===================================================================
--- /applications/editors/josm/plugins/photo_geotagging/photo_geotaging.launch	(revision 27401)
+++ /applications/editors/josm/plugins/photo_geotagging/photo_geotaging.launch	(revision 27401)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/JOSM/src/org/openstreetmap/josm/gui/MainApplication.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 6"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.openstreetmap.josm.gui.MainApplication"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="photo_geotaging"/>
+</launchConfiguration>
Index: /applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java
===================================================================
--- /applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java	(revision 27400)
+++ /applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java	(revision 27401)
@@ -38,5 +38,4 @@
 import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
 import org.openstreetmap.josm.gui.layer.geoimage.ImageEntry;
-import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -46,5 +45,5 @@
  */
 class GeotaggingAction extends AbstractAction implements LayerAction {
-    
+
     final static boolean debug = false;
     final static String KEEP_BACKUP = "plugins.photo_geotagging.keep_backup";
@@ -58,5 +57,6 @@
     }
 
-    public void actionPerformed(ActionEvent arg0) {
+    @Override
+	public void actionPerformed(ActionEvent arg0) {
 
         GeoImageLayer layer = getLayer();
@@ -112,5 +112,6 @@
 
         setMTime.addActionListener(new ActionListener(){
-            public void actionPerformed(ActionEvent e) {
+            @Override
+			public void actionPerformed(ActionEvent e) {
                 if (setMTime.isSelected()) {
                     mTimeMode.setEnabled(true);
@@ -228,5 +229,6 @@
                     // need this so the dialogs don't block
                     SwingUtilities.invokeLater(new Runnable() {
-                        public void run() {
+                        @Override
+						public void run() {
                             JOptionPane.showMessageDialog(Main.parent, ioe.getMessage(), tr("Error"), JOptionPane.ERROR_MESSAGE);
                         }
@@ -276,7 +278,7 @@
             File fileTmp;
             //fileTmp = File.createTempFile("img", ".jpg", file.getParentFile());
-            // on win32, file.renameTo(fileTmp) does not work when the destination file exists 
+            // on win32, file.renameTo(fileTmp) does not work when the destination file exists
             // see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4017593
-            // so we cannot use createTempFile(), which would create that "existing destination file" 
+            // so we cannot use createTempFile(), which would create that "existing destination file"
             // instead, let's use new File(), which doesn't actually create a file
             // for getting a unique file name, we use UUID.randomUUID()
@@ -298,9 +300,10 @@
             try {
                 SwingUtilities.invokeAndWait(new Runnable() {
-                    public void run() {
+                    @Override
+					public void run() {
                         JLabel l = new JLabel(tr("<html><h3>There are old backup files in the image directory!</h3>"));
                         l.setIcon(UIManager.getIcon("OptionPane.warningIcon"));
                         int override = new ExtendedDialog(
-                                Main.parent,
+                                progressMonitor.getWindowParent(),
                                 tr("Override old backup files?"),
                                 new String[] {tr("Cancel"), tr("Keep old backups and continue"), tr("Override")})
@@ -375,5 +378,6 @@
     }
 
-    public Component createMenuComponent() {
+    @Override
+	public Component createMenuComponent() {
         JMenuItem geotaggingItem = new JMenuItem(this);
         geotaggingItem.setEnabled(enabled(getLayer()));
@@ -381,5 +385,6 @@
     }
 
-    public boolean supportLayers(List<Layer> layers) {
+    @Override
+	public boolean supportLayers(List<Layer> layers) {
         return layers.size() == 1 && layers.get(0) instanceof GeoImageLayer;
     }