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

Timestamp:

2020-03-06T00:23:37+01:00 (5 years ago)

Author:

simon04

Message:

see #18864 - TaggingPreset: use byte for use_last_as_default field, use boolean for values_searchable field

Reduces retained size of TaggingPreset from 1_667_448 to 1_663_120 (de).

Location:

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

Files:

• TaggingPresetSelector.java (modified) (1 diff)
• items/Combo.java (modified) (2 diffs)
• items/ComboMultiSelect.java (modified) (2 diffs)
• items/MultiSelect.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/tagging/presets/TaggingPresetSelector.java

@@ -109 +109 @@
                     if (item instanceof ComboMultiSelect) {
                         final ComboMultiSelect cms = (ComboMultiSelect) item;
-                        if (Boolean.parseBoolean(cms.values_searchable)) {
+                        if (cms.values_searchable) {
                             tagSet.addAll(cms.getDisplayValues());
                         }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/Combo.java

@@ -74 +74 @@
         } else if (def != null && usage.unused()) {
             // default is set and all items were unset
-            if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
+            if (!usage.hadKeys() || PROP_FILL_DEFAULT.get() || isForceUseLastAsDefault()) {
                 // selected osm primitives are untagged or filling default feature is enabled
                 combobox.setSelectedItem(lhm.get(def).getDisplayValue(true));
@@ -85 +85 @@
             // all items were unset (and so is default)
             originalValue = lhm.get("");
-            if (!presetInitiallyMatches && "force".equals(use_last_as_default) && LAST_VALUES.containsKey(key)) {
+            if (!presetInitiallyMatches && isForceUseLastAsDefault() && LAST_VALUES.containsKey(key)) {
                 combobox.setSelectedItem(lhm.get(LAST_VALUES.get(key)));
             } else {

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -91 +91 @@
      */
     public char delimiter = ';'; // NOSONAR
-    /** whether the last value is used as default. Using "force" enforces this behaviour also for already tagged objects. Default is "false".*/
-    public String use_last_as_default = "false"; // NOSONAR
+    /** whether the last value is used as default. Using "force" (2) enforces this behaviour also for already tagged objects. Default is "false" (0).*/
+    public byte use_last_as_default = 0; // NOSONAR
     /** whether to use values for search via {@link TaggingPresetSelector} */
-    public String values_searchable = "false"; // NOSONAR
+    public boolean values_searchable = false; // NOSONAR
 
     protected JComponent component;
@@ -530 +530 @@
             return;
 
-        if (!"false".equals(use_last_as_default)) {
+        if (isUseLastAsDefault()) {
             LAST_VALUES.put(key, value);
         }
         changedTags.add(new Tag(key, value));
+    }
+
+    public void setUse_last_as_default(String v) {
+        if ("force".equals(v)) {
+            use_last_as_default = 2;
+        } else if ("true".equals(v)) {
+            use_last_as_default = 1;
+        } else {
+            use_last_as_default = 0;
+        }
+    }
+
+    protected boolean isUseLastAsDefault() {
+        return use_last_as_default > 0;
+    }
+
+    protected boolean isForceUseLastAsDefault() {
+        return use_last_as_default == 2;
     }
 

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/MultiSelect.java

@@ -34 +34 @@
             originalValue = usage.getFirst();
             list.setSelectedItem(originalValue);
-        } else if ((def != null && !usage.hadKeys()) || PROP_FILL_DEFAULT.get() || "force".equals(use_last_as_default)) {
+        } else if ((def != null && !usage.hadKeys()) || PROP_FILL_DEFAULT.get() || isForceUseLastAsDefault()) {
             originalValue = DIFFERENT;
             list.setSelectedItem(def);