Changeset 31515 in osm for applications/editors

Timestamp:

2015-08-21T20:44:37+02:00 (9 years ago)

Author:

nokutu

Message:

Code improved, typos corrected and small enhances

Location:

applications/editors/josm/plugins/mapillary

Files:

• src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadViewAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/gui/FinishedUploadDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageDisplay.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java (modified) (8 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryUploadDialog.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/io (added)
• src/org/openstreetmap/josm/plugins/mapillary/io/download (added)
• src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryDownloader.java (moved) (moved from applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryDownloader.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryImageInfoDownloadThread.java (moved) (moved from applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryImageInfoDownloadThread.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillarySequenceDownloadThread.java (moved) (moved from applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThread.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillarySquareDownloadManagerThread.java (moved) (moved from applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySquareDownloadManagerThread.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryTrafficSignDownloadThread.java (moved) (moved from applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryTrafficSignDownloadThread.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/io/export (added)
• src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportDownloadThread.java (moved) (moved from applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportDownloadThread.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportManager.java (moved) (moved from applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportManager.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportWriterThread.java (moved) (moved from applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/downloads/MapillaryExportWriterThread.java ) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/oauth/MapillaryUser.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListener.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/mapillary/utils/PluginState.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThreadTest.java (modified) (2 diffs)

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java

@@ -9 +9 @@
 
 /**
- * Abstract superclass for all image objects. At the moment there is just 2,
+ * Abstract superclass for all image objects. At the moment there are just 2,
  * {@link MapillaryImportedImage} and {@link MapillaryImage}.
  *

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java

@@ -52 +52 @@
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
 import org.openstreetmap.josm.plugins.mapillary.cache.CacheUtils;
-import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryDownloader;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryFilterDialog;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryMainDialog;
 import org.openstreetmap.josm.plugins.mapillary.history.MapillaryRecord;
 import org.openstreetmap.josm.plugins.mapillary.history.commands.CommandDelete;
+import org.openstreetmap.josm.plugins.mapillary.io.download.MapillaryDownloader;
 import org.openstreetmap.josm.plugins.mapillary.mode.AbstractMode;
 import org.openstreetmap.josm.plugins.mapillary.mode.JoinMode;
@@ -312 +312 @@
         continue;
       Point p = mv.getPoint(imageAbs.getLatLon());
-
       Point nextp = null;
       // Draw sequence line
@@ -327 +326 @@
           g.drawLine(p.x, p.y, nextp.x, nextp.y);
       }
-
+      // Draws icons
       if (imageAbs instanceof MapillaryImage) {
         MapillaryImage image = (MapillaryImage) imageAbs;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java

@@ -25 +25 @@
 import org.openstreetmap.josm.plugins.mapillary.actions.MapillaryWalkAction;
 import org.openstreetmap.josm.plugins.mapillary.actions.MapillaryZoomAction;
-import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryDownloader;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryFilterDialog;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryHistoryDialog;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryMainDialog;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryPreferenceSetting;
+import org.openstreetmap.josm.plugins.mapillary.io.download.MapillaryDownloader;
 import org.openstreetmap.josm.plugins.mapillary.oauth.MapillaryUser;
 import org.openstreetmap.josm.tools.ImageProvider;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadViewAction.java

@@ -7 +7 @@
 
 import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryDownloader;
+import org.openstreetmap.josm.plugins.mapillary.io.download.MapillaryDownloader;
 import org.openstreetmap.josm.tools.ImageProvider;
 import org.openstreetmap.josm.tools.Shortcut;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java

@@ -22 +22 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin;
-import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryExportManager;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryExportDialog;
+import org.openstreetmap.josm.plugins.mapillary.io.export.MapillaryExportManager;
 import org.openstreetmap.josm.tools.Shortcut;
 

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

@@ -52 +52 @@
       }
     }
-
   }
-
 }

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

@@ -92 +92 @@
         this.mousePointInImg = comp2imgCoord(visibleRect, e.getX(), e.getY());
       }
-      // Applicate the zoom to the visible rectangle in image coordinates
+      // Set the zoom to the visible rectangle in image coordinates
       if (e.getWheelRotation() > 0) {
         visibleRect.width = visibleRect.width * 3 / 2;

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

@@ -20 +20 @@
 import org.openstreetmap.josm.gui.preferences.TabPreferenceSetting;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryPlugin;
-import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryDownloader;
+import org.openstreetmap.josm.plugins.mapillary.io.download.MapillaryDownloader;
 import org.openstreetmap.josm.plugins.mapillary.oauth.MapillaryUser;
 import org.openstreetmap.josm.plugins.mapillary.oauth.OAuthPortListener;
@@ -52 +52 @@
   public void addGui(PreferenceTabbedPane gui) {
     JPanel panel = new JPanel();
-
     this.reverseButtons.setSelected(Main.pref
         .getBoolean("mapillary.reverse-buttons"));
@@ -60 +59 @@
     this.moveTo.setSelected(Main.pref.getBoolean("mapillary.move-to-picture",
         true));
-
     panel.setLayout(new FlowLayout(FlowLayout.LEFT));
     panel.add(this.reverseButtons);
-
     // Sets the value of the ComboBox.
     if (Main.pref.get("mapillary.download-mode").equals(
@@ -78 +75 @@
     downloadModePanel.add(this.downloadMode);
     panel.add(downloadModePanel);
-
     panel.add(this.displayHour);
     panel.add(this.format24);
@@ -88 +84 @@
       this.login.setText("Logged as: " + MapillaryUser.getUsername()
           + ". Click to relogin.");
-
     panel.add(this.login);
     if (MapillaryUser.getUsername() != null) {
       JButton logout = new JButton(new LogoutAction());
       logout.setText("Logout");
-
       panel.add(logout);
     }
@@ -117 +111 @@
       MapillaryPlugin.setMenuEnabled(MapillaryPlugin.DOWNLOAD_VIEW_MENU, true);
     }
-
     Main.pref.put("mapillary.display-hour", this.displayHour.isSelected());
     Main.pref.put("mapillary.format-24", this.format24.isSelected());
@@ -143 +136 @@
       OAuthPortListener portListener = new OAuthPortListener();
       portListener.start();
-
       String url = "http://www.mapillary.com/connect?redirect_uri=http:%2F%2Flocalhost:8763%2F&client_id=T1Fzd20xZjdtR0s1VDk5OFNIOXpYdzoxNDYyOGRkYzUyYTFiMzgz&response_type=token&scope=user:read%20public:upload%20public:write";
       try {
@@ -170 +162 @@
     }
   }
-
 }

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

@@ -16 +16 @@
 
 /**
+ * JPanel used when uploading pictures.
+ *
  * @author nokutu
  *
@@ -31 +33 @@
 
   /**
-   * Main constructor.
+   * Creates the JPanel and adds the needed elements.
    */
   public MapillaryUploadDialog() {
@@ -37 +39 @@
     if (MapillaryUser.getUsername() != null) {
       this.group = new ButtonGroup();
-
       this.sequence = new JRadioButton(tr("Upload selected sequence"));
       if (MapillaryLayer.getInstance().getData().getSelectedImage() == null
@@ -45 +46 @@
       add(this.sequence);
       this.group.setSelected(this.sequence.getModel(), true);
-
       this.delete = new JCheckBox(tr("Delete after upload"));
       this.delete.setSelected(Main.pref.getBoolean(
           "mapillary.delete-after-upload", true));
       add(this.delete);
-    } else {
-      this.add(new JLabel("Go to setting and log in to Mapillary before uploading."));
-    }
+    } else
+      this.add(new JLabel(
+          "Go to setting and log in to Mapillary before uploading."));
   }
 }

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

@@ -1 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.download;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryImageInfoDownloadThread.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.download;
 
 import java.io.BufferedReader;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillarySequenceDownloadThread.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.download;
 
 import java.io.BufferedReader;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillarySquareDownloadManagerThread.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.download;
 
 import java.io.UnsupportedEncodingException;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/download/MapillaryTrafficSignDownloadThread.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.download;
 
 import java.io.BufferedReader;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportDownloadThread.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.export;
 
 import java.awt.image.BufferedImage;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportManager.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.export;
 
 import static org.openstreetmap.josm.tools.I18n.tr;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/io/export/MapillaryExportWriterThread.java

@@ -1 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.export;
 
 import java.awt.image.BufferedImage;

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java

@@ -14 +14 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryData;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
-import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryDownloader;
+import org.openstreetmap.josm.plugins.mapillary.io.download.MapillaryDownloader;
 
 /**

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java

@@ -36 +36 @@
   private MapillaryAbstractImage lastClicked;
   private MapillaryRecord record;
-
   private boolean nothingHighlighted;
   private boolean imageHighlighted = false;

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

@@ -51 +51 @@
       return null;
     HashMap<String, String> hash = new HashMap<>();
-    if (images_hash == null)
-      try {
+    try {
+      if (images_hash == null)
         images_hash = OAuthUtils
             .getWithHeader(
@@ -58 +58 @@
                     "https://a.mapillary.com/v2/me/uploads/secrets?client_id=T1Fzd20xZjdtR0s1VDk5OFNIOXpYdzoxNDYyOGRkYzUyYTFiMzgz"))
             .getString("images_hash");
-      } catch (IOException e) {
-        Main.error(e);
-        isTokenValid = false;
-      }
-    hash.put("images_hash", images_hash);
-    if (images_policy == null)
-      try {
+      hash.put("images_hash", images_hash);
+      if (images_policy == null)
         images_policy = OAuthUtils
             .getWithHeader(
@@ -70 +65 @@
                     "https://a.mapillary.com/v2/me/uploads/secrets?client_id=T1Fzd20xZjdtR0s1VDk5OFNIOXpYdzoxNDYyOGRkYzUyYTFiMzgz"))
             .getString("images_policy");
-      } catch (IOException e) {
-        Main.error(e);
-        isTokenValid = false;
-      }
+    } catch (IOException e) {
+      Main.error(e);
+      isTokenValid = false;
+    }
     hash.put("images_policy", images_policy);
     return hash;
@@ -85 +80 @@
     images_policy = null;
     images_hash = null;
-    isTokenValid = true;
+    isTokenValid = false;
+    Main.pref.put("mapillary.access-token", null);
   }
 }

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

@@ -63 +63 @@
           + accessToken);
       // Saves the access token in preferences.
+      MapillaryUser.isTokenValid = true;
       if (Main.main != null) {
         Main.pref.put("mapillary.access-token", accessToken);

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

@@ -189 +189 @@
     ImageIO.write(image.getImage(), "jpg", outputStream);
     byte[] imageBytes = outputStream.toByteArray();
-
     new ExifRewriter().updateExifMetadataLossless(imageBytes, os, outputSet);
-
     return tempFile;
   }
@@ -203 +201 @@
   public static void upload(MapillaryImportedImage image) {
     upload(image, UUID.randomUUID());
-
   }
 
@@ -228 +225 @@
     hash.put("signature", signature);
     hash.put("Content-Type", "image/jpeg");
-
     try {
       uploadFile(updateFile(image), hash);
@@ -257 +253 @@
     }
     entityBuilder.addPart("file", new FileBody(file));
-
     HttpEntity entity = entityBuilder.build();
     httpPost.setEntity(entity);

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary/utils/PluginState.java

@@ -99 +99 @@
 
   /**
-   * Returns the string to be written in the status bar.
+   * Returns the text to be written in the status bar.
    *
-   * @return The String that is going to be written in the status bar.
+   * @return The {@code String} that is going to be written in the status bar.
    */
   public static String getUploadString() {

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

@@ -15 +15 @@
 import org.openstreetmap.josm.plugins.mapillary.AbstractTest;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
-import org.openstreetmap.josm.plugins.mapillary.downloads.MapillaryDownloader;
-import org.openstreetmap.josm.plugins.mapillary.downloads.MapillarySequenceDownloadThread;
+import org.openstreetmap.josm.plugins.mapillary.io.download.MapillaryDownloader;
+import org.openstreetmap.josm.plugins.mapillary.io.download.MapillarySequenceDownloadThread;
 
 /**
@@ -25 +25 @@
   /**
    * Test method for
-   * {@link org.openstreetmap.josm.plugins.mapillary.downloads.MapillarySequenceDownloadThread#run()}
+   * {@link org.openstreetmap.josm.plugins.mapillary.io.download.MapillarySequenceDownloadThread#run()}
    * .
    *