Changeset 34803 in osm for applications/editors/josm


Ignore:
Timestamp:
2019-01-01T15:48:40+01:00 (6 years ago)
Author:
donvip
Message:

update to JOSM 14347

Location:
applications/editors/josm/plugins/imagery-xml-bounds
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/imagery-xml-bounds/build.xml

    r34518 r34803  
    44    <property name="commit.message" value="Commit message"/>
    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/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlTextPane.java

    r34076 r34803  
    8484                try {
    8585                    if (text.charAt(start) != NEW_LINE) {
    86                         while ((end < text.length())
    87                                 && (Character.isWhitespace(text.charAt(end)))
    88                                 && (text.charAt(end) != NEW_LINE)) {
     86                        while (end < text.length()
     87                                && Character.isWhitespace(text.charAt(end))
     88                                && text.charAt(end) != NEW_LINE) {
    8989                            end++;
    9090                        }
  • applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/downloadtask/DownloadXmlBoundsTask.java

    r34306 r34803  
    44import static org.openstreetmap.josm.tools.I18n.tr;
    55
     6import java.util.Optional;
    67import java.util.concurrent.Future;
    78
     
    910import org.openstreetmap.josm.actions.downloadtasks.DownloadParams;
    1011import org.openstreetmap.josm.data.Bounds;
     12import org.openstreetmap.josm.data.osm.DataSet;
    1113import org.openstreetmap.josm.gui.MainApplication;
    1214import org.openstreetmap.josm.gui.layer.Layer;
     
    9395
    9496        @Override
    95         protected OsmDataLayer createNewLayer() {
    96             return new XmlBoundsLayer(dataSet, XmlBoundsLayer.createNewName(), null);
     97        protected OsmDataLayer createNewLayer(DataSet ds, Optional<String> layerName) {
     98            return new XmlBoundsLayer(ds, layerName.orElseGet(this::generateLayerName), null);
    9799        }
    98100    }
Note: See TracChangeset for help on using the changeset viewer.