Changeset 1338 in josm for trunk

Timestamp:

2009-01-25T14:07:31+01:00 (16 years ago)

Author:

stoecker

Message:

close #761. modified patch by xeen

File:

• trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

@@ -15 +15 @@
 import java.io.StringWriter;
 import java.io.UnsupportedEncodingException;
+import java.lang.Math;
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
@@ -144 +145 @@
                     int progress = Main.pleaseWaitDlg.progress.getValue();
                     String time_left_str = timeLeft(progress, list.size());
-                    Main.pleaseWaitDlg.currentAction.setText(tr("Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)...",
-                            tr(v.className), v.name, osm.id, 100.0*progress/list.size(), progress, list.size(), time_left_str));
+                    Main.pleaseWaitDlg.currentAction.setText(
+                    tr("{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})",
+                    Math.round(100.0*progress/list.size()), progress,
+                    list.size(), time_left_str, tr(v.className), v.name, osm.id));
                     osm.visit(this);
                     Main.pleaseWaitDlg.progress.setValue(progress+1);