Code improved, typos corrected and small enhances

git-svn-id: http://svn.openstreetmap.org/applications/editors/josm/plugins/mapillary@31515 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
JOSM · Aug 21, 2015 · a6cf730 · a6cf730
1 parent 7e318d6
commit a6cf730
Show file tree

Hide file tree

Showing 24 changed files with 39 additions and 60 deletions.
diff --git a/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java b/src/org/openstreetmap/josm/plugins/mapillary/MapillaryAbstractImage.java
@@ -8,7 +8,7 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 
 /**
- * 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}.
  *
  * @author nokutu

diff --git a/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java b/src/org/openstreetmap/josm/plugins/mapillary/MapillaryLayer.java
@@ -51,11 +51,11 @@
 import org.openstreetmap.josm.gui.layer.Layer;
 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;
 import org.openstreetmap.josm.plugins.mapillary.mode.SelectMode;
@@ -311,7 +311,6 @@ public synchronized void paint(Graphics2D g, MapView mv, Bounds box) {
       if (!imageAbs.isVisible())
         continue;
       Point p = mv.getPoint(imageAbs.getLatLon());
-
       Point nextp = null;
       // Draw sequence line
       if (imageAbs.getSequence() != null) {
@@ -326,7 +325,7 @@ public synchronized void paint(Graphics2D g, MapView mv, Bounds box) {
         if (nextp != null)
           g.drawLine(p.x, p.y, nextp.x, nextp.y);
       }
-
+      // Draws icons
       if (imageAbs instanceof MapillaryImage) {
         MapillaryImage image = (MapillaryImage) imageAbs;
         ImageIcon icon;

diff --git a/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java b/src/org/openstreetmap/josm/plugins/mapillary/MapillaryPlugin.java
@@ -24,11 +24,11 @@
 import org.openstreetmap.josm.plugins.mapillary.actions.MapillaryUploadAction;
 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;
 

diff --git a/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadViewAction.java b/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryDownloadViewAction.java
@@ -6,7 +6,7 @@
 import java.awt.event.KeyEvent;
 
 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;
 

diff --git a/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java b/src/org/openstreetmap/josm/plugins/mapillary/actions/MapillaryExportAction.java
@@ -21,8 +21,8 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryImportedImage;
 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;
 
 /**

diff --git a/src/org/openstreetmap/josm/plugins/mapillary/gui/FinishedUploadDialog.java b/src/org/openstreetmap/josm/plugins/mapillary/gui/FinishedUploadDialog.java
@@ -51,7 +51,5 @@ public void actionPerformed(ActionEvent e) {
         Main.error(e1);
       }
     }
-
   }
-
 }
diff --git a/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageDisplay.java b/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryImageDisplay.java
@@ -91,7 +91,7 @@ public void mouseWheelMoved(MouseWheelEvent e) {
         this.lastTimeForMousePoint = e.getWhen();
         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;
         visibleRect.height = visibleRect.height * 3 / 2;

diff --git a/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java b/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryPreferenceSetting.java
@@ -19,7 +19,7 @@
 import org.openstreetmap.josm.gui.preferences.SubPreferenceSetting;
 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;
 import org.openstreetmap.josm.plugins.mapillary.utils.MapillaryUtils;
@@ -51,18 +51,15 @@ public TabPreferenceSetting getTabPreferenceSetting(PreferenceTabbedPane gui) {
   @Override
   public void addGui(PreferenceTabbedPane gui) {
     JPanel panel = new JPanel();
-
     this.reverseButtons.setSelected(Main.pref
         .getBoolean("mapillary.reverse-buttons"));
     this.displayHour.setSelected(Main.pref.getBoolean("mapillary.display-hour",
         true));
     this.format24.setSelected(Main.pref.getBoolean("mapillary.format-24"));
     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(
         MapillaryDownloader.MODES[0]))
@@ -77,7 +74,6 @@ public void addGui(PreferenceTabbedPane gui) {
     downloadModePanel.add(new JLabel(tr("Download mode: ")));
     downloadModePanel.add(this.downloadMode);
     panel.add(downloadModePanel);
-
     panel.add(this.displayHour);
     panel.add(this.format24);
     panel.add(this.moveTo);
@@ -87,12 +83,10 @@ public void addGui(PreferenceTabbedPane gui) {
     else
       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);
     }
     gui.getDisplayPreference().addSubTab(this, "Mapillary", panel);
@@ -116,7 +110,6 @@ public boolean ok() {
       Main.pref.put("mapillary.download-mode", MapillaryDownloader.MODES[2]);
       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());
     Main.pref.put("mapillary.move-to-picture", this.moveTo.isSelected());
@@ -142,7 +135,6 @@ public class LoginAction extends AbstractAction {
     public void actionPerformed(ActionEvent arg0) {
       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 {
         MapillaryUtils.browse(new URL(url));
@@ -169,5 +161,4 @@ public void actionPerformed(ActionEvent arg0) {
       MapillaryPreferenceSetting.this.login.setText("Login");
     }
   }
-
 }
diff --git a/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryUploadDialog.java b/src/org/openstreetmap/josm/plugins/mapillary/gui/MapillaryUploadDialog.java
@@ -15,6 +15,8 @@
 import org.openstreetmap.josm.plugins.mapillary.oauth.MapillaryUser;
 
 /**
+ * JPanel used when uploading pictures.
+ *
  * @author nokutu
  *
  */
@@ -30,27 +32,25 @@ public class MapillaryUploadDialog extends JPanel {
   public JCheckBox delete;
 
   /**
-   * Main constructor.
+   * Creates the JPanel and adds the needed elements.
    */
   public MapillaryUploadDialog() {
     setLayout(new BoxLayout(this, BoxLayout.PAGE_AXIS));
     if (MapillaryUser.getUsername() != null) {
       this.group = new ButtonGroup();
-
       this.sequence = new JRadioButton(tr("Upload selected sequence"));
       if (MapillaryLayer.getInstance().getData().getSelectedImage() == null
           || !(MapillaryLayer.getInstance().getData().getSelectedImage() instanceof MapillaryImportedImage))
         this.sequence.setEnabled(false);
       this.group.add(this.sequence);
       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."));
   }
 }
diff --git a/...illary/downloads/MapillaryDownloader.java → ...lary/io/download/MapillaryDownloader.java b/...illary/downloads/MapillaryDownloader.java → ...lary/io/download/MapillaryDownloader.java
@@ -1,4 +1,4 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.download;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 

diff --git a/...ads/MapillaryImageInfoDownloadThread.java → ...oad/MapillaryImageInfoDownloadThread.java b/...ads/MapillaryImageInfoDownloadThread.java → ...oad/MapillaryImageInfoDownloadThread.java
@@ -1,4 +1,4 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.download;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...oads/MapillarySequenceDownloadThread.java → ...load/MapillarySequenceDownloadThread.java b/...oads/MapillarySequenceDownloadThread.java → ...load/MapillarySequenceDownloadThread.java
@@ -1,4 +1,4 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.download;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...MapillarySquareDownloadManagerThread.java → ...MapillarySquareDownloadManagerThread.java b/...MapillarySquareDownloadManagerThread.java → ...MapillarySquareDownloadManagerThread.java
@@ -1,4 +1,4 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.download;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;

diff --git a/...s/MapillaryTrafficSignDownloadThread.java → ...d/MapillaryTrafficSignDownloadThread.java b/...s/MapillaryTrafficSignDownloadThread.java → ...d/MapillaryTrafficSignDownloadThread.java
@@ -1,4 +1,4 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.download;
 
 import java.io.BufferedReader;
 import java.io.IOException;

diff --git a/...nloads/MapillaryExportDownloadThread.java → ...export/MapillaryExportDownloadThread.java b/...nloads/MapillaryExportDownloadThread.java → ...export/MapillaryExportDownloadThread.java
@@ -1,4 +1,4 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.export;
 
 import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;

diff --git a/...ary/downloads/MapillaryExportManager.java → ...ary/io/export/MapillaryExportManager.java b/...ary/downloads/MapillaryExportManager.java → ...ary/io/export/MapillaryExportManager.java
@@ -1,4 +1,4 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.export;
 
 import static org.openstreetmap.josm.tools.I18n.tr;
 

diff --git a/...ownloads/MapillaryExportWriterThread.java → ...o/export/MapillaryExportWriterThread.java b/...ownloads/MapillaryExportWriterThread.java → ...o/export/MapillaryExportWriterThread.java
@@ -1,4 +1,4 @@
-package org.openstreetmap.josm.plugins.mapillary.downloads;
+package org.openstreetmap.josm.plugins.mapillary.io.export;
 
 import java.awt.image.BufferedImage;
 import java.io.BufferedOutputStream;

diff --git a/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java b/src/org/openstreetmap/josm/plugins/mapillary/mode/AbstractMode.java
@@ -13,7 +13,7 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryAbstractImage;
 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;
 
 /**
  * Superclass for all the mode of the {@link MapillaryLayer}.

diff --git a/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java b/src/org/openstreetmap/josm/plugins/mapillary/mode/SelectMode.java
@@ -35,7 +35,6 @@ public class SelectMode extends AbstractMode {
   private MapillaryAbstractImage closest;
   private MapillaryAbstractImage lastClicked;
   private MapillaryRecord record;
-
   private boolean nothingHighlighted;
   private boolean imageHighlighted = false;
 

diff --git a/src/org/openstreetmap/josm/plugins/mapillary/oauth/MapillaryUser.java b/src/org/openstreetmap/josm/plugins/mapillary/oauth/MapillaryUser.java
@@ -50,29 +50,24 @@ public static HashMap<String, String> getSecrets() {
     if (!isTokenValid)
       return null;
     HashMap<String, String> hash = new HashMap<>();
-    if (images_hash == null)
-      try {
+    try {
+      if (images_hash == null)
         images_hash = OAuthUtils
             .getWithHeader(
                 new URL(
                     "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(
                 new URL(
                     "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;
   }
@@ -84,6 +79,7 @@ public static void reset() {
     username = null;
     images_policy = null;
     images_hash = null;
-    isTokenValid = true;
+    isTokenValid = false;
+    Main.pref.put("mapillary.access-token", null);
   }
 }
diff --git a/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListener.java b/src/org/openstreetmap/josm/plugins/mapillary/oauth/OAuthPortListener.java
@@ -62,6 +62,7 @@ public void run() {
       Main.info("Successful login with Mapillary, the access token is: "
           + accessToken);
       // Saves the access token in preferences.
+      MapillaryUser.isTokenValid = true;
       if (Main.main != null) {
         Main.pref.put("mapillary.access-token", accessToken);
         Main.info("The username is: " + MapillaryUser.getUsername());

diff --git a/src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java b/src/org/openstreetmap/josm/plugins/mapillary/oauth/UploadUtils.java
@@ -188,9 +188,7 @@ public static File updateFile(MapillaryImportedImage image)
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
     ImageIO.write(image.getImage(), "jpg", outputStream);
     byte[] imageBytes = outputStream.toByteArray();
-
     new ExifRewriter().updateExifMetadataLossless(imageBytes, os, outputSet);
-
     return tempFile;
   }
 
@@ -202,7 +200,6 @@ public static File updateFile(MapillaryImportedImage image)
    */
   public static void upload(MapillaryImportedImage image) {
     upload(image, UUID.randomUUID());
-
   }
 
   /**
@@ -227,7 +224,6 @@ public static void upload(MapillaryImportedImage image, UUID uuid) {
     hash.put("policy", policy);
     hash.put("signature", signature);
     hash.put("Content-Type", "image/jpeg");
-
     try {
       uploadFile(updateFile(image), hash);
     } catch (ImageReadException | ImageWriteException | IOException e) {
@@ -256,7 +252,6 @@ public static void uploadFile(File file, HashMap<String, String> hash)
           ContentType.TEXT_PLAIN));
     }
     entityBuilder.addPart("file", new FileBody(file));
-
     HttpEntity entity = entityBuilder.build();
     httpPost.setEntity(entity);
     HttpResponse response = httpClient.execute(httpPost);

diff --git a/src/org/openstreetmap/josm/plugins/mapillary/utils/PluginState.java b/src/org/openstreetmap/josm/plugins/mapillary/utils/PluginState.java
@@ -98,9 +98,9 @@ public void run() {
   }
 
   /**
-   * 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() {
     return tr("Uploading: {0}", "(" + imagesUploaded + "/" + imagesToUpload

diff --git a/...g/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThreadTest.java b/...g/openstreetmap/josm/plugins/mapillary/downloads/MapillarySequenceDownloadThreadTest.java
@@ -14,8 +14,8 @@
 import org.openstreetmap.josm.data.coor.LatLon;
 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;
 
 /**
  *
@@ -24,7 +24,7 @@ public class MapillarySequenceDownloadThreadTest extends AbstractTest {
 
   /**
    * Test method for
-   * {@link org.openstreetmap.josm.plugins.mapillary.downloads.MapillarySequenceDownloadThread#run()}
+   * {@link org.openstreetmap.josm.plugins.mapillary.io.download.MapillarySequenceDownloadThread#run()}
    * .
    *
    * This downloads a small area of mapillary-sequences where we know that
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,5 @@ public void actionPerformed(ActionEvent e) { @@
             Main.error(e1);
           }
         }
       }
     }