Changeset 29505 in osm for applications/editors/josm/plugins/mirrored_download/src

Timestamp:

2013-04-16T20:18:30+02:00 (12 years ago)

Author:

donvip

Message:

[josm_plugins] Update plugins impacted by JOSM revision 5874 + fix various warnings

Location:

applications/editors/josm/plugins/mirrored_download/src/mirrored_download

Files:

• MirroredDownloadAction.java (modified) (2 diffs)
• UrlSelectionAction.java (modified) (1 diff)
• UrlSelectionDialog.java (modified) (3 diffs)

applications/editors/josm/plugins/mirrored_download/src/mirrored_download/MirroredDownloadAction.java

@@ -14 +14 @@
 import java.util.concurrent.Future;
 import java.util.regex.Pattern;
+
 import javax.swing.JComboBox;
 import javax.swing.JLabel;
@@ -19 +20 @@
 import javax.swing.text.JTextComponent;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
-
-import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.downloadtasks.DownloadOsmTask;
 import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;

applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionAction.java

@@ -8 +8 @@
 
 import org.openstreetmap.josm.actions.JosmAction;
-
 
 /**

applications/editors/josm/plugins/mirrored_download/src/mirrored_download/UrlSelectionDialog.java

@@ -2 +2 @@
 package mirrored_download;
 
-import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
 
-import java.awt.Container;
 import java.awt.Frame;
 import java.awt.GridBagConstraints;
@@ -12 +10 @@
 import java.awt.event.ActionListener;
 import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.text.Format;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.Vector;
-import java.util.zip.GZIPInputStream;
 
-import javax.swing.DefaultCellEditor;
-import javax.swing.DefaultListModel;
-import javax.swing.JButton;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
-import javax.swing.JComponent;
 import javax.swing.JDialog;
-import javax.swing.JFileChooser;
 import javax.swing.JLabel;
-import javax.swing.JList;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
-import javax.swing.JScrollPane;
 import javax.swing.JTabbedPane;
-import javax.swing.JTable;
-import javax.swing.JTextField;
-import javax.swing.KeyStroke;
-import javax.swing.ListSelectionModel;
-import javax.swing.event.ListSelectionEvent;
-import javax.swing.event.ListSelectionListener;
-import javax.swing.event.TableModelEvent;
-import javax.swing.event.TableModelListener;
-import javax.swing.table.DefaultTableModel;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.command.Command;
-import org.openstreetmap.josm.command.ChangeCommand;
-import org.openstreetmap.josm.command.DeleteCommand;
-import org.openstreetmap.josm.data.coor.LatLon;
-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.WayPoint;
-import org.openstreetmap.josm.data.osm.DataSet;
-import org.openstreetmap.josm.data.osm.Node;
-import org.openstreetmap.josm.data.osm.OsmPrimitive;
-import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.io.GpxReader;
 import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.tools.Utils;
-
-import org.xml.sax.SAXException;
 
 public class UrlSelectionDialog
@@ -160 +117 @@
         }
       }
+      Utils.close(reader);
     } catch (IOException e) {
       e.printStackTrace();
+    } finally {
+      Utils.close(in);
     }
-    Utils.close(in);
     for (String url : Main.pref.getCollection("plugin.mirrored_download.custom-urls")) {
       urls.add(url);