Changeset 2946 in josm for trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java

Timestamp:

06.02.2010 17:37:52 (2 years ago)

Author:

bastiK

Message:

autocompletion: Always add the preset keys/values to the autocompletion list.
Does not apply to the Properties dialog, because it has a seperate implementation of the autocompletion feature.

File:

• trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletionList.java (modified) (1 diff)

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

@@ -157 +157 @@
         } else {
             // new item already exists. Update priority if necessary
-            //
-            if (toadd.getPriority().compareTo(item.getPriority()) < 0) {
-                item.setPriority(toadd.getPriority());
+
+            // If it is both in the dataset and in the presets, update the priority.
+            final AutoCompletionItemPritority IS_IN_DATASET = AutoCompletionItemPritority.IS_IN_DATASET;
+            final AutoCompletionItemPritority IS_IN_STANDARD = AutoCompletionItemPritority.IS_IN_STANDARD;
+            if ((toadd.getPriority() == IS_IN_STANDARD && item.getPriority() == IS_IN_DATASET) ||
+                (toadd.getPriority() == IS_IN_DATASET && item.getPriority() == IS_IN_STANDARD)) {
+
+                item.setPriority(AutoCompletionItemPritority.IS_IN_STANDARD_AND_IN_DATASET);
+            } else {
+                if (toadd.getPriority().compareTo(item.getPriority()) < 0) {
+                    item.setPriority(toadd.getPriority());
+                }
             }
         }