Changeset 27401 in osm
- Timestamp:
- 2012-01-04T08:45:12+01:00 (13 years ago)
- Location:
- applications/editors/josm/plugins/photo_geotagging
- Files:
-
- 1 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
applications/editors/josm/plugins/photo_geotagging/build.xml
r27019 r27401 27 27 <property name="commit.message" value="fixed josm bug 5800 - 'Override old backup files?' message window can't get focus"/> 28 28 <!-- enter the *lowest* JOSM version this plugin is currently compatible with --> 29 <property name="plugin.main.version" value="4 549"/>29 <property name="plugin.main.version" value="4762"/> 30 30 31 31 <!-- -
applications/editors/josm/plugins/photo_geotagging/src/org/openstreetmap/josm/plugins/photo_geotagging/GeotaggingAction.java
r27370 r27401 38 38 import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer; 39 39 import org.openstreetmap.josm.gui.layer.geoimage.ImageEntry; 40 import org.openstreetmap.josm.gui.progress.PleaseWaitProgressMonitor;41 40 import org.openstreetmap.josm.tools.GBC; 42 41 import org.openstreetmap.josm.tools.ImageProvider; … … 46 45 */ 47 46 class GeotaggingAction extends AbstractAction implements LayerAction { 48 47 49 48 final static boolean debug = false; 50 49 final static String KEEP_BACKUP = "plugins.photo_geotagging.keep_backup"; … … 58 57 } 59 58 60 public void actionPerformed(ActionEvent arg0) { 59 @Override 60 public void actionPerformed(ActionEvent arg0) { 61 61 62 62 GeoImageLayer layer = getLayer(); … … 112 112 113 113 setMTime.addActionListener(new ActionListener(){ 114 public void actionPerformed(ActionEvent e) { 114 @Override 115 public void actionPerformed(ActionEvent e) { 115 116 if (setMTime.isSelected()) { 116 117 mTimeMode.setEnabled(true); … … 228 229 // need this so the dialogs don't block 229 230 SwingUtilities.invokeLater(new Runnable() { 230 public void run() { 231 @Override 232 public void run() { 231 233 JOptionPane.showMessageDialog(Main.parent, ioe.getMessage(), tr("Error"), JOptionPane.ERROR_MESSAGE); 232 234 } … … 276 278 File fileTmp; 277 279 //fileTmp = File.createTempFile("img", ".jpg", file.getParentFile()); 278 // on win32, file.renameTo(fileTmp) does not work when the destination file exists 280 // on win32, file.renameTo(fileTmp) does not work when the destination file exists 279 281 // see http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=4017593 280 // so we cannot use createTempFile(), which would create that "existing destination file" 282 // so we cannot use createTempFile(), which would create that "existing destination file" 281 283 // instead, let's use new File(), which doesn't actually create a file 282 284 // for getting a unique file name, we use UUID.randomUUID() … … 298 300 try { 299 301 SwingUtilities.invokeAndWait(new Runnable() { 300 public void run() { 302 @Override 303 public void run() { 301 304 JLabel l = new JLabel(tr("<html><h3>There are old backup files in the image directory!</h3>")); 302 305 l.setIcon(UIManager.getIcon("OptionPane.warningIcon")); 303 306 int override = new ExtendedDialog( 304 Main.parent,307 progressMonitor.getWindowParent(), 305 308 tr("Override old backup files?"), 306 309 new String[] {tr("Cancel"), tr("Keep old backups and continue"), tr("Override")}) … … 375 378 } 376 379 377 public Component createMenuComponent() { 380 @Override 381 public Component createMenuComponent() { 378 382 JMenuItem geotaggingItem = new JMenuItem(this); 379 383 geotaggingItem.setEnabled(enabled(getLayer())); … … 381 385 } 382 386 383 public boolean supportLayers(List<Layer> layers) { 387 @Override 388 public boolean supportLayers(List<Layer> layers) { 384 389 return layers.size() == 1 && layers.get(0) instanceof GeoImageLayer; 385 390 }
Note:
See TracChangeset
for help on using the changeset viewer.