Changeset 13800 in josm for trunk

Timestamp:

2018-05-21T04:02:08+02:00 (7 years ago)

Author:

Don-vip

Message:

fix #16192 - sort map paint style settings by label

Location:

trunk/src/org/openstreetmap/josm/gui/mappaint

Files:

• StyleSetting.java (modified) (2 diffs)
• mapcss/MapCSSStyleSource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSetting.java

@@ -36 +36 @@
      * A style setting for boolean value (yes / no).
      */
-    class BooleanStyleSetting implements StyleSetting {
+    class BooleanStyleSetting implements StyleSetting, Comparable<BooleanStyleSetting> {
         public final StyleSource parentStyle;
         public final String prefKey;
@@ -82 +82 @@
             }
         }
+
+        @Override
+        public int compareTo(BooleanStyleSetting o) {
+            return label.compareTo(o.label);
+        }
     }
 }

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

@@ -606 +606 @@
             }
         }
+        settings.sort(null);
     }