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

Timestamp:

2014-01-19T18:06:39+01:00 (10 years ago)

Author:

simon04

Message:

fix #8071 - MapCSS: skip null values in concat(), provide join(separator, value1, ..., valueN)

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (1 diff)

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

@@ -240 +240 @@
         /**
          * Assembles the strings to one.
+         * @see Utils#join
          */
         @NullableArguments
         public static String concat(Object... args) {
-            StringBuilder res = new StringBuilder();
-            for (Object f : args) {
-                res.append(String.valueOf(f));
-            }
-            return res.toString();
+            return Utils.join("", Arrays.asList(args));
+        }
+
+        /**
+         * Assembles the strings to one, where the first entry is used as separator.
+         * @see Utils#join
+         */
+        @NullableArguments
+        public static String join(String... args) {
+            return Utils.join(args[0], Arrays.asList(args).subList(1, args.length));
         }