Changeset 12116 in josm for trunk

Timestamp:

2017-05-11T01:53:27+02:00 (7 years ago)

Author:

michael2402

Message:

Sonar: Make AbstractListenerInfo an interface.

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/event/SelectionEventManager.java (modified) (8 diffs)
• gui/layer/OsmDataLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/event/SelectionEventManager.java

@@ -42 +42 @@
     }
 
-    private abstract static class AbstractListenerInfo {
-        abstract void fire(SelectionChangeEvent event);
-    }
-
-    private static class ListenerInfo extends AbstractListenerInfo {
+    private interface ListenerInfo {
+        void fire(SelectionChangeEvent event);
+    }
+
+    private static class OldListenerInfo implements ListenerInfo {
         private final SelectionChangedListener listener;
 
-        ListenerInfo(SelectionChangedListener listener) {
+        OldListenerInfo(SelectionChangedListener listener) {
             this.listener = listener;
         }
 
         @Override
-        void fire(SelectionChangeEvent event) {
+        public void fire(SelectionChangeEvent event) {
             listener.selectionChanged(event.getSelection());
         }
@@ -67 +67 @@
             if (this == o) return true;
             if (o == null || getClass() != o.getClass()) return false;
-            ListenerInfo that = (ListenerInfo) o;
+            OldListenerInfo that = (OldListenerInfo) o;
             return Objects.equals(listener, that.listener);
         }
     }
 
-    private static class DataListenerInfo extends AbstractListenerInfo {
+    private static class DataListenerInfo implements ListenerInfo {
         private final DataSelectionListener listener;
 
@@ -80 +80 @@
 
         @Override
-        void fire(SelectionChangeEvent event) {
+        public void fire(SelectionChangeEvent event) {
             listener.selectionChanged(event);
         }
@@ -98 +98 @@
     }
 
-    private final CopyOnWriteArrayList<AbstractListenerInfo> inEDTListeners = new CopyOnWriteArrayList<>();
-    private final CopyOnWriteArrayList<AbstractListenerInfo> immedatelyListeners = new CopyOnWriteArrayList<>();
+    private final CopyOnWriteArrayList<ListenerInfo> inEDTListeners = new CopyOnWriteArrayList<>();
+    private final CopyOnWriteArrayList<ListenerInfo> immedatelyListeners = new CopyOnWriteArrayList<>();
 
     /**
@@ -123 +123 @@
             throw new UnsupportedOperationException("IN_EDT mode not supported, you probably want to use IN_EDT_CONSOLIDATED.");
         } else if (fireMode == FireMode.IN_EDT_CONSOLIDATED) {
-            inEDTListeners.addIfAbsent(new ListenerInfo(listener));
+            inEDTListeners.addIfAbsent(new OldListenerInfo(listener));
         } else {
-            immedatelyListeners.addIfAbsent(new ListenerInfo(listener));
+            immedatelyListeners.addIfAbsent(new OldListenerInfo(listener));
         }
     }
@@ -153 +153 @@
      */
     public void removeSelectionListener(SelectionChangedListener listener) {
-        remove(new ListenerInfo(listener));
+        remove(new OldListenerInfo(listener));
     }
 
@@ -165 +165 @@
     }
 
-    private void remove(AbstractListenerInfo searchListener) {
+    private void remove(ListenerInfo searchListener) {
         inEDTListeners.remove(searchListener);
         immedatelyListeners.remove(searchListener);
@@ -199 +199 @@
     }
 
-    private static void fireEvent(List<AbstractListenerInfo> listeners, SelectionChangeEvent event) {
-        for (AbstractListenerInfo listener: listeners) {
+    private static void fireEvent(List<ListenerInfo> listeners, SelectionChangeEvent event) {
+        for (ListenerInfo listener: listeners) {
             listener.fire(event);
         }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -170 +170 @@
      * Adds recently closed relation.
      * @param relation new entry for the list of recently closed relations
+     * @see #PROPERTY_RECENT_RELATIONS_NUMBER
      * @since 9668
-     * @see #PROPERTY_RECENT_RELATIONS_NUMBER
      */
     public void setRecentRelation(Relation relation) {