? ide/applemenu/editor
Index: ide/applemenu/nbproject/project.xml
===================================================================
RCS file: /cvs/ide/applemenu/nbproject/project.xml,v
retrieving revision 1.9
diff -u -r1.9 project.xml
--- ide/applemenu/nbproject/project.xml	5 Dec 2006 16:44:33 -0000	1.9
+++ ide/applemenu/nbproject/project.xml	21 Mar 2007 09:28:08 -0000
@@ -30,19 +30,6 @@
                     </run-dependency>
                 </dependency>
                 <dependency>
-                    <code-name-base>org.netbeans.modules.editor</code-name-base>
-                    <run-dependency>
-                        <release-version>3</release-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.editor</code-name-base>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                        <specification-version>1.3</specification-version>
-                    </run-dependency>
-                </dependency>
-                <dependency>
                     <code-name-base>org.openide.filesystems</code-name-base>
                     <build-prerequisite/>
                     <compile-dependency/>
Index: ide/applemenu/src/org/netbeans/modules/applemenu/DefaultGlobalKeyBindings.xml
===================================================================
RCS file: ide/applemenu/src/org/netbeans/modules/applemenu/DefaultGlobalKeyBindings.xml
diff -N ide/applemenu/src/org/netbeans/modules/applemenu/DefaultGlobalKeyBindings.xml
--- ide/applemenu/src/org/netbeans/modules/applemenu/DefaultGlobalKeyBindings.xml	5 Dec 2006 04:15:34 -0000	1.6
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-The contents of this file are subject to the terms of the Common Development
-and Distribution License (the License). You may not use this file except in
-compliance with the License.
-
-You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-or http://www.netbeans.org/cddl.txt.
-
-When distributing Covered Code, include this CDDL Header Notice in each file
-and include the License file at http://www.netbeans.org/cddl.txt.
-If applicable, add the following below the CDDL Header, with the fields
-enclosed by brackets [] replaced by your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
--->
-<!DOCTYPE bindings PUBLIC "-//NetBeans//DTD Editor KeyBindings settings 1.1//EN" "http://www.netbeans.org/dtds/EditorKeyBindings-1_1.dtd">
-
-<!-- See editor/src/org/netbeans/modules/editor/resources/NetBeans-keybindings.xml -
-     that is the original version -->
-     
-<bindings>
-    <!-- Things we add that replace standard keybindings -->
-    
-    <bind actionName="find-next" key="M-G"/> 
-    <bind actionName="find-previous" key="MS-G"/> 
-    <bind actionName="find-selection" key="CA-G"/> 
-    <bind actionName="caret-previous-word" key="A-LEFT"/> 
-    <bind actionName="caret-next-word" key="A-RIGHT"/> 
-    <bind actionName="selection-previous-word" key="AS-LEFT"/> 
-    <bind actionName="selection-next-word" key="AS-RIGHT"/> 
-    <bind actionName="caret-next-word" key="A-RIGHT"/> 
-    
-    
-    <!-- Things we add only on the mac -->
-    
-    <bind actionName="caret-begin" key="M-UP"/> 
-    <bind actionName="caret-end" key="M-DOWN"/>
-    <bind actionName="selection-begin-line" key="MS-LEFT"/>
-    <bind actionName="selection-end-line" key="MS-RIGHT"/>
-    <bind actionName="caret-end-line" key="M-RIGHT"/>
-    <bind actionName="caret-begin-line" key="M-LEFT"/>
-    
-    <!-- Everything else - verbatim copy with what we override commented out -->
-    
-    <bind actionName="find" key="FIND"/>
-    <bind actionName="copy-to-clipboard" key="COPY"/>
-    <bind actionName="undo" key="UNDO"/>
-    <bind actionName="paste-from-clipboard" key="PASTE"/>
-    <bind actionName="cut-to-clipboard" key="CUT"/>
-    <bind actionName="adjust-window-center" key="O-U$M"/>
-    <bind actionName="to-lower-case" key="O-U$L"/>
-    <bind actionName="caret-backward" key="LEFT"/>
-    <bind actionName="selection-page-up" key="S-PAGE_UP"/>
-    <bind actionName="caret-end-word" key="O-U$E"/>
-<!--    <bind actionName="caret-previous-word" key="S-LEFT"/> -->
-    <bind actionName="adjust-window-bottom" key="O-U$B"/>
-    <bind actionName="caret-forward" key="RIGHT"/>
-    <bind actionName="selection-begin" key="DS-HOME"/>
-    <bind actionName="undo" key="D-Z"/>
-    <bind actionName="scroll-down" key="C-UP"/>
-    <bind actionName="redo" key="D-Y"/>
-    <bind actionName="cut-to-clipboard" key="D-X"/>
-<!--    <bind actionName="find-previous" key="S-F3"/> -->
-    <bind actionName="remove-word" key="D-W"/>
-    <bind actionName="paste-from-clipboard" key="D-V"/>
-    <bind actionName="remove-line-begin" key="D-U"/>
-    <bind actionName="shift-line-right" key="D-T"/>
-    <bind actionName="page-up" key="PAGE_UP"/>
-<!--    <bind actionName="caret-next-word" key="D-RIGHT"/> -->
-    <bind actionName="caret-backward" key="KP_LEFT"/>
-    <bind actionName="select-next-parameter" key="D-M"/>
-    <bind actionName="word-match-next" key="D-L"/>
-    <bind actionName="word-match-prev" key="D-K"/>
-    <bind actionName="cut-to-clipboard" key="S-DELETE"/>
-    <bind actionName="selection-down" key="S-DOWN"/>
-    <bind actionName="remove-line" key="D-E"/>
-    <bind actionName="shift-line-left" key="D-D"/>
-    <bind actionName="copy-to-clipboard" key="D-C"/>
-    <bind actionName="select-all" key="D-A"/>
-    <bind actionName="jump-list-next" key="O-L"/>
-    <bind actionName="copy-to-clipboard" key="D-INSERT"/>
-    <bind actionName="jump-list-prev" key="O-K"/>
-    <bind actionName="select-identifier" key="O-J"/>
-    <bind actionName="delete-previous" key="BACK_SPACE"/>
-    <bind actionName="selection-page-down" key="S-PAGE_DOWN"/>
-    <bind actionName="selection-end-line" key="S-END"/>
-    <bind actionName="adjust-caret-top" key="OS-T"/>
-    <bind actionName="caret-end" key="D-END"/>
-<!--    <bind actionName="find-next" key="F3"/> -->
-    <bind actionName="bookmark-next" key="F2"/>
-    <bind actionName="adjust-caret-center" key="OS-M"/>
-    <bind actionName="selection-forward" key="S-RIGHT"/>
-    <bind actionName="jump-list-next-component" key="OS-L"/>
-    <bind actionName="jump-list-prev-component" key="OS-K"/>
-    <bind actionName="toggle-highlight-search" key="OS-H"/>
-    <bind actionName="adjust-caret-bottom" key="OS-B"/>
-    <bind actionName="abbrev-reset" key="S-SPACE"/>
-    <bind actionName="selection-backward" key="S-LEFT"/>
-    <bind actionName="insert-tab" key="TAB"/>
-    <bind actionName="format" key="DS-F"/>
-    <bind actionName="delete-next" key="DELETE"/>
-<!--    <bind actionName="caret-begin-line" key="HOME"/> -->
-    <bind actionName="selection-up" key="S-UP"/>
-<!--    <bind actionName="selection-previous-word" key="DS-LEFT"/> -->
-    <bind actionName="caret-begin" key="D-HOME"/>
-<!--    <bind actionName="selection-next-word" key="DS-RIGHT"/> -->
-    <bind actionName="caret-forward" key="KP_RIGHT"/>
-    <bind actionName="default-typed" key="NULL"/>
-<!--    <bind actionName="find-selection" key="D-F3"/> -->
-    <bind actionName="bookmark-toggle" key="D-F2"/>
-    <bind actionName="paste-from-clipboard" key="S-INSERT"/>
-    <bind actionName="start-macro-recording" key="D-J$S"/>
-    <bind actionName="caret-up" key="KP_UP"/>
-    <bind actionName="caret-down" key="DOWN"/>
-    <bind actionName="insert-break" key="ENTER"/>
-    <bind actionName="caret-up" key="UP"/>
-    <bind actionName="stop-macro-recording" key="D-J$E"/>
-    <bind actionName="scroll-up" key="C-DOWN"/>
-<!--    <bind actionName="caret-end-line" key="END"/> -->
-    <bind actionName="page-down" key="PAGE_DOWN"/>
-    <bind actionName="delete-previous" key="S-BACK_SPACE"/>
-    <bind actionName="selection-end" key="DS-END"/>
-    <bind actionName="toggle-typing-mode" key="INSERT"/>
-    <bind actionName="caret-down" key="KP_DOWN"/>
-    <bind actionName="to-upper-case" key="O-U$U"/>
-    <bind actionName="adjust-window-top" key="O-U$T"/>
-    <bind actionName="switch-case" key="O-U$R"/>
-    <bind actionName="selection-begin-line" key="S-HOME"/>
-    <bind actionName="remove-tab" key="S-TAB"/>
-    <bind actionName="completion-show" key="C-SPACE"/>
-    <bind actionName="completion-show" key="D-BACK_SLASH"/>
-    <bind actionName="escape" key="ESCAPE"/>
-    <bind actionName="find" key="D-F"/>
-    <bind actionName="goto" key="C-G"/>
-    <bind actionName="match-brace" key="D-OPEN_BRACKET"/>
-    <bind actionName="replace" key="C-H"/>
-    <bind actionName="selection-match-brace" key="DS-B"/>
-    <bind actionName="shift-insert-break" key="S-ENTER"/>
-    <bind actionName="show-popup-menu" key="S-F10"/>
-    <bind actionName="annotations-cycling" key="DS-C"/>
-    <bind actionName="collapse-all-folds" key="DS-SUBTRACT"/>
-    <bind actionName="expand-all-folds" key="DS-ADD"/>
-    <bind actionName="collapse-fold" key="D-SUBTRACT"/>
-    <bind actionName="expand-fold" key="D-ADD"/>
-    <bind actionName="collapse-all-folds" key="DS-MINUS"/>
-    <bind actionName="expand-all-folds" key="DS-EQUALS"/>
-    <bind actionName="expand-all-folds" key="DS-PLUS"/>
-    <bind actionName="collapse-fold" key="D-MINUS"/>
-    <bind actionName="expand-fold" key="D-EQUALS"/>
-    <bind actionName="expand-fold" key="D-PLUS"/>    
-    
-</bindings>
Index: ide/applemenu/src/org/netbeans/modules/applemenu/DefaultKeyBindings.xml
===================================================================
RCS file: ide/applemenu/src/org/netbeans/modules/applemenu/DefaultKeyBindings.xml
diff -N ide/applemenu/src/org/netbeans/modules/applemenu/DefaultKeyBindings.xml
--- ide/applemenu/src/org/netbeans/modules/applemenu/DefaultKeyBindings.xml	8 Dec 2006 11:31:57 -0000	1.3
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-The contents of this file are subject to the terms of the Common Development
-and Distribution License (the License). You may not use this file except in
-compliance with the License.
-
-You can obtain a copy of the License at http://www.netbeans.org/cddl.html
-or http://www.netbeans.org/cddl.txt.
-
-When distributing Covered Code, include this CDDL Header Notice in each file
-and include the License file at http://www.netbeans.org/cddl.txt.
-If applicable, add the following below the CDDL Header, with the fields
-enclosed by brackets [] replaced by your own identifying information:
-"Portions Copyrighted [year] [name of copyright owner]"
-
-The Original Software is NetBeans. The Initial Developer of the Original
-Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
-Microsystems, Inc. All Rights Reserved.
--->
-<!DOCTYPE bindings PUBLIC "-//NetBeans//DTD Editor KeyBindings settings 1.1//EN" "http://www.netbeans.org/dtds/EditorKeyBindings-1_1.dtd">
-
-  <!-- IMPORTANT:  To handle Apple-specific keybindings, there is another copy of
-     this file, with minor diffs, in ide/applemenu.  Any changes made here should
-     be made there too -->                            
-<bindings>
-    <bind actionName="goto-source" key="O-O"/>
-    <bind actionName="fast-import" key="OS-I"/>
-    <bind actionName="fix-imports" key="OS-F"/>
-
-    <bind actionName="goto-super-implementation" key="D-B"/>
-    <bind actionName="goto-declaration" key="OS-G"/>    
-    <bind actionName="comment" key="DS-T"/>
-    <bind actionName="goto-help" key="O-F1"/>
-    <bind actionName="make-is" key="O-U$I"/>
-    <bind actionName="make-getter" key="O-U$G"/>
-    <bind actionName="macro-debug-var" key="D-J$D"/>
-    <bind actionName="uncomment" key="DS-D"/>
-    <bind actionName="make-setter" key="O-U$S"/>
-    <bind actionName="select-element-next" key="DO-A"/>
-    <bind actionName="select-element-previous" key="DOS-A"/>
-    <bind actionName="in-place-refactoring" key="D-R"/>
-    <bind actionName="generate-code" key="O-INSERT"/>
-</bindings>
Index: ide/applemenu/src/org/netbeans/modules/applemenu/layer.xml
===================================================================
RCS file: /cvs/ide/applemenu/src/org/netbeans/modules/applemenu/layer.xml,v
retrieving revision 1.11
diff -u -r1.11 layer.xml
--- ide/applemenu/src/org/netbeans/modules/applemenu/layer.xml	30 Jun 2006 19:47:47 -0000	1.11
+++ ide/applemenu/src/org/netbeans/modules/applemenu/layer.xml	21 Mar 2007 09:28:08 -0000
@@ -73,20 +73,4 @@
 	</file>
         
     </folder>
-
-    <folder name="Editors">
-        <folder name="text">
-            <folder name="base">
-                <folder name="Defaults">
-                    <file name="keybindings.xml" url="DefaultGlobalKeyBindings.xml"/>
-                </folder>
-            </folder>
-            <folder name="x-java">
-                <folder name="Defaults">
-                    <file name="keybindings.xml" url="DefaultKeyBindings.xml"/> 
-                </folder>
-            </folder>
-        </folder>
-    </folder>
-    
 </filesystem>