Changeset 15289 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java

Timestamp:

2019-08-07T21:50:20+02:00 (5 years ago)

Author:

Don-vip

Message:

see #10435 - Enable grouping of similar settings for enabling/disabling several settings at once

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Selector.java (modified) (3 diffs)

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

@@ -74 +74 @@
     /** selector base for artificial bases created to use preferences. */
     String BASE_SETTING = "setting";
+
+    /** selector base for grouping settings. */
+    String BASE_SETTINGS = "settings";
 
     /**
@@ -703 +706 @@
             case "canvas": return BASE_CANVAS;
             case "setting": return BASE_SETTING;
+            case "settings": return BASE_SETTINGS;
             default:
                 throw new IllegalArgumentException(MessageFormat.format("Unknown MapCSS base selector {0}", base));
@@ -779 +783 @@
         @Override
         public String toString() {
-            return base + (Range.ZERO_TO_INFINITY.equals(range) ? "" : range) + Utils.join("", conds)
+            return base + (Range.ZERO_TO_INFINITY.equals(range) ? "" : range) + (conds != null ? Utils.join("", conds) : "")
                     + (subpart != null && subpart != Subpart.DEFAULT_SUBPART ? ("::" + subpart) : "");
         }