Changeset 5579 in josm

Timestamp:

2012-11-13T21:18:57+01:00 (11 years ago)

Author:

Don-vip

Message:

see #8180 - Presets: Allow length of input box for text

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• data/tagging-preset.xsd (modified) (1 diff)
• src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingTextField.java (modified) (3 diffs)

trunk/data/defaultpresets.xml

@@ -36 +36 @@
   use_last_as_default: true/false/force (default is "false")
   match: none/key/key!/keyvalue (default is "none", see below for more information)
+  length: length of input box (number of characters allowed)
 
 combo: combo box, with multiple choices and possible to enter free form text

trunk/data/tagging-preset.xsd

@@ -118 +118 @@
                 <attribute name="use_last_as_default" type="tns:last_default" />
                 <attribute name="match" type="tns:match" />
+        <attribute name="length" type="positiveInteger" />
 
                 <attribute name="type" use="prohibited" />

trunk/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -378 +378 @@
         public String originalValue;
         public String use_last_as_default = "false";
+        public String length;
 
         private JComponent value;
@@ -387 +388 @@
             AutoCompletingTextField textField = new AutoCompletingTextField();
             initAutoCompletionField(textField, key);
+            if (length != null && !length.isEmpty()) {
+                textField.setMaxChars(new Integer(length));
+            }
             if (usage.unused()){
                 if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {

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

@@ -33 +33 @@
  */
 public class AutoCompletingTextField extends JTextField implements ComboBoxEditor, TableCellEditor {
+
+    private Integer maxChars;
+    
     /**
      * The document model for the editor
@@ -44 +47 @@
         @Override
         public void insertString(int offs, String str, AttributeSet a) throws BadLocationException {
+            
+            // If a maximum number of characters is specified, avoid to exceed it
+            if (maxChars != null && str != null && getLength() + str.length() > maxChars) {
+                int allowedLength = maxChars-getLength();
+                if (allowedLength > 0) {
+                    str = str.substring(0, allowedLength);
+                } else {
+                    return;
+                }
+            }
+            
             if (autoCompletionList == null) {
                 super.insertString(offs, str, a);
@@ -195 +209 @@
     }
 
+    /**
+     * Sets the maximum number of characters allowed.
+     * @param max maximum number of characters allowed
+     * @since 5579
+     */
+    public void setMaxChars(Integer max) {
+        maxChars = max;
+    }
+
     /* ------------------------------------------------------------------------------------ */
     /* TableCellEditor interface                                                            */