Changeset 34801 in osm for applications/editors/josm


Ignore:
Timestamp:
2019-01-01T14:44:20+01:00 (6 years ago)
Author:
donvip
Message:

update to JOSM 14347

Location:
applications/editors/josm/plugins/cadastre-fr
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/cadastre-fr/build.xml

    r34458 r34801  
    44    <property name="commit.message" value="Changed constructor for Plugin"/>
    55    <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    6     <property name="plugin.main.version" value="14153"/>
     6    <property name="plugin.main.version" value="14347"/>
    77   
    88    <!-- Configure these properties (replace "..." accordingly).
  • applications/editors/josm/plugins/cadastre-fr/src/org/openstreetmap/josm/plugins/fr/cadastre/download/CadastreDownloadTask.java

    r34711 r34801  
    99import java.util.List;
    1010import java.util.Objects;
     11import java.util.Optional;
    1112import java.util.concurrent.ExecutionException;
    1213import java.util.concurrent.Future;
     
    111112
    112113        @Override
    113         protected CadastreDataLayer createNewLayer(String layerName) {
    114             String realLayerName = layerName != null ? layerName : url.substring(url.lastIndexOf('/')+1);
     114        protected CadastreDataLayer createNewLayer(DataSet dataset, Optional<String> layerName) {
     115            String realLayerName = layerName.isPresent() ? layerName.get() : url.substring(url.lastIndexOf('/')+1);
    115116            if (realLayerName == null || realLayerName.isEmpty()) {
    116117                realLayerName = settings.getLayerName();
Note: See TracChangeset for help on using the changeset viewer.