Changeset 14350 in josm for trunk


Ignore:
Timestamp:
2018-10-19T01:20:02+02:00 (8 months ago)
Author:
Don-vip
Message:

see #16850 - fix error_prone warning

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

    r14347 r14350  
    270270         * {@link #generateLayerName()} instead.
    271271         *
    272          * @param dataset the dataset on which the layer is based, must be non-null
     272         * @param ds the dataset on which the layer is based, must be non-null
    273273         * @param layerName the name of the new layer, must be either non-blank or non-present
    274274         * @return a new instance of {@link OsmDataLayer} constructed with the given arguments
    275275         * @since 14347
    276276         */
    277         protected OsmDataLayer createNewLayer(final DataSet dataset, final Optional<String> layerName) {
     277        protected OsmDataLayer createNewLayer(final DataSet ds, final Optional<String> layerName) {
    278278            if (layerName.filter(Utils::isStripEmpty).isPresent()) {
    279279                throw new IllegalArgumentException("Blank layer name!");
    280280            }
    281281            return new OsmDataLayer(
    282                 Objects.requireNonNull(dataset, "dataset parameter"),
     282                Objects.requireNonNull(ds, "dataset parameter"),
    283283                layerName.orElseGet(this::generateLayerName),
    284284                null
Note: See TracChangeset for help on using the changeset viewer.