Changeset 1575 in josm for trunk/src/org/openstreetmap/josm/io/OsmServerWriter.java

Timestamp:

2009-05-05T16:49:28+02:00 (15 years ago)

Author:

stoecker

Message:

close #2443 - patch by Henrik Niehaus - History for commit dialog

File:

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

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

@@ -6 +6 @@
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.List;
 
 import javax.swing.JOptionPane;
@@ -13 +14 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.NameVisitor;
+import org.openstreetmap.josm.gui.historycombobox.JHistoryComboBox;
+import org.openstreetmap.josm.gui.historycombobox.StringUtils;
 
 /**
@@ -78 +81 @@
         // create changeset if required
         try {
-            if (useChangesets) api.createChangeset(UploadAction.lastCommitComment);
+            if (useChangesets) {
+                // add the last entered comment to the changeset
+                String cmt = "";
+                List<String> history = StringUtils.stringToList(Main.pref.get(UploadAction.HISTORY_KEY), JHistoryComboBox.DELIM);
+                if(history.size() > 0) {
+                    cmt = history.get(0);
+                }
+                api.createChangeset(cmt);
+            }
         } catch (OsmTransferException ex) {
             dealWithTransferException(ex);