Changeset 31454 in osm

Timestamp:

2015-08-05T11:46:28+02:00 (9 years ago)

Author:

nokutu

Message:

• Right click on "View in website" label allows the user to copy the key of the selected image to clipboard.
• New test for upload.

Location:

applications/editors/josm/plugins/mapillary

Files:

• src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthUtils.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/plugins/mapillary/UploadTest.java (added)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java

@@ -157 +157 @@
   private static boolean isAreaTooBig() {
     double area = 0;
-    System.out.println(Main.map.mapView.getLayersOfType(OsmDataLayer.class));
     for (Bounds bounds : Main.map.mapView.getEditLayer().data
         .getDataSourceBounds()) {

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/HyperlinkLabel.java

@@ -5 +5 @@
 import java.awt.AWTEvent;
 import java.awt.Cursor;
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -14 +17 @@
 
 import javax.swing.JLabel;
+import javax.swing.JMenuItem;
+import javax.swing.JPopupMenu;
 import javax.swing.SwingConstants;
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.plugins.mapillary.MapillaryImage;
 
 import java.awt.Desktop;
@@ -84 +90 @@
    */
   @Override
-  protected void processMouseEvent(MouseEvent evt) {
-    super.processMouseEvent(evt);
-    if (evt.getID() == MouseEvent.MOUSE_CLICKED)
-      fireActionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED,
-          getNormalText()));
+  protected void processMouseEvent(MouseEvent e) {
+    super.processMouseEvent(e);
+    if (e.getID() == MouseEvent.MOUSE_CLICKED) {
+      if (e.getButton() == MouseEvent.BUTTON1)
+        fireActionPerformed(new ActionEvent(this, ActionEvent.ACTION_PERFORMED,
+            getNormalText()));
+      if (e.getButton() == MouseEvent.BUTTON3) {
+        LinkPopUp menu = new LinkPopUp();
+        menu.show(e.getComponent(), e.getX(), e.getY());
+      }
+    }
+  }
+
+  /**
+   * PopUp shown when right click on the label.
+   *
+   * @author nokutu
+   *
+   */
+  private class LinkPopUp extends JPopupMenu {
+
+    private static final long serialVersionUID = 1384054752970921552L;
+
+    JMenuItem copy;
+
+    public LinkPopUp() {
+      this.copy = new JMenuItem("Copy key");
+      this.copy.addActionListener(new copyAction());
+      add(this.copy);
+    }
+
+    private class copyAction implements ActionListener {
+
+      @Override
+      public void actionPerformed(ActionEvent arg0) {
+        StringSelection stringSelection = new StringSelection(
+            ((MapillaryImage) MapillaryMainDialog.getInstance().getImage())
+                .getKey());
+        Clipboard clpbrd = Toolkit.getDefaultToolkit().getSystemClipboard();
+        clpbrd.setContents(stringSelection, null);
+      }
+
+    }
   }
 

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryMainDialog.java

@@ -510 +510 @@
       });
     } else if (data != null && result == LoadResult.SUCCESS) {
-      System.out.println(attributes.getMetadata());
       try {
         BufferedImage img = ImageIO.read(new ByteArrayInputStream(data

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthUtils.java

@@ -167 +167 @@
     HttpResponse response = httpClient.execute(httpPost);
     if (response.getStatusLine().toString().contains("204")) {
-      System.out.println("Succesfully uploaded image");
       PluginState.imageUploaded();
     }
@@ -234 +233 @@
   }
 
-  private static File updateFile(MapillaryImportedImage image)
+  /**
+   * Returns a file containing the picture and an updated version of the EXIF
+   * tags.
+   *
+   * @param image
+   * @return A File object containing the picture and an updated version of the
+   *         EXIF tags.
+   * @throws ImageReadException
+   * @throws IOException
+   * @throws ImageWriteException
+   */
+  public static File updateFile(MapillaryImportedImage image)
       throws ImageReadException, IOException, ImageWriteException {
     TiffOutputSet outputSet = null;

applications/editors/josm/plugins/mapillary/test/unit/org/openstreetmap/josm/plugins/mapillary/MapillarySequenceDownloadThreadTest.java

@@ -10 +10 @@
 import java.util.concurrent.Executors;
 
-import org.junit.Before;
 import org.junit.Test;
 import org.openstreetmap.josm.data.Bounds;
@@ -16 +15 @@
 import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryDownloader;
 import org.openstreetmap.josm.plugins.mapillary.downloads.MapillarySequenceDownloadThread;
-import org.openstreetmap.josm.plugins.mapillary.util.TestUtil;
 
 /**