Ticket #7512: 7512.patch

src/mirrored_download/UrlSelectionAction.java

@@ -5 +5 @@
 import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.util.concurrent.Future;
 
 import org.openstreetmap.josm.actions.JosmAction;
 
-import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.downloadtasks.DownloadGpsTask;
-import org.openstreetmap.josm.actions.downloadtasks.PostDownloadHandler;
-import org.openstreetmap.josm.data.Bounds;
-import org.openstreetmap.josm.gui.download.DownloadDialog;
-import org.openstreetmap.josm.tools.Shortcut;
 
 /**
  * TODO: Write comment.
@@ -23 +15 @@
 public class UrlSelectionAction extends JosmAction {
 
     public UrlSelectionAction() {
-        super(tr("Select URL..."), null, tr("Select URL to download from."),
-                Shortcut.registerShortcut("file:selecturl", tr("File: {0}", tr("Select URL...")), KeyEvent.VK_D, Shortcut.CTRL_SHIFT),
-                true, "mirroreddownload/urlselection", true);
+        super(tr("Select OSM mirror URL"), null, tr("Select OSM mirror URL to download from."),
+                null, true, "mirroreddownload/urlselection", true);
         putValue("help", ht("/Action/SelectUrl"));
     }
 

src/mirrored_download/MirroredDownloadPlugin.java

@@ -1 +1 @@
 package mirrored_download;
 
-import static org.openstreetmap.josm.tools.I18n.marktr;
+import java.awt.Component;
 
-import java.awt.event.KeyEvent;
-
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
 
 import org.openstreetmap.josm.Main;
-import org.openstreetmap.josm.actions.JosmAction;
-import org.openstreetmap.josm.data.ProjectionBounds;
-import org.openstreetmap.josm.gui.IconToggleButton;
 import org.openstreetmap.josm.gui.MainMenu;
-import org.openstreetmap.josm.gui.MapFrame;
-import org.openstreetmap.josm.gui.MapView;
-import org.openstreetmap.josm.gui.preferences.PreferenceSetting;
-import org.openstreetmap.josm.io.CacheFiles;
-import org.openstreetmap.josm.io.MirroredInputStream;
 import org.openstreetmap.josm.plugins.Plugin;
 import org.openstreetmap.josm.plugins.PluginInformation;
 
 public class MirroredDownloadPlugin extends Plugin {
 
-  static JMenu jMenu;
+    static JMenu jMenu;
 
-  public MirroredDownloadPlugin(PluginInformation info)
-  {
-    super(info);
-    MainMenu.add(Main.main.menu.fileMenu, new DownloadAction2());
-    MainMenu.add(Main.main.menu.fileMenu, new UrlSelectionAction());
-  }
+    public MirroredDownloadPlugin(PluginInformation info) {
+        super(info);
+        MainMenu.addAfter(Main.main.menu.fileMenu, new DownloadAction2(), false, Main.main.menu.download);
+        MainMenu.add(Main.main.menu.editMenu, new UrlSelectionAction());
+    }
+    private static String downloadUrl = "http://overpass.osm.rambler.ru/cgi/xapi?";//"http://overpass-api.de/api/xapi?";
 
-  private static String downloadUrl = "http://overpass.osm.rambler.ru/cgi/xapi?";//"http://overpass-api.de/api/xapi?";
+    public static String getDownloadUrl() {
+        return downloadUrl;
+    }
 
-  public static String getDownloadUrl() {
-    return downloadUrl;
-  }
-
-  public static void setDownloadUrl(String downloadUrl_) {
-    downloadUrl = downloadUrl_;
-  }
+    public static void setDownloadUrl(String downloadUrl_) {
+        downloadUrl = downloadUrl_;
+    }
 }