Changeset 27691 in osm for applications/editors

Timestamp:

2012-02-02T18:22:50+01:00 (13 years ago)

Author:

roland

Message:

Minor bugfixes.

Location:

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

Files:

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

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

@@ -28 +28 @@
 public class DownloadAction2 extends JosmAction {
     public DownloadAction2() {
-        super(tr("Download from OSM..."), "download", tr("Download map data from the OSM server."),
-                Shortcut.registerShortcut("file:download", tr("File: {0}", tr("Download from OSM...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true);
-        putValue("help", ht("/Action/Download"));
+        super(tr("Download from OSM mirror..."), "download", tr("Download map data from the OSM server."),
+                Shortcut.registerShortcut("mirror:download", tr("File: {0}", tr("Download from OSM mirror...")), KeyEvent.VK_D, Shortcut.GROUPS_ALT1+Shortcut.GROUP_HOTKEY), true);
+        putValue("help", ht("/Action/MirroredDownload"));
     }
 

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

@@ -30 +30 @@
 
     public void actionPerformed(ActionEvent e) {
-        UrlSelectionDialog dialog = new UrlSelectionDialog(this);
+        UrlSelectionDialog dialog = UrlSelectionDialog.getInstance();
         dialog.setVisible(true);
     }

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

@@ -69 +69 @@
   private JComboBox cbSelectUrl = null;
 
-  public UrlSelectionDialog(UrlSelectionAction controller) {
+  public UrlSelectionDialog() {
 
     Frame frame = JOptionPane.getFrameForComponent(Main.parent);
-    jDialog = new JDialog(frame, tr("Create Stops from GPX"), false);
+    jDialog = new JDialog(frame, tr("Select OSM mirror URL"), false);
     tabbedPane = new JTabbedPane();
     JPanel tabSettings = new JPanel();
@@ -129 +129 @@
     jDialog.setVisible(visible);
   }
+
+  private static UrlSelectionDialog singleton = null;
+
+  public static UrlSelectionDialog getInstance() {
+
+    if (singleton == null)
+      singleton = new UrlSelectionDialog();
+
+    return singleton;
+  }
 }