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

Timestamp:

2023-12-27T22:09:21+01:00 (11 months ago)

Author:

taylor.smock

Message:

Fix #23316: MarkerLayer should return an empty list instead of a list with a single null value when the entry is null

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -76 +76 @@
 /**
  * A layer holding markers.
- *
+ * <p>
  * Markers are GPS points with a name and, optionally, a symbol code attached;
  * marker layers can be created from waypoints when importing raw GPS data,
  * but they may also come from other sources.
- *
+ * <p>
  * The symbol code is for future use.
- *
+ * <p>
  * The data is read only.
  */
@@ -95 +95 @@
     private Marker currentMarker;
     public AudioMarker syncAudioMarker;
-    private Color color, realcolor;
+    private Color color;
+    private Color realcolor;
     final int markerSize = new IntegerProperty("draw.rawgps.markers.size", 4).get();
     final BasicStroke markerStroke = new StrokeProperty("draw.rawgps.markers.stroke", "1").get();
@@ -523 +524 @@
     public List<? extends IImageEntry<?>> getSelection() {
         if (this.currentMarker instanceof ImageMarker) {
-            return Collections.singletonList(((ImageMarker) this.currentMarker).getRemoteEntry());
+            final RemoteEntry remoteEntry = ((ImageMarker) this.currentMarker).getRemoteEntry();
+            if (remoteEntry != null) {
+                return Collections.singletonList(remoteEntry);
+            }
         }
         return Collections.emptyList();