Changeset 16582 in osm for applications/editors/josm/plugins

Timestamp:

2009-07-19T18:32:45+02:00 (15 years ago)

Author:

jttt

Message:

Made plug-in work with JOSM new ProgressMonitor API

Location:

applications/editors/josm/plugins/DirectUpload

Files:

• .classpath (added)
• .project (added)
• src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java (modified) (9 diffs)

applications/editors/josm/plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java

@@ -11 +11 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Dimension;
+import java.awt.GridBagLayout;
 import java.awt.event.ActionEvent;
-import java.awt.GridBagLayout;
-import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
-import java.io.IOException;
 import java.io.OutputStream;
-import java.lang.String;
 import java.net.HttpURLConnection;
 import java.net.URL;
@@ -27 +24 @@
 import java.nio.charset.Charset;
 import java.nio.charset.CharsetEncoder;
-import java.text.DateFormat;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JLabel;
@@ -38 +33 @@
 import javax.swing.JTextField;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.gui.ExtendedDialog;
 import org.openstreetmap.josm.gui.JMultilineLabel;
+import org.openstreetmap.josm.gui.MapView;
+import org.openstreetmap.josm.gui.PleaseWaitRunnable;
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.progress.ProgressMonitor;
 import org.openstreetmap.josm.io.GpxWriter;
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.tools.Base64;
 import org.openstreetmap.josm.tools.GBC;
@@ -164 +160 @@
      * @param GpxData The GPX Data to upload
      */
-    private void upload(String description, String tags, Boolean isPublic, GpxData gpxData) throws IOException {
-        if(checkForErrors(username, password, description, gpxData))
-            return;
-
-        // Clean description/tags from disallowed chars
-        description = description.replaceAll("[&?/\\\\]"," ");
-        tags = tags.replaceAll("[&?/\\\\.,;]"," ");
-
-        // Set progress dialog to indeterminate while connecting
-        Main.pleaseWaitDlg.progress.setValue(0);
-        Main.pleaseWaitDlg.setIndeterminate(true);
-        Main.pleaseWaitDlg.currentAction.setText(tr("Connecting..."));
-
-        try {
-            // Generate data for upload
-            ByteArrayOutputStream baos  = new ByteArrayOutputStream();
-            writeGpxFile(baos, "file", gpxData);
-            writeField(baos, "description", description);
-            writeField(baos, "tags", (tags != null && tags.length() > 0) ? tags : "");
-            writeField(baos, "public", isPublic ? "1" : "0");
-            writeString(baos, "--" + BOUNDARY + "--" + LINE_END);
-
-            ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
-            HttpURLConnection conn = setupConnection(baos.size());
-
-            Main.pleaseWaitDlg.progress.setMaximum(baos.size());
-            Main.pleaseWaitDlg.setIndeterminate(false);
-
-            try {
-                flushToServer(bais, conn.getOutputStream());
-            } catch(Exception e) {}
-
-            if(cancelled) {
-                conn.disconnect();
-                OutputDisplay.setText(tr("Upload cancelled"));
-                buttons.get(0).setEnabled(true);
-                cancelled = false;
-            } else {
-                boolean success = finishUpConnection(conn);
-                buttons.get(0).setEnabled(!success);
-                if(success)
-                    buttons.get(1).setText(tr("Close"));
-            }
-        } catch(Exception e) {
-            OutputDisplay.setText(tr("Error while uploading"));
-            e.printStackTrace();
-        }
+    private void upload(String description, String tags, Boolean isPublic, GpxData gpxData, ProgressMonitor progressMonitor) throws IOException {
+        progressMonitor.beginTask(null);
+        try {
+                if(checkForErrors(username, password, description, gpxData))
+                        return;
+
+                // Clean description/tags from disallowed chars
+                description = description.replaceAll("[&?/\\\\]"," ");
+                tags = tags.replaceAll("[&?/\\\\.,;]"," ");
+
+                // Set progress dialog to indeterminate while connecting
+                progressMonitor.indeterminateSubTask(tr("Connecting..."));
+
+                try {
+                        // Generate data for upload
+                        ByteArrayOutputStream baos  = new ByteArrayOutputStream();
+                        writeGpxFile(baos, "file", gpxData);
+                        writeField(baos, "description", description);
+                        writeField(baos, "tags", (tags != null && tags.length() > 0) ? tags : "");
+                        writeField(baos, "public", isPublic ? "1" : "0");
+                        writeString(baos, "--" + BOUNDARY + "--" + LINE_END);
+
+                        ByteArrayInputStream bais = new ByteArrayInputStream(baos.toByteArray());
+                        HttpURLConnection conn = setupConnection(baos.size());
+
+                        progressMonitor.setTicksCount(baos.size());
+                        progressMonitor.subTask(null);
+
+                        try {
+                                flushToServer(bais, conn.getOutputStream(), progressMonitor);
+                        } catch(Exception e) {}
+
+                        if(cancelled) {
+                                conn.disconnect();
+                                OutputDisplay.setText(tr("Upload cancelled"));
+                                buttons.get(0).setEnabled(true);
+                                cancelled = false;
+                        } else {
+                                boolean success = finishUpConnection(conn);
+                                buttons.get(0).setEnabled(!success);
+                                if(success)
+                                        buttons.get(1).setText(tr("Close"));
+                        }
+                } catch(Exception e) {
+                        OutputDisplay.setText(tr("Error while uploading"));
+                        e.printStackTrace();
+                }
+        } finally {
+                progressMonitor.finishTask();
+        }
     }
 
@@ -271 +270 @@
      * @param OutputStream
      */
-    private void flushToServer(InputStream in, OutputStream out) throws Exception {
+    private void flushToServer(InputStream in, OutputStream out, ProgressMonitor progressMonitor) throws Exception {
         // Upload in 10 kB chunks
         byte[] buffer = new byte[10000];
@@ -281 +280 @@
                 cur += nread;
                 out.flush();
-                Main.pleaseWaitDlg.progress.setValue(cur);
-                Main.pleaseWaitDlg.currentAction.setText(getProgressText(cur));
+                progressMonitor.worked(nread);
+                progressMonitor.subTask(getProgressText(cur, progressMonitor));
 
                 if(cancelled)
@@ -290 +289 @@
         if(!cancelled)
             out.flush();
-        Main.pleaseWaitDlg.currentAction.setText("Waiting for server reply...");
+        progressMonitor.subTask("Waiting for server reply...");
         buffer = null;
     }
@@ -299 +298 @@
      * @return String Message
      */
-    private String getProgressText(int cur) {
-        int max = Main.pleaseWaitDlg.progress.getMaximum();
+    private String getProgressText(int cur, ProgressMonitor progressMonitor) {
+        int max = progressMonitor.getTicksCount();
         int percent = Math.round(cur * 100 / max);
         return tr("Uploading GPX track: {0}% ({1} of {2})",
@@ -380 +379 @@
                          tagsField.getText(),
                          publicCheckbox.isSelected(),
-                         ((GpxLayer)Main.map.mapView.getActiveLayer()).data
+                         ((GpxLayer)Main.map.mapView.getActiveLayer()).data,
+                         progressMonitor.createSubTaskMonitor(ProgressMonitor.ALL_TICKS, false)
                   );
             }