Changeset 32442 in osm for applications/editors

Timestamp:

2016-06-29T20:59:47+02:00 (8 years ago)

Author:

donvip

Message:

remove calls to deprecated methods

Location:

applications/editors/josm/plugins/DirectDownload

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/directdownload/DirectDownload.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/directdownload/DownloadDataGui.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="7001"/>
+    <property name="plugin.main.version" value="10279"/>
 
     <!-- Configure these properties (replace "..." accordingly).

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

@@ -4 +4 @@
 
 import java.awt.event.ActionEvent;
-import java.io.InputStream;
-import java.net.URL;
-
-import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -15 +11 @@
 import org.openstreetmap.josm.gui.layer.GpxLayer;
 import org.openstreetmap.josm.gui.layer.markerlayer.MarkerLayer;
-import org.openstreetmap.josm.io.GpxReader;
-import org.openstreetmap.josm.io.OsmApi;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
-import org.openstreetmap.josm.tools.Utils;
-import org.xml.sax.SAXException;
 
 public class DirectDownload extends Plugin {
@@ -60 +52 @@
 
             if (data.hasRoutePoints() || data.hasTrackPoints()) {
-                Main.main.addLayer(gpxLayer);
+                Main.getLayerManager().addLayer(gpxLayer);
             }
 
@@ -66 +58 @@
                 MarkerLayer ml = new MarkerLayer(data, tr("Markers from {0}", track.filename), null, gpxLayer);
                 if (ml.data.size() > 0) {
-                    Main.main.addLayer(ml);
+                    Main.getLayerManager().addLayer(ml);
                 }
             }

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

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.Dimension;
-import java.net.URL;
 import java.util.ArrayList;
-import java.util.LinkedList;
 import java.util.List;
 
@@ -14 +12 @@
 import javax.swing.DefaultListSelectionModel;
 import javax.swing.JLabel;
-import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -26 +23 @@
 import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.gui.ExtendedDialog;
-import org.openstreetmap.josm.io.OsmApi;
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
 
 public class DownloadDataGui extends ExtendedDialog {