Changeset 12970 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2017-10-09T21:57:25+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15008, see #15421 - add toString() methods to allow to report potentially incorrect selection events

Location:

trunk/src/org/openstreetmap/josm/data/osm

Files:

• DataSelectionListener.java (modified) (4 diffs)
• DataSet.java (modified) (2 diffs)
• event/SelectionEventManager.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/DataSelectionListener.java

@@ -158 +158 @@
             }
             return added;
+        }
+
+        @Override
+        public String toString() {
+            return "SelectionReplaceEvent [current=" + current + ", removed=" + removed + ", added=" + added + ']';
         }
     }
@@ -202 +207 @@
         public Set<OsmPrimitive> getAdded() {
             return Collections.unmodifiableSet(add);
+        }
+
+        @Override
+        public String toString() {
+            return "SelectionAddEvent [add=" + add + ", current=" + current + ']';
         }
     }
@@ -247 +257 @@
         public Set<OsmPrimitive> getAdded() {
             return Collections.emptySet();
+        }
+
+        @Override
+        public String toString() {
+            return "SelectionRemoveEvent [remove=" + remove + ", current=" + current + ']';
         }
     }
@@ -298 +313 @@
             return Collections.unmodifiableSet(add);
         }
+
+        @Override
+        public String toString() {
+            return "SelectionToggleEvent [current=" + current + ", remove=" + remove + ", add=" + add + ']';
+        }
     }
 }

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -207 +207 @@
         // the listener, projection change listeners are managed as WeakReferences.
         Main.addProjectionChangeListener(this);
-        addSelectionListener((DataSelectionListener) e -> fireDreprecatedSelectionChange(e.getSelection()));
+        addSelectionListener((DataSelectionListener) e -> fireDeprecatedSelectionChange(e.getSelection()));
     }
 
@@ -682 +682 @@
     @Deprecated
     public void fireSelectionChanged() {
-        fireDreprecatedSelectionChange(getAllSelected());
-    }
-
-    private static void fireDreprecatedSelectionChange(Collection<? extends OsmPrimitive> currentSelection) {
+        fireDeprecatedSelectionChange(getAllSelected());
+    }
+
+    private static void fireDeprecatedSelectionChange(Collection<? extends OsmPrimitive> currentSelection) {
         for (SelectionChangedListener l : selListeners) {
             l.selectionChanged(currentSelection);

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

@@ -178 +178 @@
             // If we would not do this, e.g. the move command would have a hard time tracking which layer
             // the last moved selection was in.
-            SelectionReplaceEvent event = new SelectionReplaceEvent(oldDataSet,
-                    new HashSet<>(oldDataSet.getAllSelected()), Stream.empty());
-            selectionChanged(event);
+            selectionChanged(new SelectionReplaceEvent(oldDataSet,
+                    new HashSet<>(oldDataSet.getAllSelected()), Stream.empty()));
             oldDataSet.removeSelectionListener(this);
         }
@@ -187 +186 @@
             newDataSet.addSelectionListener(this);
             // Fake a selection add
-            SelectionReplaceEvent event = new SelectionReplaceEvent(newDataSet,
-                    Collections.emptySet(), newDataSet.getAllSelected().stream());
-            selectionChanged(event);
+            selectionChanged(new SelectionReplaceEvent(newDataSet,
+                    Collections.emptySet(), newDataSet.getAllSelected().stream()));
         }
     }