Changeset 1575 in josm for trunk

Timestamp:

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

Author:

stoecker

Message:

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

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/UploadAction.java (modified) (6 diffs)
• gui/historycombobox (added)
• gui/historycombobox/ComboBoxHistory.java (added)
• gui/historycombobox/EventConsumingPlainDocument.java (added)
• gui/historycombobox/HistoryChangedListener.java (added)
• gui/historycombobox/JHistoryComboBox.java (added)
• gui/historycombobox/StringUtils.java (added)
• gui/historycombobox/SuggestingJHistoryComboBox.java (added)
• gui/historycombobox/SuggestionListener.java (added)
• io/OsmServerWriter.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/UploadAction.java

@@ -9 +9 @@
 import java.util.Collection;
 import java.util.LinkedList;
+import java.util.List;
 
 import javax.swing.JLabel;
@@ -15 +16 @@
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import javax.swing.JTextField;
 
 import org.openstreetmap.josm.Main;
@@ -22 +22 @@
 import org.openstreetmap.josm.gui.OsmPrimitivRenderer;
 import org.openstreetmap.josm.gui.PleaseWaitRunnable;
+import org.openstreetmap.josm.gui.historycombobox.StringUtils;
+import org.openstreetmap.josm.gui.historycombobox.SuggestingJHistoryComboBox;
 import org.openstreetmap.josm.io.OsmServerWriter;
 import org.openstreetmap.josm.tools.GBC;
+import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
-import org.openstreetmap.josm.tools.Shortcut;
 
 /**
@@ -36 +38 @@
  */
 public class UploadAction extends JosmAction {
+    
+    public static final String HISTORY_KEY = "upload.comment.history"; 
 
-    /**
-     * Last commit message used for uploading changes.
-     * FIXME save this in preferences, or even offer list of 10 last recently used comments?
-     * FIXME ugly hack; value is filled here and retrieved in the OsmApi class; find better way
-     */
-    public static String lastCommitComment; 
-    
     /** Upload Hook */
     public interface UploadHook {
@@ -108 +105 @@
                 
                 p.add(new JLabel(tr("Provide a brief comment for the changes you are uploading:")), GBC.eol().insets(0, 5, 10, 3));
-                final JTextField cmt = new JTextField(lastCommitComment);
+                SuggestingJHistoryComboBox cmt = new SuggestingJHistoryComboBox();
+                List<String> cmtHistory = StringUtils.stringToList(Main.pref.get(HISTORY_KEY), SuggestingJHistoryComboBox.DELIM);
+                cmt.setHistory(cmtHistory);
+                //final JTextField cmt = new JTextField(lastCommitComment);
                 p.add(cmt, GBC.eol().fill(GBC.HORIZONTAL));
 
@@ -124 +124 @@
                     if (cmt.getText().trim().length() < 3) continue;
                     
-                    lastCommitComment = cmt.getText().trim();
+                    // store the history of comments
+                    cmt.addCurrentItemToHistory();
+                    Main.pref.put(HISTORY_KEY, StringUtils.listToString(cmt.getHistory(), SuggestingJHistoryComboBox.DELIM));
+                    
                     break;
                 }

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);