Changeset 4508 in josm

Timestamp:

09.10.2011 03:05:35 (8 months ago)

Author:

Don-vip

Message:

fix #6938 - should enforce limit of 255 chars per changeset comment when uploading

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Changeset.java (modified) (1 diff)
• gui/DocumentSizeFilter.java (added)
• gui/io/BasicUploadSettingsPanel.java (modified) (2 diffs)
• gui/tagging/ac/AutoCompletingComboBox.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/osm/Changeset.java

@@ -17 +17 @@
  */
 public final class Changeset implements Tagged {
+    
+    /** The maximum changeset comment text length allowed by API 0.6 **/
+    public static final int MAX_COMMENT_LENGTH = 255;
+    
     /** the changeset id */
     private int id;

trunk/src/org/openstreetmap/josm/gui/io/BasicUploadSettingsPanel.java

@@ -24 +24 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.osm.Changeset;
 import org.openstreetmap.josm.gui.widgets.HistoryComboBox;
 import org.openstreetmap.josm.tools.CheckParameterUtil;
@@ -50 +51 @@
         hcbUploadComment = new HistoryComboBox();
         hcbUploadComment.setToolTipText(tr("Enter an upload comment"));
+        hcbUploadComment.setMaxTextLength(Changeset.MAX_COMMENT_LENGTH);
         List<String> cmtHistory = new LinkedList<String>(Main.pref.getCollection(HISTORY_KEY, new LinkedList<String>()));
         // we have to reverse the history, because ComboBoxHistory will reverse it again

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

@@ -14 +14 @@
 import javax.swing.JList;
 import javax.swing.ListCellRenderer;
+import javax.swing.text.AbstractDocument;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
@@ -21 +22 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.DocumentSizeFilter;
 
 /**
@@ -149 +151 @@
         setMaximumRowCount(maxsize);
     }
+    
+    public void setMaxTextLength(int length)
+    {
+        JTextComponent editor = (JTextComponent) this.getEditor().getEditorComponent();
+        AbstractDocument doc = (AbstractDocument) editor.getDocument();
+        doc.setDocumentFilter(new DocumentSizeFilter(length));
+    }
 
     /**