Changeset 15723 in josm
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java
r15717 r15723 11 11 import java.util.Locale; 12 12 import java.util.Map.Entry; 13 import java.util.Objects; 13 14 import java.util.TreeSet; 14 15 import java.util.regex.Matcher; … … 311 312 @NullableArguments 312 313 public static String concat(Object... args) { // NO_UCD (unused code) 313 return Arrays.stream(args).map(String::valueOf).collect(Collectors.joining()); 314 return Arrays.stream(args) 315 .filter(Objects::nonNull) 316 .map(String::valueOf) 317 .collect(Collectors.joining()); 314 318 } 315 319 -
trunk/test/unit/org/openstreetmap/josm/plugins/PluginHandlerTest.java
r15717 r15723 71 71 try { 72 72 final String plugins = Stream.concat( 73 PluginHandler.DEPRECATED_PLUGINS.stream() ,73 PluginHandler.DEPRECATED_PLUGINS.stream().map(p -> p.name), 74 74 PluginHandler.UNMAINTAINED_PLUGINS.stream() 75 ). map(String::valueOf).collect(Collectors.joining(","));75 ).collect(Collectors.joining(",")); 76 76 System.setProperty("josm.plugins", plugins); 77 77 List<PluginInformation> list = PluginHandler.buildListOfPluginsToLoad(null, null); -
trunk/test/unit/org/openstreetmap/josm/tools/MultiMapTest.java
r13079 r15723 51 51 map.remove("foo"); 52 52 assertEquals(null, map.get("foo")); 53 assertEquals("(alpha-> {})", map.toString());53 assertEquals("(alpha->[])", map.toString()); 54 54 map.remove("alpha"); 55 55 assertTrue(map.isEmpty());
Note:
See TracChangeset
for help on using the changeset viewer.