Changeset 33878 in osm for applications/editors

Timestamp:

2017-11-22T00:45:57+01:00 (7 years ago)

Author:

donvip

Message:

update to JOSM 12840

Location:

applications/editors/josm/plugins/photo_geotagging

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java (modified) (5 diffs)

applications/editors/josm/plugins/photo_geotagging/build.xml

@@ -5 +5 @@
     <property name="commit.message" value=""/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="10580"/>
+    <property name="plugin.main.version" value="12840"/>
 
     <property name="plugin.author" value="Paul Hartmann"/>

applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java

@@ -35 +35 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.dialogs.LayerListDialog;
@@ -44 +45 @@
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.JosmRuntimeException;
+import org.openstreetmap.josm.tools.Logging;
 
 /**
@@ -144 +146 @@
         final boolean keep_backup = backups.isSelected();
         final boolean change_mtime = setMTime.isSelected();
-        Main.pref.put(KEEP_BACKUP, keep_backup);
-        Main.pref.put(CHANGE_MTIME, change_mtime);
+        Main.pref.putBoolean(KEEP_BACKUP, keep_backup);
+        Main.pref.putBoolean(CHANGE_MTIME, change_mtime);
         if (change_mtime) {
             String mTimeModePref;
@@ -161 +163 @@
         }
 
-        Main.worker.execute(new GeoTaggingRunnable(images, keep_backup, mTimeMode.getSelectedIndex()));
+        MainApplication.worker.execute(new GeoTaggingRunnable(images, keep_backup, mTimeMode.getSelectedIndex()));
     }
 
@@ -330 +332 @@
                 Files.move(file.toPath(), fileTmp.toPath());
             } catch (IOException e) {
-                Main.error(tr("Could not rename file {0} to {1}!", file, fileTmp));
+                Logging.error(tr("Could not rename file {0} to {1}!", file, fileTmp));
                 throw e;
             }