Ignore:
Timestamp:
2012-02-19T15:54:06+01:00 (13 years ago)
Author:
stoecker
Message:

fix conflicts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/plugins/mirrored_download/src/mirrored_download/MirroredDownloadPlugin.java

    r27679 r27877  
    2828  {
    2929    super(info);
    30     refreshMenu();
    31   }
    32 
    33   public static void refreshMenu()
    34   {
    35     MainMenu menu = Main.main.menu;
    36 
    37     if (jMenu == null)
    38       jMenu = menu.addMenu(marktr("Mirrored Download"), KeyEvent.VK_P, menu.defaultMenuPos, "help");
    39     else
    40       jMenu.removeAll();
    41 
    42     jMenu.addSeparator();
    43     jMenu.add(new JMenuItem(new DownloadAction2()));
    44     jMenu.add(new JMenuItem(new UrlSelectionAction()));
    45     setEnabledAll(true);
    46   }
    47 
    48   private static void setEnabledAll(boolean isEnabled)
    49   {
    50     for(int i=0; i < jMenu.getItemCount(); i++) {
    51       JMenuItem item = jMenu.getItem(i);
    52 
    53       if(item != null) item.setEnabled(isEnabled);
    54     }
     30    MainMenu.add(Main.main.menu.fileMenu, new DownloadAction2());
     31    MainMenu.add(Main.main.menu.fileMenu, new UrlSelectionAction());
    5532  }
    5633
     
    6037    return downloadUrl;
    6138  }
     39
    6240  public static void setDownloadUrl(String downloadUrl_) {
    6341    downloadUrl = downloadUrl_;
Note: See TracChangeset for help on using the changeset viewer.