Changeset 34483 in osm for applications/editors/josm/plugins/DirectDownload

Timestamp:

2018-08-15T14:19:24+02:00 (6 years ago)

Author:

donvip

Message:

update to JOSM 14153

Location:

applications/editors/josm/plugins/DirectDownload

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java (modified) (5 diffs)
• src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java (modified) (2 diffs)
• src/org/openstreetmap/josm/plugins/directdownload/GpxServerReader.java (modified) (3 diffs)

applications/editors/josm/plugins/DirectDownload/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="12643"/>
+    <property name="plugin.main.version" value="14153"/>
 
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java

@@ -8 +8 @@
 import java.util.HashMap;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.GpxData;
 import org.openstreetmap.josm.data.gpx.GpxTrack;
-import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
-import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.data.gpx.ImmutableGpxTrack;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -21 +19 @@
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.spi.preferences.Config;
 
 public class DirectDownload extends Plugin {
@@ -63 +62 @@
 
                 for (GpxTrack trk : data.getTracks()) {
-                    HashMap<String, Object> attrib = new HashMap<String, Object>(trk.getAttributes());
+                    HashMap<String, Object> attrib = new HashMap<>(trk.getAttributes());
                     if (!trk.getAttributes().containsKey(GpxConstants.GPX_NAME)) {
                         System.out.println(track.filename);
@@ -74 +73 @@
                     // replace the existing trace in the unmodifiable tracks
                     data.removeTrack(trk);
-                    trk = new ImmutableGpxTrack(new ArrayList<GpxTrackSegment>(trk.getSegments()), attrib);
+                    trk = new ImmutableGpxTrack(new ArrayList<>(trk.getSegments()), attrib);
                     data.addTrack(trk);
                 }
@@ -84 +83 @@
                 }
 
-                if (Main.pref.getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {
+                if (Config.getPref().getBoolean("marker.makeautomarkers", true) && !data.waypoints.isEmpty()) {
                     MarkerLayer ml = new MarkerLayer(data, tr("Markers from {0}", track.filename), null, gpxLayer);
                     if (ml.data.size() > 0) {

applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.java

@@ -23 +23 @@
 import javax.swing.table.TableColumn;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
+import org.openstreetmap.josm.gui.MainApplication;
 
 public class DownloadDataGui extends ExtendedDialog {
@@ -34 +34 @@
     public DownloadDataGui() {
         // Initalizes ExtendedDialog
-        super(Main.parent,
+        super(MainApplication.getMainFrame(),
           tr("Download Track"),
           new String[] {tr("Download Track"), tr("Cancel")},

applications/editors/josm/plugins/DirectDownload/src/org/openstreetmap/josm/plugins/directdownload/GpxServerReader.java

@@ -10 +10 @@
 import javax.swing.JOptionPane;
 
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.io.GpxReader;
 import org.openstreetmap.josm.io.OsmApi;
@@ -33 +33 @@
                 boolean parsedProperly = r.parse(true);
                 if (!parsedProperly) {
-                    JOptionPane.showMessageDialog(Main.parent,
+                    JOptionPane.showMessageDialog(MainApplication.getMainFrame(),
                             tr("Error occurred while parsing gpx file {0}. Only a part of the file will be available.", urlString));
                 }
@@ -40 +40 @@
         } catch (IOException | OsmTransferException e) {
             Logging.warn(e);
-            JOptionPane.showMessageDialog(Main.parent, tr("Error fetching URL {0}", urlString));
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Error fetching URL {0}", urlString));
             return null;
         } catch (SAXException e) {
             Logging.warn(e);
-            JOptionPane.showMessageDialog(Main.parent, tr("Error parsing data from URL {0}", urlString));
+            JOptionPane.showMessageDialog(MainApplication.getMainFrame(), tr("Error parsing data from URL {0}", urlString));
             return null;
         }