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

Timestamp:

2019-11-02T15:11:34+01:00 (5 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/layer/Layer.java (modified) (7 diffs)

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

@@ -26 +26 @@
 import org.openstreetmap.josm.data.ProjectionBounds;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.preferences.AbstractProperty;
-import org.openstreetmap.josm.data.preferences.AbstractProperty.ValueChangeListener;
-import org.openstreetmap.josm.data.preferences.NamedColorProperty;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionChangeListener;
@@ -165 +162 @@
     private File associatedFile;
 
-    private final ValueChangeListener<Object> invalidateListener = change -> invalidate();
     private boolean isDestroyed;
 
@@ -199 +195 @@
 
     /**
-     * Gets the color property to use for this layer.
-     * @return The color property.
-     * @since 10824
-     */
-    public AbstractProperty<Color> getColorProperty() {
-        NamedColorProperty base = getBaseColorProperty();
-        if (base != null) {
-            return base.getChildColor(NamedColorProperty.COLOR_CATEGORY_LAYER, getName(), base.getName());
-        } else {
-            return null;
-        }
-    }
-
-    /**
-     * Gets the color property that stores the default color for this layer.
-     * @return The property or <code>null</code> if this layer is not colored.
-     * @since 10824
-     */
-    protected NamedColorProperty getBaseColorProperty() {
+     * @return whether the layer has / can handle colors.
+     * @since 15496
+     */
+    public boolean hasColor() {
+        return false;
+    }
+
+    /**
+     * Return the current color of the layer
+     * @return null when not present or not supported
+     * @since 15496
+     */
+    public Color getColor() {
         return null;
     }
 
-    private void addColorPropertyListener() {
-        AbstractProperty<Color> colorProperty = getColorProperty();
-        if (colorProperty != null) {
-            colorProperty.addListener(invalidateListener);
-        }
-    }
-
-    private void removeColorPropertyListener() {
-        AbstractProperty<Color> colorProperty = getColorProperty();
-        if (colorProperty != null) {
-            colorProperty.removeListener(invalidateListener);
-        }
+    /**
+     * Sets the color for this layer. Nothing happens if not supported by the layer
+     * @param color the color to be set, <code>null</code> for default
+     * @since 15496
+     */
+    public void setColor(Color color) {
     }
 
@@ -303 +287 @@
         isDestroyed = true;
         // Override in subclasses if needed
-        removeColorPropertyListener();
     }
 
@@ -340 +323 @@
      */
     public void setName(String name) {
-        if (this.name != null) {
-            removeColorPropertyListener();
-        }
         String oldValue = this.name;
         this.name = Optional.ofNullable(name).orElse("");
@@ -348 +328 @@
             propertyChangeSupport.firePropertyChange(NAME_PROP, oldValue, this.name);
         }
-
-        // re-add listener
-        addColorPropertyListener();
         invalidate();
     }
@@ -540 +517 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            SaveAction.getInstance().doSave(layer);
+            SaveAction.getInstance().doSave(layer, true);
         }
     }