Ticket #10812: patch10812.patch

src/org/openstreetmap/josm/gui/MainApplication.java

@@ -68 +68 @@
 import org.openstreetmap.josm.tools.PlatformHookWindows;
 import org.openstreetmap.josm.tools.Utils;
 
+
+import org.openstreetmap.gui.jmapviewer.tilesources.BingAerialTileSource;
+import org.openstreetmap.josm.data.imagery.ImageryInfo;
+
+import org.openstreetmap.josm.gui.layer.TMSLayer;
+import org.openstreetmap.gui.jmapviewer.interfaces.TileSource;
+
+
+
 /**
  * Main window class application.
  *
@@ -278 +287 @@
      * Main application Startup
      * @param argArray Command-line arguments
      */
-    public static void main(final String[] argArray) {
+    public static void main(final String[] argArray) throws Exception {
+
+
+
         I18n.init();
         Main.checkJavaVersion();
 

src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -321 +321 @@
         class BingAttributionData extends CacheCustomContent<IOException> {
 
             public BingAttributionData() {
-                super("bing.attribution.xml", CacheCustomContent.INTERVAL_HOURLY);
+                super("bing.attribution.xml", CacheCustomContent.INTERVAL_NEVER);
             }
 
             @Override

src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java

@@ -15 +15 @@
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
 import java.awt.image.BufferedImage;
+import java.awt.datatransfer.*;
+import java.awt.Toolkit;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
 import java.io.File;
@@ -755 +757 @@
         }
     }
 
+    public void copyCurrentPhotoPath() {
+        ImageEntry toCopy = null;
+        if (data != null && data.size() > 0 && currentPhoto >= 0 && currentPhoto < data.size()) {
+            toCopy = data.get(currentPhoto);
+            String copyString = toCopy.getFile().toString();
+                        StringSelection stringSelection = new StringSelection(copyString);
+                        Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard ();
+                        clpbrd.setContents (stringSelection, null);
+                }
+        }
+        
     /**
      * Removes a photo from the list of images by index.
      * @param idx Image index

src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -42 +42 @@
     private static final String COMMAND_COLLAPSE = "collapse";
     private static final String COMMAND_FIRST = "first";
     private static final String COMMAND_LAST = "last";
+    private static final String COMMAND_COPY_PATH = "copypath";
 
     private ImageDisplay imgDisplay = new ImageDisplay();
     private boolean centerView = false;
@@ -111 +112 @@
         btnDeleteFromDisk.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scDeleteFromDisk.getKeyStroke(), ADELFROMDISK);
         btnDeleteFromDisk.getActionMap().put(ADELFROMDISK, delFromDiskAction);
 
+        ImageAction copyPathAction = new ImageAction(COMMAND_COPY_PATH, ImageProvider.get("", "copy"), tr("Copy image path"));
+        JButton btnCopyPath = new JButton(copyPathAction);
+        btnCopyPath.setPreferredSize(buttonDim);
+        Shortcut scCopyPath = Shortcut.registerShortcut(
+                "geoimage:copypath", tr("Geoimage: {0}", tr("Copy image path")), KeyEvent.VK_C, Shortcut.CTRL_SHIFT);
+        final String ACOPYPATH = "Copy image path";
+        Main.registerActionShortcut(copyPathAction, scCopyPath);
+        btnDeleteFromDisk.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(scCopyPath.getKeyStroke(), ACOPYPATH);
+        btnDeleteFromDisk.getActionMap().put(ADELFROMDISK, copyPathAction);
+
         ImageAction nextAction = new ImageAction(COMMAND_NEXT, ImageProvider.get("dialogs", "next"), tr("Next"));
         btnNext = new JButton(nextAction);
         btnNext.setPreferredSize(buttonDim);
@@ -152 +163 @@
         buttons.add(Box.createRigidArea(new Dimension(14, 0)));
         buttons.add(btnDelete);
         buttons.add(btnDeleteFromDisk);
+        buttons.add(Box.createRigidArea(new Dimension(14, 0)));
+        buttons.add(btnCopyPath);
 
         JPanel bottomPane = new JPanel();
         bottomPane.setLayout(new GridBagLayout());
@@ -221 +234 @@
                 if (currentLayer != null) {
                     currentLayer.removeCurrentPhotoFromDisk();
                 }
+            } else if (COMMAND_COPY_PATH.equals(action)) {
+                if (currentLayer != null) {
+                    currentLayer.copyCurrentPhotoPath();
+                }
             } else if (COMMAND_COLLAPSE.equals(action)) {
                 collapseButtonClicked = true;
                 detachedDialog.getToolkit().getSystemEventQueue().postEvent(new WindowEvent(detachedDialog, WindowEvent.WINDOW_CLOSING));