Ticket #2442: changeset-comment-patch.txt

Index: OsmServerWriter.java
===================================================================
--- OsmServerWriter.java        (revision 1545)
+++ OsmServerWriter.java        (working copy)
@@ -74,18 +74,32 @@
             "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)
+        Object userInput = null;
+        String comment;
+        String lastChangesetMessage = Main.pref.get("osm-server.last-changeset-message", "updating OSM data");
+        while (useChangesets && userInput == null) {
+            userInput = JOptionPane.showInputDialog(Main.parent,
+                 tr("Provide a brief comment for the changes you are uploading (min 3 chars):"),
+                 tr("Commit comment"), JOptionPane.QUESTION_MESSAGE,
+                 null, /* icon */
+                 null, /* selection values */
+                 lastChangesetMessage
+                 );
+            if (userInput == null) {
+                // input canceled by the user
+                //
                 return;
+            }
+            
             // Don't let people just hit enter
-            if (comment.trim().length() >= 3)
+            if (userInput.toString().trim().length() >= 3) {
                 break;
-            comment = null;
+            }
         }
+        // remember last changeset message
+        //
+        comment = userInput.toString();
+        Main.pref.put("osm-server.last-changeset-message", comment);
         
         // create changeset if required
         try {