Changeset 13434 in josm for trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

Timestamp:

2018-02-18T05:02:23+01:00 (8 years ago)

Author:

Don-vip

Message:

see #8039, see #10456 - support read-only data layers

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (4 diffs)

trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

@@ -16 +16 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Stream;
 
 import org.openstreetmap.josm.data.Bounds;
@@ -227 +228 @@
         }
 
+        /**
+         * Returns the number of modifiable data layers
+         * @return number of modifiable data layers
+         * @deprecated Use {@link #getNumModifiableDataLayers}
+         */
+        @Deprecated
         protected int getNumDataLayers() {
-            return MainApplication.getLayerManager().getLayersOfType(OsmDataLayer.class).size();
-        }
-
-        protected OsmDataLayer getFirstDataLayer() {
-            return Utils.find(MainApplication.getLayerManager().getLayers(), OsmDataLayer.class);
+            return (int) getNumModifiableDataLayers();
+        }
+
+        private static Stream<OsmDataLayer> getModifiableDataLayers() {
+            return MainApplication.getLayerManager().getLayersOfType(OsmDataLayer.class)
+                    .stream().filter(l -> !l.isReadOnly());
+        }
+
+        /**
+         * Returns the number of modifiable data layers
+         * @return number of modifiable data layers
+         * @since 13434
+         */
+        protected long getNumModifiableDataLayers() {
+            return getModifiableDataLayers().count();
+        }
+
+        /**
+         * Returns the first modifiable data layer
+         * @return the first modifiable data layer
+         * @since 13434
+         */
+        protected OsmDataLayer getFirstModifiableDataLayer() {
+            return getModifiableDataLayers().findFirst().orElse(null);
         }
 
@@ -257 +283 @@
 
         protected OsmDataLayer addNewLayerIfRequired(String newLayerName) {
-            int numDataLayers = getNumDataLayers();
+            long numDataLayers = getNumModifiableDataLayers();
             if (newLayer || numDataLayers == 0 || (numDataLayers > 1 && getEditLayer() == null)) {
                 // the user explicitly wants a new layer, we don't have any layer at all
@@ -272 +298 @@
             OsmDataLayer layer = addNewLayerIfRequired(newLayerName);
             if (layer == null) {
-                layer = Optional.ofNullable(getEditLayer()).orElseGet(this::getFirstDataLayer);
+                layer = Optional.ofNullable(getEditLayer()).orElseGet(this::getFirstModifiableDataLayer);
                 Collection<OsmPrimitive> primitivesToUpdate = searchPrimitivesToUpdate(bounds, layer.data);
                 layer.mergeFrom(dataSet);