Changeset 31449 in osm for applications/editors/josm

Timestamp:

2015-08-05T11:45:17+02:00 (9 years ago)

Author:

nokutu

Message:

Improved status bar behaviour.

Location:

applications/editors/josm/plugins/mapillary/src/org/openstreetmap/josm/plugins/mapillary

Files:

• MapillaryLayer.java (modified) (3 diffs)
• actions/MapillaryUploadAction.java (modified) (1 diff)
• downloads/MapillarySquareDownloadManagerThread.java (modified) (3 diffs)
• oauth/OAuthUtils.java (modified) (4 diffs)
• utils (added)
• utils/PluginState.java (added)

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

@@ -11 +11 @@
 import org.openstreetmap.josm.plugins.mapillary.mode.JoinMode;
 import org.openstreetmap.josm.plugins.mapillary.mode.SelectMode;
+import org.openstreetmap.josm.plugins.mapillary.utils.PluginState;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -604 +605 @@
   public void updateHelpText() {
     String ret = "";
-    if (this.data.size() > 0)
+    if (PluginState.isDownloading())
+      ret += tr("Downloading");
+    else if (this.data.size() > 0)
       ret += tr("Total images: {0}", this.data.size());
     else
@@ -610 +613 @@
     if (this.mode != null)
       ret += " -- " + tr(this.mode.toString());
+    if (PluginState.isUploading())
+      ret += " -- " + PluginState.getUploadString();
     Main.map.statusLine.setHelpText(ret);
   }

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

@@ -6 +6 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
-import java.io.UnsupportedEncodingException;
-import java.security.InvalidKeyException;
-import java.security.NoSuchAlgorithmException;
 
 import javax.swing.JDialog;

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

@@ -1 +1 @@
 package org.openstreetmap.josm.plugins.mapillary.downloads;
-
-import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.util.concurrent.ThreadPoolExecutor;
@@ -16 +14 @@
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryFilterDialog;
 import org.openstreetmap.josm.plugins.mapillary.gui.MapillaryMainDialog;
+import org.openstreetmap.josm.plugins.mapillary.utils.PluginState;
 
 /**
@@ -73 +72 @@
   @Override
   public void run() {
-    Main.map.statusLine.setHelpText(tr("Downloading images from Mapillary"));
     try {
+      PluginState.startDownload();
+      MapillaryLayer.getInstance().updateHelpText();
       downloadSequences();
-      Main.map.statusLine.setHelpText(tr("Downloading image's information"));
       completeImages();
       MapillaryMainDialog.getInstance().updateTitle();
-      Main.map.statusLine.setHelpText(tr("Downloading traffic signs"));
       downloadSigns();
     } catch (InterruptedException e) {
       Main.error("Mapillary download interrupted (probably because of closing the layer).");
+    } finally {
+      PluginState.finishDownload();
+      MapillaryLayer.getInstance().updateHelpText();
     }
     this.layer.updateHelpText();

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

@@ -49 +49 @@
 import org.openstreetmap.josm.plugins.mapillary.MapillaryAbstractImage;
 import org.openstreetmap.josm.plugins.mapillary.MapillaryImportedImage;
+import org.openstreetmap.josm.plugins.mapillary.MapillaryLayer;
 import org.openstreetmap.josm.plugins.mapillary.MapillarySequence;
+import org.openstreetmap.josm.plugins.mapillary.utils.PluginState;
 
 /**
@@ -164 +166 @@
 
     HttpResponse response = httpClient.execute(httpPost);
-    if (response.getStatusLine().toString().contains("204"))
+    if (response.getStatusLine().toString().contains("204")) {
       System.out.println("Succesfully uploaded image");
+      PluginState.imageUploaded();
+    }
     file.delete();
+    MapillaryLayer.getInstance().updateHelpText();
   }
 
@@ -194 +199 @@
     @Override
     public void run() {
+      PluginState.startUpload();
+      PluginState.imagesToUpload(this.images.size());
+      MapillaryLayer.getInstance().updateHelpText();
       for (MapillaryAbstractImage img : this.images) {
         if (!(img instanceof MapillaryImportedImage))
@@ -201 +209 @@
             this.uuid));
       }
+      this.ex.shutdown();
+      PluginState.finishUpload();
     }
   }