Changeset 11105 in josm for trunk/src/org

Timestamp:

2016-10-08T21:50:48+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - fix various issues

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ExtendedDialog.java (modified) (1 diff)
• dialogs/OsmIdSelectionDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/ExtendedDialog.java

@@ -108 +108 @@
     // For easy access when inherited
     protected transient Insets contentInsets = new Insets(10, 5, 0, 5);
-    protected List<JButton> buttons = new ArrayList<>();
+    protected transient List<JButton> buttons = new ArrayList<>();
 
     /**

trunk/src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java

@@ -13 +13 @@
 import java.util.Collection;
 import java.util.Collections;
+import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -206 +206 @@
                     .collect(Collectors.joining(", "));
             tfId.tryToPasteFrom(parsedText);
-            final Set<OsmPrimitiveType> types = ids.stream().map(SimplePrimitiveId::getType).collect(Collectors.toSet());
+            final EnumSet<OsmPrimitiveType> types = ids.stream().map(SimplePrimitiveId::getType).collect(
+                    Collectors.toCollection(() -> EnumSet.noneOf(OsmPrimitiveType.class)));
             if (types.size() == 1) {
                 // select corresponding type