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

Timestamp:

2017-05-28T03:43:59+02:00 (7 years ago)

Author:

Don-vip

Message:

sonar - fix various recent violations

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/gpx/GpxData.java (modified) (3 diffs)
• gui/MapFrame.java (modified) (1 diff)
• io/session/ImagerySessionExporter.java (modified) (1 diff)
• io/session/ImagerySessionImporter.java (modified) (1 diff)
• tools/ListeningCollection.java (added)
• tools/PlatformHookWindows.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/gpx/GpxData.java

@@ -4 +4 @@
 import java.io.File;
 import java.text.MessageFormat;
-import java.util.AbstractCollection;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24 +23 @@
 import org.openstreetmap.josm.data.gpx.GpxTrack.GpxTrackChangeListener;
 import org.openstreetmap.josm.tools.ListenerList;
+import org.openstreetmap.josm.tools.ListeningCollection;
 
 /**
@@ -668 +668 @@
 
     /**
-     * This is a proxy of a collection that notifies a listener on every collection change
-     * @author Michael Zangl
-     *
-     * @param <T> The entry type
-     * @since 12156
-     */
-    private static class ListeningCollection<T> extends AbstractCollection<T> {
-        private final ArrayList<T> base;
-        private final Runnable runOnModification;
-
-        ListeningCollection(ArrayList<T> base, Runnable runOnModification) {
-            this.base = base;
-            this.runOnModification = runOnModification;
-        }
-
-        @Override
-        public Iterator<T> iterator() {
-            Iterator<T> it = base.iterator();
-            return new Iterator<T>() {
-                private T cursor;
-
-                @Override
-                public boolean hasNext() {
-                    return it.hasNext();
-                }
-
-                @Override
-                public T next() {
-                    cursor = it.next();
-                    return cursor;
-                }
-
-                @Override
-                public void remove() {
-                    if (cursor != null) {
-                        removed(cursor);
-                        cursor = null;
-                    }
-                    it.remove();
-                }
-            };
-        }
-
-        @Override
-        public int size() {
-            return base.size();
-        }
-
-        @Override
-        @SuppressWarnings("unchecked")
-        public boolean remove(Object o) {
-            boolean remove = base.remove(o);
-            if (remove) {
-                removed((T) o);
-            }
-            return remove;
-        }
-
-        @Override
-        public boolean add(T e) {
-            boolean add = base.add(e);
-            added(e);
-            return add;
-        }
-
-        protected void removed(T cursor) {
-            runOnModification.run();
-        }
-
-        protected void added(T cursor) {
-            runOnModification.run();
-        }
-    }
-
-    /**
      * A listener that listens to GPX data changes.
      * @author Michael Zangl

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

@@ -784 +784 @@
         }
         // if this is really a change (and not the first active layer)
-        if (e.getPreviousActiveLayer() != null) {
-            if (!modeChanged && mapMode != null) {
-                // Let mapmodes know about new active layer
-                mapMode.exitMode();
-                mapMode.enterMode();
-            }
+        if (e.getPreviousActiveLayer() != null && !modeChanged && mapMode != null) {
+            // Let mapmodes know about new active layer
+            mapMode.exitMode();
+            mapMode.enterMode();
         }
 

trunk/src/org/openstreetmap/josm/io/session/ImagerySessionExporter.java

@@ -98 +98 @@
     }
 
-    private void addAttributes(Element element, Map<String, String> props, ExportSupport support) {
+    private static void addAttributes(Element element, Map<String, String> props, ExportSupport support) {
         for (Map.Entry<String, String> entry : props.entrySet()) {
             Element attrElem = support.createElement(entry.getKey());

trunk/src/org/openstreetmap/josm/io/session/ImagerySessionImporter.java

@@ -59 +59 @@
     }
 
-    private Map<String, String> readProperties(Element elem) {
+    private static Map<String, String> readProperties(Element elem) {
         Map<String, String> attributes = new HashMap<>();
         NodeList nodes = elem.getChildNodes();

trunk/src/org/openstreetmap/josm/tools/PlatformHookWindows.java

@@ -174 +174 @@
                         || (javaVersion == 9 && javaUpdate == 0 && javaBuild < 171))) {
                     // Workaround from https://bugs.openjdk.java.net/browse/JDK-8179014
-                    UIManager.put("FileChooser.useSystemExtensionHiding", false);
+                    UIManager.put("FileChooser.useSystemExtensionHiding", Boolean.FALSE);
                 }
             } catch (NumberFormatException | ReflectiveOperationException e) {