Changeset 6437 in josm for trunk/src/org/openstreetmap

Timestamp:

2013-12-04T22:20:16+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #9354 - Add source key to autocompletion box in add/edit tag dialog

Location:

trunk/src/org/openstreetmap/josm/gui/tagging

Files:

• TaggingPresetItems.java (modified) (2 diffs)
• ac/AutoCompletingComboBox.java (modified) (2 diffs)
• ac/AutoCompletionItemPriority.java (moved) (moved from trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionItemPritority.java ) (7 diffs)
• ac/AutoCompletionList.java (modified) (1 diff)
• ac/AutoCompletionListItem.java (modified) (2 diffs)
• ac/AutoCompletionManager.java (modified) (2 diffs)

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

@@ -49 +49 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingTextField;
-import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPritority;
+import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionItemPriority;
 import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionList;
 import org.openstreetmap.josm.gui.widgets.JosmComboBox;
@@ -1169 +1169 @@
             AutoCompletionList acList = tf.getAutoCompletionList();
             if (acList != null) {
-                acList.add(getDisplayValues(), AutoCompletionItemPritority.IS_IN_STANDARD);
+                acList.add(getDisplayValues(), AutoCompletionItemPriority.IS_IN_STANDARD);
             }
             combo.setEditor(tf);

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

@@ -230 +230 @@
                 }
             }
-            super.setSelectedItem(new AutoCompletionListItem(s, AutoCompletionItemPritority.UNKNOWN));
+            super.setSelectedItem(new AutoCompletionListItem(s, AutoCompletionItemPriority.UNKNOWN));
         } else
             throw new IllegalArgumentException();
@@ -243 +243 @@
         model.removeAllElements();
         for (String elem : elems) {
-            model.addElement(new AutoCompletionListItem(elem, AutoCompletionItemPritority.UNKNOWN));
+            model.addElement(new AutoCompletionListItem(elem, AutoCompletionItemPriority.UNKNOWN));
         }
         // disable autocomplete to prevent unnecessary actions in

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

@@ -8 +8 @@
  * Instances of this class are not modifiable.
  */
-public class AutoCompletionItemPritority implements Comparable<AutoCompletionItemPritority> {
+public class AutoCompletionItemPriority implements Comparable<AutoCompletionItemPriority> {
 
     /**
@@ -15 +15 @@
      * usually not used by the user.
      */
-    public static final AutoCompletionItemPritority IS_IN_STANDARD_AND_IN_DATASET = new AutoCompletionItemPritority(true, true, false);
+    public static final AutoCompletionItemPriority IS_IN_STANDARD_AND_IN_DATASET = new AutoCompletionItemPriority(true, true, false);
 
     /**
@@ -21 +21 @@
      * the value of a tag name=*.
      */
-    public static final AutoCompletionItemPritority IS_IN_DATASET = new AutoCompletionItemPritority(true, false, false);
+    public static final AutoCompletionItemPriority IS_IN_DATASET = new AutoCompletionItemPriority(true, false, false);
 
     /**
@@ -27 +27 @@
      * or a standard value for a given tag name (from the presets).
      */
-    public static final AutoCompletionItemPritority IS_IN_STANDARD = new AutoCompletionItemPritority(false, true, false);
+    public static final AutoCompletionItemPriority IS_IN_STANDARD = new AutoCompletionItemPriority(false, true, false);
 
     /**
      * Indicates that this is a value from a selected object.
      */
-    public static final AutoCompletionItemPritority  IS_IN_SELECTION  = new AutoCompletionItemPritority(false, false, true);
+    public static final AutoCompletionItemPriority  IS_IN_SELECTION  = new AutoCompletionItemPriority(false, false, true);
 
     /** Unknown priority. This is the lowest priority. */
-    public static final AutoCompletionItemPritority UNKNOWN = new AutoCompletionItemPritority(false, false, false);
+    public static final AutoCompletionItemPriority UNKNOWN = new AutoCompletionItemPriority(false, false, false);
 
     private final boolean inDataSet;
@@ -41 +41 @@
     private final boolean selected;
 
-    public AutoCompletionItemPritority(boolean inDataSet, boolean inStandard, boolean selected) {
+    public AutoCompletionItemPriority(boolean inDataSet, boolean inStandard, boolean selected) {
         this.inDataSet = inDataSet;
         this.inStandard = inStandard;
@@ -64 +64 @@
      */
     @Override
-    public int compareTo(AutoCompletionItemPritority other) {
+    public int compareTo(AutoCompletionItemPriority other) {
         int sel = Boolean.valueOf(selected).compareTo(other.selected);
         if (sel != 0) return sel;
@@ -81 +81 @@
      * The resulting priority is always >= the original ones.
      */
-    public AutoCompletionItemPritority mergeWith(AutoCompletionItemPritority other) {
-        return new AutoCompletionItemPritority(
+    public AutoCompletionItemPriority mergeWith(AutoCompletionItemPriority other) {
+        return new AutoCompletionItemPriority(
                 inDataSet || other.inDataSet,
                 inStandard || other.inStandard,

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

@@ -135 +135 @@
      * @param priority the priority to use
      */
-    public void add(Collection<String> values, AutoCompletionItemPritority priority) {
+    public void add(Collection<String> values, AutoCompletionItemPriority priority) {
         if (values == null) return;
         for (String value: values) {

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

@@ -10 +10 @@
  *  in an auto completion list for tag names, standard tag names would be assigned a higher
  *  priority than arbitrary tag names present in the current data set. There are three priority levels,
- *  {@link AutoCompletionItemPritority}.
+ *  {@link AutoCompletionItemPriority}.
  *
  * The value is a string which will be displayed in the auto completion list.
@@ -18 +18 @@
 
     /** the pritority of this item */
-    private  AutoCompletionItemPritority priority;
+    private  AutoCompletionItemPriority priority;
     /** the value of this item */
     private String value;
 
     /**
-     * constructor
+     * Constructs a new {@code AutoCompletionListItem} with the given value and priority.
+     * @param value The value
+     * @param priority The priority
      */
-    public AutoCompletionListItem(String value, AutoCompletionItemPritority priority) {
+    public AutoCompletionListItem(String value, AutoCompletionItemPriority priority) {
         this.value = value;
         this.priority = priority;
     }
 
+    /**
+     * Constructs a new {@code AutoCompletionListItem} with the given value and unknown priority.
+     * @param value The value
+     */
     public AutoCompletionListItem(String value) {
         this.value = value;
-        priority = AutoCompletionItemPritority.UNKNOWN;
+        priority = AutoCompletionItemPriority.UNKNOWN;
     }
 
+    /**
+     * Constructs a new {@code AutoCompletionListItem}.
+     */
     public AutoCompletionListItem() {
         value = "";
-        priority = AutoCompletionItemPritority.UNKNOWN;
+        priority = AutoCompletionItemPriority.UNKNOWN;
     }
 
-
     /**
-     *
+     * Returns the priority.
      * @return the priority
      */
-    public AutoCompletionItemPritority getPriority() {
+    public AutoCompletionItemPriority getPriority() {
         return priority;
     }
 
     /**
-     * sets the priority
+     * Sets the priority.
      * @param priority  the priority
      */
-    public void setPriority(AutoCompletionItemPritority priority) {
+    public void setPriority(AutoCompletionItemPriority priority) {
         this.priority = priority;
     }
 
     /**
-     *
+     * Returns the value.
      * @return the value
      */

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

@@ -216 +216 @@
      */
     public void populateWithMemberRoles(AutoCompletionList list) {
-        list.add(presetRoleCache, AutoCompletionItemPritority.IS_IN_STANDARD);
-        list.add(getRoleCache(), AutoCompletionItemPritority.IS_IN_DATASET);
-    }
-
-    /**
-     * Populates the an {@link AutoCompletionList} with the currently cached
-     * tag keys
+        list.add(presetRoleCache, AutoCompletionItemPriority.IS_IN_STANDARD);
+        list.add(getRoleCache(), AutoCompletionItemPriority.IS_IN_DATASET);
+    }
+
+    /**
+     * Populates the an {@link AutoCompletionList} with the currently cached tag keys
      *
      * @param list the list to populate
      */
     public void populateWithKeys(AutoCompletionList list) {
-        list.add(getPresetKeys(), AutoCompletionItemPritority.IS_IN_STANDARD);
-        list.add(getDataKeys(), AutoCompletionItemPritority.IS_IN_DATASET);
+        list.add(getPresetKeys(), AutoCompletionItemPriority.IS_IN_STANDARD);
+        list.add(new AutoCompletionListItem("source", AutoCompletionItemPriority.IS_IN_STANDARD));
+        list.add(getDataKeys(), AutoCompletionItemPriority.IS_IN_DATASET);
     }
 
@@ -251 +251 @@
     public void populateWithTagValues(AutoCompletionList list, List<String> keys) {
         for (String key : keys) {
-            list.add(getPresetValues(key), AutoCompletionItemPritority.IS_IN_STANDARD);
-            list.add(getDataValues(key), AutoCompletionItemPritority.IS_IN_DATASET);
+            list.add(getPresetValues(key), AutoCompletionItemPriority.IS_IN_STANDARD);
+            list.add(getDataValues(key), AutoCompletionItemPriority.IS_IN_DATASET);
         }
     }