Changeset 17787 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2021-04-14T21:29:47+02:00 (3 years ago)

Author:

simon04

Message:

fix #20741 - Various code simplifications (patch by gaben)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• preferences/imagery/HeadersTable.java (modified) (2 diffs)
• preferences/shortcut/PrefJPanel.java (modified) (1 diff)
• tagging/presets/TaggingPresetItem.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/HeadersTable.java

@@ -5 +5 @@
 
 import java.awt.GridBagLayout;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
@@ -107 +106 @@
 
     private static List<String[]> getHeadersAsVector(Map<String, String> headers) {
-        return headers.entrySet().stream().sorted(Comparator.comparing(Map.Entry::getKey))
+        return headers.entrySet().stream().sorted(Map.Entry.comparingByKey())
                 .map(e -> new String[] {e.getKey(), e.getValue()}).collect(Collectors.toList());
     }

trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

@@ -107 +107 @@
             }
         }
-        KeyboardUtils.getExtendedKeyCodes(InputContext.getInstance().getLocale()).entrySet()
-            .forEach(e -> list.put(e.getKey(), e.getValue().toString()));
+        KeyboardUtils.getExtendedKeyCodes(InputContext.getInstance().getLocale())
+                .forEach((key, value) -> list.put(key, value.toString()));
         list.put(Integer.valueOf(-1), "");
         return list;

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

@@ -89 +89 @@
             return TYPE_CACHE.get(types);
         Set<TaggingPresetType> result = EnumSet.noneOf(TaggingPresetType.class);
-        for (String type : Arrays.asList(types.split(",", -1))) {
+        for (String type : types.split(",", -1)) {
             try {
                 TaggingPresetType presetType = TaggingPresetType.fromString(type);