This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 26854
Collapse All | Expand All

(-)editor/libsrc/org/netbeans/editor/BaseKit.java (-2 / +2 lines)
Line 18 Link Here
18 
import java.awt.Toolkit;
Line 765 Link Here
765 
                boolean ctrl = ((mod & ActionEvent.CTRL_MASK) != 0);
 766 
                boolean ctrl = ((mod & Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()) != 0);
766 
--
(-)editor/libsrc/org/netbeans/editor/MultiKeymap.java (-4 / +3 lines)
Line 16 Link Here
16 
import java.awt.Toolkit;
Line 208 Link Here
208 
                        && (key.getModifiers() & InputEvent.CTRL_MASK) == 0 // Ctrl not pressed
 209 
                        && (key.getModifiers() & Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()) == 0 // Ctrl not pressed
209 
--
Line 251 Link Here
251 
        if (key == KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, InputEvent.CTRL_MASK)) {
 252 
        if (key == KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())) {
252 
--
(-)editor/libsrc/org/netbeans/editor/SettingsDefaults.java (-66 / +34 lines)
Line 20 Link Here
20 
import java.awt.Toolkit;
Line 197 Link Here
197 
              KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_MASK),
 198 
              KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
198 
--
Line 224 Link Here
224 
              KeyStroke.getKeyStroke(KeyEvent.VK_H, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
 225 
              KeyStroke.getKeyStroke(KeyEvent.VK_H, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK),
225 
--
Line 244 Link Here
244 
              KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.CTRL_MASK),
 245 
              KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
245 
--
Line 248 Link Here
248 
              KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK),
 249 
              KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.SHIFT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
249 
--
Line 264 Link Here
264 
              KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.CTRL_MASK),
 265 
              KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
265 
--
Line 268 Link Here
268 
              KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK),
 269 
              KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.SHIFT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
269 
--
Line 284 Link Here
284 
              KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.CTRL_MASK),
 285 
              KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
285 
--
Line 300 Link Here
300 
              KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.CTRL_MASK),
 301 
              KeyStroke.getKeyStroke(KeyEvent.VK_UP, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
301 
--
Line 328 Link Here
328 
              KeyStroke.getKeyStroke(KeyEvent.VK_HOME, InputEvent.CTRL_MASK),
 329 
              KeyStroke.getKeyStroke(KeyEvent.VK_HOME, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
329 
--
Line 332 Link Here
332 
              KeyStroke.getKeyStroke(KeyEvent.VK_HOME, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK),
 333 
              KeyStroke.getKeyStroke(KeyEvent.VK_HOME, InputEvent.SHIFT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
333 
--
Line 344 Link Here
344 
              KeyStroke.getKeyStroke(KeyEvent.VK_END, InputEvent.CTRL_MASK),
 345 
              KeyStroke.getKeyStroke(KeyEvent.VK_END, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
345 
--
Line 348 Link Here
348 
              KeyStroke.getKeyStroke(KeyEvent.VK_END, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK),
 349 
              KeyStroke.getKeyStroke(KeyEvent.VK_END, InputEvent.SHIFT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
349 
--
Line 354 Link Here
354 
              KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK),
 355 
              KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
355 
--
Line 358 Link Here
358 
              KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, InputEvent.CTRL_MASK),
 359 
              KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
359 
--
Line 370 Link Here
370 
              KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_MASK),
 371 
              KeyStroke.getKeyStroke(KeyEvent.VK_X, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
371 
--
Line 378 Link Here
378 
              KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK),
 379 
              KeyStroke.getKeyStroke(KeyEvent.VK_V, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
379 
--
Line 392 Link Here
392 
              KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_MASK),
 393 
              KeyStroke.getKeyStroke(KeyEvent.VK_Z, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
393 
--
Line 400 Link Here
400 
              KeyStroke.getKeyStroke(KeyEvent.VK_Y, InputEvent.CTRL_MASK),
 401 
              KeyStroke.getKeyStroke(KeyEvent.VK_Y, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
401 
--
Line 406 Link Here
406 
              KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK),
 407 
              KeyStroke.getKeyStroke(KeyEvent.VK_A, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
407 
--
Line 417 Link Here
417 
              KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_MASK),
 418 
              KeyStroke.getKeyStroke(KeyEvent.VK_W, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
418 
--
Line 421 Link Here
421 
              KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK),
 422 
              KeyStroke.getKeyStroke(KeyEvent.VK_U, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
422 
--
Line 425 Link Here
425 
              KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK),
 426 
              KeyStroke.getKeyStroke(KeyEvent.VK_E, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
426 
--
Line 433 Link Here
433 
              KeyStroke.getKeyStroke(KeyEvent.VK_F2, InputEvent.CTRL_MASK),
 434 
              KeyStroke.getKeyStroke(KeyEvent.VK_F2, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
434 
--
Line 449 Link Here
449 
              KeyStroke.getKeyStroke(KeyEvent.VK_F3, InputEvent.CTRL_MASK),
 450 
              KeyStroke.getKeyStroke(KeyEvent.VK_F3, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
450 
--
Line 457 Link Here
457 
              KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.CTRL_MASK),
 458 
              KeyStroke.getKeyStroke(KeyEvent.VK_L, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
458 
--
Line 461 Link Here
461 
              KeyStroke.getKeyStroke(KeyEvent.VK_K, InputEvent.CTRL_MASK),
 462 
              KeyStroke.getKeyStroke(KeyEvent.VK_K, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
462 
--
Line 465 Link Here
465 
              KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_MASK),
 466 
              KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
466 
--
Line 469 Link Here
469 
              KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK),
 470 
              KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
470 
--
Line 477 Link Here
477 
              KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
 478 
              KeyStroke.getKeyStroke(KeyEvent.VK_C, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK),
478 
--
Line 517 Link Here
517 
              KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK ),
 518 
              KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK ),
518 
--
Line 563 Link Here
563 
              KeyStroke.getKeyStroke(KeyEvent.VK_M, InputEvent.CTRL_MASK),
 564 
              KeyStroke.getKeyStroke(KeyEvent.VK_M, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
564 
--
Line 569 Link Here
569 
                  KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK),
 570 
                  KeyStroke.getKeyStroke(KeyEvent.VK_J, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
570 
--
Line 577 Link Here
577 
                  KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK),
 578 
                  KeyStroke.getKeyStroke(KeyEvent.VK_J, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
578 
--
(-)editor/libsrc/org/netbeans/editor/ext/ExtKit.java (-4 / +3 lines)
Line 17 Link Here
17 
import java.awt.Toolkit;
Line 780 Link Here
780 
            if (cmd != null && cmd.equals(" ") && (mod == ActionEvent.CTRL_MASK)) { // NOI18N
 781 
            if (cmd != null && cmd.equals(" ") && (mod == Toolkit.getDefaultToolkit().getMenuShortcutKeyMask())) { // NOI18N
781 
--
Line 793 Link Here
793 
                         && (mod & ActionEvent.CTRL_MASK) == 0)
 794 
                         && (mod & Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()) == 0)
794 
--
(-)editor/libsrc/org/netbeans/editor/ext/ExtSettingsDefaults.java (-17 / +10 lines)
Line 18 Link Here
18 
import java.awt.Toolkit;
Line 85 Link Here
85 
              KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK),
 86 
              KeyStroke.getKeyStroke(KeyEvent.VK_F, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
86 
--
Line 93 Link Here
93 
              KeyStroke.getKeyStroke(KeyEvent.VK_H, InputEvent.CTRL_MASK),
 94 
              KeyStroke.getKeyStroke(KeyEvent.VK_H, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
94 
--
Line 97 Link Here
97 
              KeyStroke.getKeyStroke(KeyEvent.VK_G, InputEvent.CTRL_MASK),
 98 
              KeyStroke.getKeyStroke(KeyEvent.VK_G, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
98 
--
Line 101 Link Here
101 
              KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, InputEvent.CTRL_MASK),
 102 
              KeyStroke.getKeyStroke(KeyEvent.VK_SPACE, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
102 
--
Line 105 Link Here
105 
              KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SLASH, InputEvent.CTRL_MASK),
 106 
              KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SLASH, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
106 
--
Line 113 Link Here
113 
              KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, InputEvent.CTRL_MASK),
 114 
              KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
114 
--
Line 117 Link Here
117 
              KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
 118 
              KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK),
118 
--
Lines 129-130 Link Here
129 
                    KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK),
 130 
                    KeyStroke.getKeyStroke(KeyEvent.VK_U, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
130 
          //          KeyStroke.getKeyStroke(KeyEvent.VK_BRACELEFT, InputEvent.CTRL_MASK),
 131 
          //          KeyStroke.getKeyStroke(KeyEvent.VK_BRACELEFT, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
131 
--
(-)editor/libsrc/org/netbeans/editor/ext/JDCPopupPanel.java (-2 / +2 lines)
Line 19 Link Here
19 
import java.awt.Toolkit;
Line 609 Link Here
609 
        KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.ALT_MASK | KeyEvent.CTRL_MASK),
 610 
        KeyStroke.getKeyStroke(KeyEvent.VK_O, KeyEvent.ALT_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
610 
--
(-)editor/libsrc/org/netbeans/editor/ext/java/JavaSettingsDefaults.java (-6 / +4 lines)
Line 20 Link Here
20 
import java.awt.Toolkit;
Line 167 Link Here
167 
                           KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK),
 168 
                           KeyStroke.getKeyStroke(KeyEvent.VK_J, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
168 
--
Line 173 Link Here
173 
                       KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
 174 
                       KeyStroke.getKeyStroke(KeyEvent.VK_T, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK),
174 
--
Line 177 Link Here
177 
                      KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
 178 
                      KeyStroke.getKeyStroke(KeyEvent.VK_D, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | InputEvent.SHIFT_MASK),
178 
--
(-)editor/src/org/netbeans/modules/editor/NbToolbarSupport.java (+1 lines)
Line 606 Link Here
606
(-)openide/src/org/openide/explorer/propertysheet/BaseTable.java (-4 / +3 lines)
Line 32 Link Here
32 
import java.awt.Toolkit;
Line 188 Link Here
188 
            KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, false), ACTION_FOCUS_NEXT);
 189 
            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | KeyEvent.SHIFT_MASK, false), ACTION_FOCUS_NEXT);
189 
--
Line 190 Link Here
190 
            KeyEvent.CTRL_MASK, false), ACTION_FOCUS_NEXT);
 191 
            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false), ACTION_FOCUS_NEXT);
191 
--
(-)openide/src/org/openide/explorer/propertysheet/PropertyPanel.java (-2 / +2 lines)
Line 23 Link Here
23 
import java.awt.Toolkit;
Line 242 Link Here
242 
        getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_PERIOD, KeyEvent.CTRL_MASK), "dump");
 243 
        getInputMap(WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put(KeyStroke.getKeyStroke(KeyEvent.VK_PERIOD, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), "dump");
243 
--
(-)openide/src/org/openide/explorer/propertysheet/SheetTable.java (-4 / +2 lines)
Line 248 Link Here
248 
            KeyEvent.SHIFT_DOWN_MASK | KeyEvent.CTRL_DOWN_MASK),
 248 
            KeyEvent.SHIFT_DOWN_MASK | Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()),
249 
--
Line 260 Link Here
260 
            KeyEvent.CTRL_MASK), ACTION_CUSTOM_EDITOR);
 260 
            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), ACTION_CUSTOM_EDITOR);
261 
--
(-)openide/src/org/openide/explorer/propertysheet/StringInplaceEditor.java (-4 / +3 lines)
Line 28 Link Here
28 
import java.awt.Toolkit;
Line 95 Link Here
95 
        KeyStroke.getKeyStroke(KeyEvent.VK_HOME, KeyEvent.CTRL_DOWN_MASK |
96 
        KeyStroke.getKeyStroke(KeyEvent.VK_HOME, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() |
96 
--
Line 97 Link Here
97 
        KeyStroke.getKeyStroke(KeyEvent.VK_END, KeyEvent.CTRL_DOWN_MASK |
98 
        KeyStroke.getKeyStroke(KeyEvent.VK_END, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() |
98 
--
(-)openide/src/org/openide/explorer/view/TreeTable.java (-4 / +2 lines)
Line 136 Link Here
136 
            KeyEvent.CTRL_MASK | KeyEvent.SHIFT_MASK, false), ACTION_FOCUS_NEXT);
 136 
            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask() | KeyEvent.SHIFT_MASK, false), ACTION_FOCUS_NEXT);
137 
--
Line 138 Link Here
138 
            KeyEvent.CTRL_MASK, false), ACTION_FOCUS_NEXT);
 138 
            Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(), false), ACTION_FOCUS_NEXT);
139 
--
(-)openide/src/org/openide/util/Utilities.java (-4 / +2 lines)
Line 1326 Link Here
1326 
        if ((modif & KeyEvent.CTRL_MASK) != 0) {
 1326 
        if ((modif & Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()) != 0) {
1327 
--
Line 1356 Link Here
1356 
                m |= KeyEvent.CTRL_MASK;
 1356 
                m |= Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
1357 
--

Return to bug 26854