Changeset 12523 in josm


Ignore:
Timestamp:
2017-07-27T01:30:42+02:00 (5 months ago)
Author:
Don-vip
Message:

see #11924 - fix remaining warnings about extended modifiers

Location:
trunk/src/org/openstreetmap/josm
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java

    r12279 r12523  
    178178        // Edit relation on Ctrl-Enter
    179179        displaylist.getActionMap().put("edit", editAction);
    180         displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.CTRL_MASK), "edit");
     180        displaylist.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.CTRL_DOWN_MASK), "edit");
    181181
    182182        // Do not hide copy action because of default JList override (fix #9815)
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r12420 r12523  
    449449
    450450        tagTable.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
    451                 .put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK), "onCopy");
     451                .put(KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_DOWN_MASK), "onCopy");
    452452        tagTable.getActionMap().put("onCopy", copyKeyValueAction);
    453453
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

    r12279 r12523  
    722722            // Add tag on Shift-Enter
    723723            mainPanel.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
    724                         KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.SHIFT_MASK), "addAndContinue");
     724                        KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.SHIFT_DOWN_MASK), "addAndContinue");
    725725                mainPanel.getActionMap().put("addAndContinue", new AbstractAction() {
    726726                    @Override
     
    814814                    lines.add(sc.getKeyText() + ' ' + tr("to apply first suggestion"))
    815815            );
    816             lines.add(KeyEvent.getKeyModifiersText(KeyEvent.SHIFT_MASK)+'+'+KeyEvent.getKeyText(KeyEvent.VK_ENTER) + ' '
     816            lines.add(Shortcut.getKeyText(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_DOWN_MASK)) + ' '
    817817                    +tr("to add without closing the dialog"));
    818818            Shortcut.findShortcut(KeyEvent.VK_1, commandDownMask | KeyEvent.SHIFT_DOWN_MASK).ifPresent(sc ->
  • trunk/src/org/openstreetmap/josm/gui/download/DownloadDialog.java

    r11658 r12523  
    242242
    243243        getRootPane().getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW).put(
    244                 KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK), "checkClipboardContents");
     244                KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_DOWN_MASK), "checkClipboardContents");
    245245
    246246        getRootPane().getActionMap().put("checkClipboardContents", new AbstractAction() {
  • trunk/src/org/openstreetmap/josm/gui/preferences/shortcut/PrefJPanel.java

    r12497 r12523  
    6565    // independent from the keyboard's labelling. But the operation system's locale
    6666    // usually matches the keyboard. This even works with my English Windows and my German keyboard.
    67     private static final String SHIFT = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
     67    private static final String SHIFT = KeyEvent.getModifiersExText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
    6868            KeyEvent.SHIFT_DOWN_MASK).getModifiers());
    69     private static final String CTRL = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
     69    private static final String CTRL = KeyEvent.getModifiersExText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
    7070            KeyEvent.CTRL_DOWN_MASK).getModifiers());
    71     private static final String ALT = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
     71    private static final String ALT = KeyEvent.getModifiersExText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
    7272            KeyEvent.ALT_DOWN_MASK).getModifiers());
    73     private static final String META = KeyEvent.getKeyModifiersText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
     73    private static final String META = KeyEvent.getModifiersExText(KeyStroke.getKeyStroke(KeyEvent.VK_A,
    7474            KeyEvent.META_DOWN_MASK).getModifiers());
    7575
  • trunk/src/org/openstreetmap/josm/gui/tagging/TagTable.java

    r12384 r12523  
    354354        addAction = new AddAction();
    355355        getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
    356         .put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, KeyEvent.CTRL_MASK), "addTag");
     356        .put(KeyStroke.getKeyStroke(KeyEvent.VK_ADD, KeyEvent.CTRL_DOWN_MASK), "addTag");
    357357        getActionMap().put("addTag", addAction);
    358358
  • trunk/src/org/openstreetmap/josm/io/remotecontrol/AddTagsDialog.java

    r12279 r12523  
    216216        // get edit results if the table looses the focus, for example if a user clicks "add tags"
    217217        propertyTable.putClientProperty("terminateEditOnFocusLost", Boolean.TRUE);
    218         propertyTable.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_MASK), "shiftenter");
     218        propertyTable.getInputMap().put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, KeyEvent.SHIFT_DOWN_MASK), "shiftenter");
    219219        propertyTable.getActionMap().put("shiftenter", new AbstractAction() {
    220220            @Override public void actionPerformed(ActionEvent e) {
Note: See TracChangeset for help on using the changeset viewer.