Changeset 14350 in josm for trunk

Timestamp:

2018-10-19T01:20:02+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16850 - fix error_prone warning

File:

• trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java (modified) (1 diff)

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

@@ -270 +270 @@
          * {@link #generateLayerName()} instead.
          *
-         * @param dataset the dataset on which the layer is based, must be non-null
+         * @param ds the dataset on which the layer is based, must be non-null
          * @param layerName the name of the new layer, must be either non-blank or non-present
          * @return a new instance of {@link OsmDataLayer} constructed with the given arguments
          * @since 14347
          */
-        protected OsmDataLayer createNewLayer(final DataSet dataset, final Optional<String> layerName) {
+        protected OsmDataLayer createNewLayer(final DataSet ds, final Optional<String> layerName) {
             if (layerName.filter(Utils::isStripEmpty).isPresent()) {
                 throw new IllegalArgumentException("Blank layer name!");
             }
             return new OsmDataLayer(
-                Objects.requireNonNull(dataset, "dataset parameter"),
+                Objects.requireNonNull(ds, "dataset parameter"),
                 layerName.orElseGet(this::generateLayerName),
                 null