Changeset 15496 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java

Timestamp:

2019-11-02T15:11:34+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #16796 - Rework of GPX track colors / layer preferences (patch by Bjoeni)

File:

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

trunk/src/org/openstreetmap/josm/gui/dialogs/layer/LayerVisibilityAction.java

@@ -594 +594 @@
                     for (Layer l : layers) {
                         if (l instanceof GpxLayer) {
-                            l.getColorProperty().put(color);
+                            l.setColor(color);
                         }
                     }
@@ -603 +603 @@
             panels.put(color, colorPanel);
 
-            List<Color> colors = layerSupplier.get().stream().map(l -> l.getColorProperty().get()).distinct().collect(Collectors.toList());
+            List<Color> colors = layerSupplier.get().stream().map(l -> l.getColor()).distinct().collect(Collectors.toList());
             if (colors.size() == 1) {
                 highlightColor(colors.get(0));
@@ -612 +612 @@
         public void updateLayers(List<Layer> layers, boolean allVisible, boolean allHidden) {
             List<Color> colors = layers.stream().filter(l -> l instanceof GpxLayer)
-                    .map(l -> ((GpxLayer) l).getColorProperty().get())
+                    .map(l -> ((GpxLayer) l).getColor())
                     .distinct()
                     .collect(Collectors.toList());