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

Timestamp:

2016-03-18T00:56:54+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #12633 - Make layer order more flexible by letting each layer decide where it wants to be placed (patch by michael2402)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapView.java (modified) (4 diffs)
• layer/GpxLayer.java (modified) (1 diff)
• layer/Layer.java (modified) (1 diff)
• layer/LayerPositionStrategy.java (added)
• layer/ValidatorLayer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MapView.java

@@ -58 +58 @@
 import org.openstreetmap.josm.gui.layer.ImageryLayer;
 import org.openstreetmap.josm.gui.layer.Layer;
+import org.openstreetmap.josm.gui.layer.LayerPositionStrategy;
 import org.openstreetmap.josm.gui.layer.MapViewPaintable;
+import org.openstreetmap.josm.gui.layer.NativeScaleLayer;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
-import org.openstreetmap.josm.gui.layer.NativeScaleLayer;
 import org.openstreetmap.josm.gui.layer.geoimage.GeoImageLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
@@ -347 +348 @@
 
     /**
-     * Adds a GPX layer. A GPX layer is added below the lowest data layer.
-     * <p>
-     * Does not call {@link #fireLayerAdded(Layer)}.
-     *
-     * @param layer the GPX layer
-     */
-    protected void addGpxLayer(GpxLayer layer) {
-        synchronized (layers) {
-            if (layers.isEmpty()) {
-                layers.add(layer);
-                return;
-            }
-            for (int i = layers.size()-1; i >= 0; i--) {
-                if (layers.get(i) instanceof OsmDataLayer) {
-                    if (i == layers.size()-1) {
-                        layers.add(layer);
-                    } else {
-                        layers.add(i+1, layer);
-                    }
-                    return;
-                }
-            }
-            layers.add(0, layer);
-        }
-    }
-
-    /**
      * Add a layer to the current MapView. The layer will be added at topmost
      * position.
@@ -389 +363 @@
             }
 
-            if (layer instanceof GpxLayer) {
-                addGpxLayer((GpxLayer) layer);
-            } else if (layers.isEmpty()) {
-                layers.add(layer);
-            } else if (layer.isBackgroundLayer()) {
-                int i = 0;
-                for (; i < layers.size(); i++) {
-                    if (layers.get(i).isBackgroundLayer()) {
-                        break;
-                    }
-                }
-                layers.add(i, layer);
-            } else {
-                layers.add(0, layer);
-            }
+            LayerPositionStrategy positionStrategy = layer.getDefaultLayerPosition();
+            int position = positionStrategy.getPosition(this);
+            checkPosition(position);
+            insertLayerAt(layer, position);
 
             if (isOsmDataLayer || oldActiveLayer == null) {
@@ -427 +390 @@
         if (!listenersToFire.isEmpty()) {
             repaint();
+        }
+    }
+
+    /**
+     * Check if the (new) position is valid
+     * @param position The position index
+     * @throws IndexOutOfBoundsException if it is not.
+     */
+    private void checkPosition(int position) {
+        if (position < 0 || position > layers.size()) {
+            throw new IndexOutOfBoundsException("Position " + position + " out of range.");
+        }
+    }
+
+    /**
+     * Insert a layer at a given position.
+     * @param layer The layer to add.
+     * @param position The position on which we should add it.
+     */
+    private void insertLayerAt(Layer layer, int position) {
+        if (position == layers.size()) {
+            layers.add(layer);
+        } else {
+            layers.add(position, layer);
         }
     }

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

@@ -385 +385 @@
     }
 
+    @Override
+    public LayerPositionStrategy getDefaultLayerPosition() {
+        return LayerPositionStrategy.AFTER_LAST_DATA_LAYER;
+    }
 }

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

@@ -581 +581 @@
         return 0;
     }
+
+    /**
+     * Gets the strategy that specifies where this layer should be inserted in a layer list.
+     * @return That strategy.
+     * @since 10008
+     */
+    public LayerPositionStrategy getDefaultLayerPosition() {
+        if (isBackgroundLayer()) {
+            return LayerPositionStrategy.BEFORE_FIRST_BACKGROUND_LAYER;
+        } else {
+            return LayerPositionStrategy.AFTER_LAST_VALIDATION_LAYER;
+        }
+    }
 }

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

@@ -160 +160 @@
         }
     }
+
+    @Override
+    public LayerPositionStrategy getDefaultLayerPosition() {
+        return LayerPositionStrategy.IN_FRONT;
+    }
 }