Changeset 27877 in osm for applications/editors/josm

Timestamp:

2012-02-19T15:54:06+01:00 (13 years ago)

Author:

stoecker

Message:

fix conflicts

Location:

applications/editors/josm/plugins

Files:

• mirrored_download/src/mirrored_download/MirroredDownloadPlugin.java (modified) (2 diffs)
• public_transport/src/public_transport/PublicTransportPlugin.java (modified) (1 diff)

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

@@ -28 +28 @@
   {
     super(info);
-    refreshMenu();
-  }
-
-  public static void refreshMenu()
-  {
-    MainMenu menu = Main.main.menu;
-
-    if (jMenu == null)
-      jMenu = menu.addMenu(marktr("Mirrored Download"), KeyEvent.VK_P, menu.defaultMenuPos, "help");
-    else
-      jMenu.removeAll();
-
-    jMenu.addSeparator();
-    jMenu.add(new JMenuItem(new DownloadAction2()));
-    jMenu.add(new JMenuItem(new UrlSelectionAction()));
-    setEnabledAll(true);
-  }
-
-  private static void setEnabledAll(boolean isEnabled)
-  {
-    for(int i=0; i < jMenu.getItemCount(); i++) {
-      JMenuItem item = jMenu.getItem(i);
-
-      if(item != null) item.setEnabled(isEnabled);
-    }
+    MainMenu.add(Main.main.menu.fileMenu, new DownloadAction2());
+    MainMenu.add(Main.main.menu.fileMenu, new UrlSelectionAction());
   }
 
@@ -60 +37 @@
     return downloadUrl;
   }
+
   public static void setDownloadUrl(String downloadUrl_) {
     downloadUrl = downloadUrl_;

applications/editors/josm/plugins/public_transport/src/public_transport/PublicTransportPlugin.java

@@ -36 +36 @@
 
     if (jMenu == null)
-      jMenu = menu.addMenu(marktr("Public Transport"), KeyEvent.VK_P, menu.defaultMenuPos, "help");
+      jMenu = menu.addMenu(marktr("Public Transport"), KeyEvent.VK_COMMA, menu.defaultMenuPos, "help");
     else
       jMenu.removeAll();