Ignore:
Timestamp:
2017-08-14T13:44:21+02:00 (2 years ago)
Author:
Don-vip
Message:

fix #15149 - do not register actions in toolbar when loading internal osm databases (traffic/boundaries) for the first time

Location:
trunk/src/org/openstreetmap/josm/actions
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

    r11822 r12602  
    454454    /**
    455455     * Constructs a new {@code JoinAreasAction} with optional shortcut.
    456      * @param addShortcut controls whether the shortcut should be registered or not
     456     * @param addShortcut controls whether the shortcut should be registered or not, as for toolbar registration
    457457     * @since 11611
    458458     */
     
    460460        super(tr("Join overlapping Areas"), "joinareas", tr("Joins areas that overlap each other"), addShortcut ?
    461461        Shortcut.registerShortcut("tools:joinareas", tr("Tool: {0}", tr("Join overlapping Areas")), KeyEvent.VK_J, Shortcut.SHIFT)
    462         : null, true);
     462        : null, addShortcut);
    463463    }
    464464
  • trunk/src/org/openstreetmap/josm/actions/PurgeAction.java

    r11611 r12602  
    8686    /**
    8787     * Constructs a new {@code PurgeAction} with optional shortcut.
    88      * @param addShortcut controls whether the shortcut should be registered or not
     88     * @param addShortcut controls whether the shortcut should be registered or not, as for toolbar registration
    8989     * @since 11611
    9090     */
     
    9393        super(tr("Purge..."), "purge", tr("Forget objects but do not delete them on server when uploading."), addShortcut ?
    9494                Shortcut.registerShortcut("system:purge", tr("Edit: {0}", tr("Purge")), KeyEvent.VK_P, Shortcut.CTRL_SHIFT)
    95                 : null, true);
     95                : null, addShortcut);
    9696        putValue("help", HelpUtil.ht("/Action/Purge"));
    9797    }
Note: See TracChangeset for help on using the changeset viewer.