Changeset 34803 in osm for applications/editors/josm

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:

• build.xml (modified) (1 diff)
• src/net/boplicity/xmleditor/XmlTextPane.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/downloadtask/DownloadXmlBoundsTask.java (modified) (3 diffs)

applications/editors/josm/plugins/imagery-xml-bounds/build.xml

@@ -4 +4 @@
     <property name="commit.message" value="Commit message"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="14347"/>
     
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/imagery-xml-bounds/src/net/boplicity/xmleditor/XmlTextPane.java

@@ -84 +84 @@
                 try {
                     if (text.charAt(start) != NEW_LINE) {
-                        while ((end < text.length())
-                                && (Character.isWhitespace(text.charAt(end)))
-                                && (text.charAt(end) != NEW_LINE)) {
+                        while (end < text.length()
+                                && Character.isWhitespace(text.charAt(end))
+                                && text.charAt(end) != NEW_LINE) {
                             end++;
                         }

applications/editors/josm/plugins/imagery-xml-bounds/src/org/openstreetmap/josm/plugins/imageryxmlbounds/actions/downloadtask/DownloadXmlBoundsTask.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
+import java.util.Optional;
 import java.util.concurrent.Future;
 
@@ -9 +10 @@
 import org.openstreetmap.josm.actions.downloadtasks.DownloadParams;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.layer.Layer;
@@ -93 +95 @@
 
         @Override
-        protected OsmDataLayer createNewLayer() {
-            return new XmlBoundsLayer(dataSet, XmlBoundsLayer.createNewName(), null);
+        protected OsmDataLayer createNewLayer(DataSet ds, Optional<String> layerName) {
+            return new XmlBoundsLayer(ds, layerName.orElseGet(this::generateLayerName), null);
         }
     }