Changeset 1546 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2009-04-22T02:39:47+02:00 (17 years ago)

Author:

framm

Message:

• streamline uploading by requesting commit message as part of the upload confirmation dialog; allow user to re-use latest commit message

Location:

trunk/src/org/openstreetmap/josm/io

Files:

• OsmApi.java (modified) (2 diffs)
• OsmServerWriter.java (modified) (3 diffs)

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

@@ -6 +6 @@
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
-import java.io.ByteArrayOutputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
@@ -20 +19 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Properties;
-import java.util.HashMap;
 import java.util.StringTokenizer;
 

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

@@ -7 +7 @@
 import java.util.LinkedList;
 
-import javax.swing.JOptionPane;
-
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.actions.UploadAction;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
@@ -30 +29 @@
      */
     public Collection<OsmPrimitive> processed;
+   
 
     private OsmApi api = new OsmApi();
@@ -74 +74 @@
             "0.6".equals(api.getVersion()));
 
-        // solicit commit comment from user
-        String comment = null;
-        while (useChangesets && comment == null) {
-            comment = JOptionPane.showInputDialog(Main.parent,
-                 tr("Provide a brief comment for the changes you are uploading:"),
-                 tr("Commit comment"), JOptionPane.QUESTION_MESSAGE);
-            if (comment == null)
-                return;
-            // Don't let people just hit enter
-            if (comment.trim().length() >= 3)
-                break;
-            comment = null;
-        }
-        
         // create changeset if required
         try {
-            if (useChangesets) api.createChangeset(comment);
+            if (useChangesets) api.createChangeset(UploadAction.lastCommitComment);
         } catch (OsmTransferException ex) {
             dealWithTransferException(ex);