Changeset 11105 in josm for trunk

Timestamp:

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

Author:

Don-vip

Message:

sonar - fix various issues

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/ExtendedDialog.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/dialogs/OsmIdSelectionDialog.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java (modified) (6 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

trunk/test/unit/org/openstreetmap/josm/data/osm/ChangesetCacheTest.java

@@ -55 +55 @@
 
     @Test
-    public void updateGetRemoveCycle() {
+    public void testUpdateGetRemoveCycle() {
         ChangesetCache cache = ChangesetCache.getInstance();
         cache.clear();
@@ -68 +68 @@
 
     @Test
-    public void updateTwice() {
+    public void testUpdateTwice() {
         ChangesetCache cache = ChangesetCache.getInstance();
         cache.clear();
@@ -94 +94 @@
 
     @Test
-    public void contains() throws ReflectiveOperationException {
+    public void testContains() throws ReflectiveOperationException {
         ChangesetCache cache = ChangesetCache.getInstance();
         getListeners(cache).clear();
@@ -112 +112 @@
 
     @Test
-    public void fireingEventsAddAChangeset() throws ReflectiveOperationException {
+    public void testFireingEventsAddAChangeset() throws ReflectiveOperationException {
         ChangesetCache cache = ChangesetCache.getInstance();
         cache.clear();
@@ -134 +134 @@
 
     @Test
-    public void fireingEventsUpdateChangeset() throws ReflectiveOperationException {
+    public void testFireingEventsUpdateChangeset() throws ReflectiveOperationException {
         ChangesetCache cache = ChangesetCache.getInstance();
         cache.clear();
@@ -158 +158 @@
 
     @Test
-    public void fireingEventsRemoveChangeset() throws ReflectiveOperationException {
+    public void testFireingEventsRemoveChangeset() throws ReflectiveOperationException {
         ChangesetCache cache = ChangesetCache.getInstance();
         cache.clear();