? ant/external/ant-api-1.6.1.zip
? ant/external/ant-docs-1.6.1.zip
? ant/external/ant-libs-1.6.1.zip
? contrib/.DS_Store
? contrib/.cvsignore
? contrib/src
? contrib/targets/.DS_Store
? contrib/targets/.cvsignore
? contrib/targets/nbproject/.DS_Store
? contrib/targets/src/.DS_Store
? contrib/targets/src/org/.DS_Store
? contrib/targets/src/org/netbeans/.DS_Store
? contrib/targets/src/org/netbeans/modules/.DS_Store
? contrib/targets/src/org/netbeans/modules/targets/.DS_Store
? contrib/targets/src/org/netbeans/modules/targets/PresenterSourceAction.java
? contrib/targets/src/org/netbeans/modules/targets/components/.DS_Store
? contrib/targets/src/org/netbeans/modules/targets/modes/.DS_Store
? contrib/targets/src/org/netbeans/modules/targets/modes/targets/.DS_Store
? contrib/targets/src/org/netbeans/modules/targets/resources/.DS_Store
? contrib/uberMetaSplitContainer/build
? contrib/uberMetaSplitContainer/dist
? contrib/uberMetaSplitContainer/nbproject/private
? core/output2/test/unit/src/org/netbeans/core/output2/WrappedTextViewTest.java
? core/swing/tabcontrol/src/org/netbeans/swing/tabcontrol/.DS_Store
? core/swing/tabcontrol/src/org/netbeans/swing/tabcontrol/resources/.DS_Store
? db/manifest-subst.mf
? db/javahelp/org/netbeans/modules/db/docs/JavaHelpSearch2
? j2eeserver/build
? java/external/java-gj.jar
? java/external/javac.jar
? java/parser/nbproject/private
? libs/external/docbook-xml-4.2.zip
? libs/external/docbook-xsl-1.62.4.zip
? libs/external/slides-3.2.0.zip
? mdr/nbproject/private
? mdr/src/org/netbeans/mdr/persistence/memoryimpl/MonitorHashMap.java
? mdr/src/org/netbeans/mdr/storagemodel/transientimpl/MonitorHashMap.java
? tomcatint/external/jakarta-tomcat-5.0.25.zip
? tomcatint/tomcat5/build
? tomcatint/tomcat5/javahelp/org/netbeans/modules/tomcat5/docs/JavaHelpSearch2
? web/ddapi/manifest-subst.mf
? web/external/jasper-compiler-5.0.25.jar
? web/external/jasper-runtime-5.0.25.jar
? xml/core/javahelp/org/netbeans/modules/xml/core/docs/JavaHelpSearch
Index: editor/libsrc/org/netbeans/editor/SettingsDefaults.java
===================================================================
RCS file: /cvs/editor/libsrc/org/netbeans/editor/SettingsDefaults.java,v
retrieving revision 1.33
diff -u -u -r1.33 SettingsDefaults.java
--- editor/libsrc/org/netbeans/editor/SettingsDefaults.java	25 May 2004 13:29:08 -0000	1.33
+++ editor/libsrc/org/netbeans/editor/SettingsDefaults.java	30 Jul 2004 20:26:10 -0000
@@ -191,6 +191,8 @@
           SettingsNames.STATUS_BAR_BOLD_COLORING
       };
 
+    private static int MENU_MASK = java.awt.Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+    
     public static final MultiKeyBinding[] defaultKeyBindings
     = new MultiKeyBinding[] {
           new MultiKeyBinding(
@@ -202,7 +204,7 @@
               BaseKit.insertBreakAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, MENU_MASK),
               BaseKit.splitLineAction
           ),
           new MultiKeyBinding(
@@ -234,7 +236,7 @@
               BaseKit.deletePrevCharAction
           ),
 /*          new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_H, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_H, MENU_MASK | InputEvent.SHIFT_MASK),
               BaseKit.deletePrevCharAction
           ),
 */          new MultiKeyBinding(
@@ -254,11 +256,11 @@
               BaseKit.selectionForwardAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, MENU_MASK),
               BaseKit.nextWordAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_RIGHT, InputEvent.SHIFT_MASK | MENU_MASK),
               BaseKit.selectionNextWordAction
           ),
           new MultiKeyBinding(
@@ -274,11 +276,11 @@
               BaseKit.selectionBackwardAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, MENU_MASK),
               BaseKit.previousWordAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_LEFT, InputEvent.SHIFT_MASK | MENU_MASK),
               BaseKit.selectionPreviousWordAction
           ),
           new MultiKeyBinding(
@@ -294,7 +296,7 @@
               BaseKit.selectionDownAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_DOWN, MENU_MASK),
               BaseKit.scrollUpAction
           ),
           new MultiKeyBinding(
@@ -310,7 +312,7 @@
               BaseKit.selectionUpAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_UP, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_UP, MENU_MASK),
               BaseKit.scrollDownAction
           ),
           new MultiKeyBinding(
@@ -338,11 +340,11 @@
               BaseKit.selectionBeginLineAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_HOME, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_HOME, MENU_MASK),
               BaseKit.beginAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_HOME, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_HOME, InputEvent.SHIFT_MASK | MENU_MASK),
               BaseKit.selectionBeginAction
           ),
           new MultiKeyBinding(
@@ -354,21 +356,21 @@
               BaseKit.selectionEndLineAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_END, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_END, MENU_MASK),
               BaseKit.endAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_END, InputEvent.SHIFT_MASK | InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_END, InputEvent.SHIFT_MASK | MENU_MASK),
               BaseKit.selectionEndAction
           ),
 
           // clipboard bindings
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_C, MENU_MASK),
               BaseKit.copyAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_INSERT, MENU_MASK),
               BaseKit.copyAction
           ),
           new MultiKeyBinding(
@@ -380,7 +382,7 @@
               BaseKit.cutAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_X, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_X, MENU_MASK),
               BaseKit.cutAction
           ),
           new MultiKeyBinding(
@@ -388,7 +390,7 @@
               BaseKit.cutAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_V, MENU_MASK),
               BaseKit.pasteAction
           ),
           new MultiKeyBinding(
@@ -400,13 +402,13 @@
               BaseKit.pasteAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_V, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_V, MENU_MASK | InputEvent.SHIFT_MASK),
               BaseKit.pasteFormatedAction
           ),
 
           // undo and redo bindings - handled at system level
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_Z, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_Z, MENU_MASK),
               BaseKit.undoAction
           ),
           new MultiKeyBinding(
@@ -414,13 +416,13 @@
               BaseKit.undoAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_Y, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_Y, MENU_MASK),
               BaseKit.redoAction
           ),
 
           // other bindings
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_A, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_A, MENU_MASK),
               BaseKit.selectAllAction
           ),
           new MultiKeyBinding(
@@ -431,15 +433,15 @@
               BaseKit.endWordAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_W, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_W, MENU_MASK),
               BaseKit.removeWordAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_U, MENU_MASK),
               BaseKit.removeLineBeginAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_E, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_E, MENU_MASK),
               BaseKit.removeLineAction
           ),
           new MultiKeyBinding(
@@ -447,7 +449,7 @@
               BaseKit.toggleTypingModeAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_F2, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_F2, MENU_MASK),
               BaseKit.toggleBookmarkAction
           ),
           new MultiKeyBinding(
@@ -463,7 +465,7 @@
               BaseKit.findPreviousAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_F3, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_F3, MENU_MASK),
               BaseKit.findSelectionAction
           ),
           new MultiKeyBinding(
@@ -471,19 +473,19 @@
               BaseKit.toggleHighlightSearchAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_L, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_L, MENU_MASK),
               BaseKit.wordMatchNextAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_K, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_K, MENU_MASK),
               BaseKit.wordMatchPrevAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_T, MENU_MASK),
               BaseKit.shiftLineRightAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_D, MENU_MASK),
               BaseKit.shiftLineLeftAction
           ),
           new MultiKeyBinding(
@@ -491,7 +493,7 @@
               BaseKit.abbrevResetAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_C, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_C, MENU_MASK | InputEvent.SHIFT_MASK),
               BaseKit.annotationsCyclingAction
           ),
 
@@ -531,7 +533,7 @@
           ),
 
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK ),
+              KeyStroke.getKeyStroke(KeyEvent.VK_F, MENU_MASK | InputEvent.SHIFT_MASK ),
               BaseKit.formatAction
           ),
           new MultiKeyBinding(
@@ -577,13 +579,13 @@
           ),
 
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_M, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_M, MENU_MASK),
               BaseKit.selectNextParameterAction
           ),
 
           new MultiKeyBinding(
               new KeyStroke[] {
-                  KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK),
+                  KeyStroke.getKeyStroke(KeyEvent.VK_J, MENU_MASK),
                   KeyStroke.getKeyStroke(KeyEvent.VK_S, 0),
               },
               BaseKit.startMacroRecordingAction
@@ -591,59 +593,59 @@
 
           new MultiKeyBinding(
               new KeyStroke[] {
-                  KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK),
+                  KeyStroke.getKeyStroke(KeyEvent.VK_J, MENU_MASK),
                   KeyStroke.getKeyStroke(KeyEvent.VK_E, 0),
               },
               BaseKit.stopMacroRecordingAction
           ),
           
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT, MENU_MASK),
               BaseKit.collapseFoldAction
           ),
 
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_ADD, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_ADD, MENU_MASK),
               BaseKit.expandFoldAction
           ),
           
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_SUBTRACT, MENU_MASK | InputEvent.SHIFT_MASK),
               BaseKit.collapseAllFoldsAction
           ),
           
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_ADD, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_ADD, MENU_MASK | InputEvent.SHIFT_MASK),
               BaseKit.expandAllFoldsAction
           ),
 
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, MENU_MASK),
               BaseKit.collapseFoldAction
           ),
 
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, MENU_MASK),
               BaseKit.expandFoldAction
           ),
 
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, MENU_MASK),
               BaseKit.expandFoldAction
           ),
 
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_MINUS, MENU_MASK | InputEvent.SHIFT_MASK),
               BaseKit.collapseAllFoldsAction
           ),
           
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_EQUALS, MENU_MASK | InputEvent.SHIFT_MASK),
               BaseKit.expandAllFoldsAction
           ),
           
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_PLUS, MENU_MASK | InputEvent.SHIFT_MASK),
               BaseKit.expandAllFoldsAction
           ),
           
Index: editor/libsrc/org/netbeans/editor/ext/ExtSettingsDefaults.java
===================================================================
RCS file: /cvs/editor/libsrc/org/netbeans/editor/ext/ExtSettingsDefaults.java,v
retrieving revision 1.33
diff -u -u -r1.33 ExtSettingsDefaults.java
--- editor/libsrc/org/netbeans/editor/ext/ExtSettingsDefaults.java	25 May 2004 13:29:09 -0000	1.33
+++ editor/libsrc/org/netbeans/editor/ext/ExtSettingsDefaults.java	30 Jul 2004 20:26:11 -0000
@@ -72,6 +72,7 @@
     public static final Integer defaultJavaDocAutoPopupDelay = new Integer(200);
     public static final Dimension defaultJavaDocPreferredSize = new Dimension(500, 300);    
     public static final Boolean defaultJavaDocAutoPopup = Boolean.TRUE;
+    private static int MENU_MASK = java.awt.Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
     
     public static final MultiKeyBinding[] defaultExtKeyBindings
     = new MultiKeyBinding[] {
@@ -80,7 +81,7 @@
               ExtKit.gotoDeclarationAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_F, MENU_MASK),
               ExtKit.findAction
           ),
           new MultiKeyBinding(
@@ -88,11 +89,11 @@
               ExtKit.findAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_H, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_H, MENU_MASK),
               ExtKit.replaceAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_G, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_G, MENU_MASK),
               ExtKit.gotoAction
           ),
           new MultiKeyBinding(
@@ -108,11 +109,11 @@
               ExtKit.escapeAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, InputEvent.CTRL_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, MENU_MASK),
               ExtKit.matchBraceAction
           ),
           new MultiKeyBinding(
-              KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+              KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, MENU_MASK | InputEvent.SHIFT_MASK),
               ExtKit.selectionMatchBraceAction
           ),
           new MultiKeyBinding(
@@ -120,8 +121,8 @@
               ExtKit.showPopupMenuAction
           ),
           /*      new MultiKeyBinding(
-                    KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK),
-          //          KeyStroke.getKeyStroke(KeyEvent.VK_BRACELEFT, InputEvent.CTRL_MASK),
+                    KeyStroke.getKeyStroke(KeyEvent.VK_U, MENU_MASK),
+          //          KeyStroke.getKeyStroke(KeyEvent.VK_BRACELEFT, MENU_MASK),
                     ExtKit.braceCodeSelectAction
                 ),
           */
Index: editor/libsrc/org/netbeans/editor/ext/java/JavaSettingsDefaults.java
===================================================================
RCS file: /cvs/editor/libsrc/org/netbeans/editor/ext/java/JavaSettingsDefaults.java,v
retrieving revision 1.24
diff -u -u -r1.24 JavaSettingsDefaults.java
--- editor/libsrc/org/netbeans/editor/ext/java/JavaSettingsDefaults.java	2 Jun 2004 11:49:14 -0000	1.24
+++ editor/libsrc/org/netbeans/editor/ext/java/JavaSettingsDefaults.java	30 Jul 2004 20:26:11 -0000
@@ -154,20 +154,22 @@
     }
 
     public static MultiKeyBinding[] getJavaKeyBindings() {
+        int MENU_MASK = java.awt.Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
+        
         return new MultiKeyBinding[] {
                    new MultiKeyBinding(
                        new KeyStroke[] {
-                           KeyStroke.getKeyStroke(KeyEvent.VK_J, InputEvent.CTRL_MASK),
+                           KeyStroke.getKeyStroke(KeyEvent.VK_J, MENU_MASK),
                            KeyStroke.getKeyStroke(KeyEvent.VK_D, 0)
                        },
                        "macro-debug-var"
                    ),
                    new MultiKeyBinding(
-                       KeyStroke.getKeyStroke(KeyEvent.VK_T, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+                       KeyStroke.getKeyStroke(KeyEvent.VK_T, MENU_MASK | InputEvent.SHIFT_MASK),
                        ExtKit.commentAction
                    ),
                   new MultiKeyBinding(
-                      KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+                      KeyStroke.getKeyStroke(KeyEvent.VK_D, MENU_MASK | InputEvent.SHIFT_MASK),
                       ExtKit.uncommentAction
                   )
                };
Index: editor/src/org/netbeans/modules/editor/java/NbJavaSettingsInitializer.java
===================================================================
RCS file: /cvs/editor/src/org/netbeans/modules/editor/java/NbJavaSettingsInitializer.java,v
retrieving revision 1.28
diff -u -u -r1.28 NbJavaSettingsInitializer.java
--- editor/src/org/netbeans/modules/editor/java/NbJavaSettingsInitializer.java	13 Jul 2004 07:20:09 -0000	1.28
+++ editor/src/org/netbeans/modules/editor/java/NbJavaSettingsInitializer.java	30 Jul 2004 20:26:12 -0000
@@ -13,6 +13,7 @@
 
 package org.netbeans.modules.editor.java;
 
+import java.awt.Toolkit;
 import java.awt.event.KeyEvent;
 import java.awt.event.InputEvent;
 import java.util.Map;
@@ -98,6 +99,7 @@
     }
 
     public MultiKeyBinding[] getJavaKeyBindings() {
+        int mask = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask();
         return new MultiKeyBinding[] {
                    new MultiKeyBinding(
                        new KeyStroke[] {
@@ -127,7 +129,7 @@
                    ),
                    new MultiKeyBinding(
                        KeyStroke.getKeyStroke(KeyEvent.VK_B,
-                           InputEvent.CTRL_MASK),
+                           mask),
                        JavaKit.gotoSuperImplementationAction
                    ),
                    new MultiKeyBinding(
@@ -137,25 +139,25 @@
                    ),
 //                   new MultiKeyBinding(
 //                       KeyStroke.getKeyStroke(KeyEvent.VK_S,
-//                           InputEvent.ALT_MASK | InputEvent.CTRL_MASK),
+//                           InputEvent.ALT_MASK | mask),
 //                       JavaKit.tryCatchAction
 //                       ),
 
                    new MultiKeyBinding(
                        KeyStroke.getKeyStroke(KeyEvent.VK_SPACE,
-                           InputEvent.CTRL_MASK | InputEvent.SHIFT_MASK),
+                           mask | InputEvent.SHIFT_MASK),
                        JavaKit.javaDocShowAction
                    ),
                    
                    new MultiKeyBinding(
                        KeyStroke.getKeyStroke(KeyEvent.VK_A,
-                           InputEvent.CTRL_MASK | InputEvent.ALT_MASK),
+                           mask | InputEvent.ALT_MASK),
                        JavaKit.selectNextElementAction
                    ),
                    
                    new MultiKeyBinding(
                        KeyStroke.getKeyStroke(KeyEvent.VK_A,
-                           InputEvent.CTRL_MASK | InputEvent.ALT_MASK | InputEvent.SHIFT_MASK),
+                           mask | InputEvent.ALT_MASK | InputEvent.SHIFT_MASK),
                        JavaKit.selectPreviousElementAction
                    )
                    
Index: openide/src/org/openide/util/Utilities.java
===================================================================
RCS file: /cvs/openide/src/org/openide/util/Utilities.java,v
retrieving revision 1.142
diff -u -u -r1.142 Utilities.java
--- openide/src/org/openide/util/Utilities.java	30 Jul 2004 14:33:20 -0000	1.142
+++ openide/src/org/openide/util/Utilities.java	30 Jul 2004 20:26:54 -0000
@@ -1253,6 +1253,13 @@
                     // last text must be the key code
                     Integer i = (Integer)names.get (el);
                     if (i != null) {
+                        if (System.getProperty("mrj.version") != null && (needed & KeyEvent.CTRL_MASK) == KeyEvent.CTRL_MASK) {
+                            if (usableKeyOnMac(i.intValue(), needed)) {
+                                needed &= ~KeyEvent.CTRL_MASK;
+                                needed |= KeyEvent.META_MASK;
+                            }
+                        }
+                        
                         return KeyStroke.getKeyStroke (i.intValue (), needed);
                     } else {
                         return null;
@@ -1261,6 +1268,30 @@
             }
         } catch (NoSuchElementException ex) {
             return null;
+        }
+    }
+    
+    private static final boolean usableKeyOnMac (int key, int mask) {
+        //All permutations fail for Q except ctrl
+        if (key == KeyEvent.VK_Q) return false;
+        
+        boolean isCtrl = ((mask & KeyEvent.CTRL_MASK) != 0) || 
+            ((mask & KeyEvent.CTRL_DOWN_MASK) != 0);
+        
+        boolean isAlt = ((mask & KeyEvent.ALT_MASK) != 0) || 
+            ((mask & KeyEvent.ALT_DOWN_MASK) != 0);
+        
+        boolean isOnlyCtrl = isCtrl && (mask & ~(KeyEvent.CTRL_DOWN_MASK | KeyEvent.CTRL_MASK)) == 0;
+        
+        //Mac OS consumes keys Command+ these keys - the app will never see
+        //them, so CTRL should not be remapped for these
+        if (isOnlyCtrl) {
+            return key != KeyEvent.VK_H && key != 
+                KeyEvent.VK_SPACE && key != KeyEvent.VK_TAB;
+        } else if (key == KeyEvent.VK_D && isCtrl && isAlt) {
+            return false;
+        } else {
+            return true;
         }
     }