# HG changeset patch
# Parent  ba19583f37aacf1230bd60b32bc6f79d03c7f45c

diff --git a/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml b/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml
--- a/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml
+++ b/java.hints/src/org/netbeans/modules/java/hints/resources/layer.xml
@@ -159,6 +159,12 @@
             </folder>
         </folder>
     </folder>
+    
+    <folder name="Shortcuts">
+        <file name="OCS-A.shadow">
+            <attr name="originalFile" stringvalue="Editors/text/x-java/RefactoringActions/org-netbeans-modules-java-hints-ConvertAnonymousToInnerAction.instance"/>
+        </file>
+    </folder>
 
     <folder name="org-netbeans-modules-java-hints">
         <folder name="rules">
diff --git a/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/CopyAction.java b/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/CopyAction.java
--- a/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/CopyAction.java
+++ b/refactoring.api/src/org/netbeans/modules/refactoring/spi/impl/CopyAction.java
@@ -46,6 +46,7 @@
 import org.netbeans.modules.refactoring.api.impl.ActionsImplementationFactory;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -56,7 +57,10 @@
  */
 @ActionID(id = "org.netbeans.modules.refactoring.api.ui.CopyAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_CopyAction")
-@ActionReference(path = "Menu/Refactoring" , name = "CopyAction", position = 300)
+@ActionReferences({
+    @ActionReference(path = "Menu/Refactoring", name = "CopyAction", position = 300),
+    @ActionReference(path = "Shortcuts", name = "O-C")
+})
 public class CopyAction extends RefactoringGlobalAction {
 
     /**
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ChangeParametersAction.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ChangeParametersAction.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ChangeParametersAction.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ChangeParametersAction.java
@@ -45,6 +45,7 @@
 
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -59,7 +60,10 @@
  */
 @ActionID(id = "org.netbeans.modules.refactoring.java.api.ui.ChangeParametersAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_ChangeMethodSignatureAction", lazy = false)
-@ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "CallHierarchyAction", position = 430)
+@ActionReferences({
+    @ActionReference(path = "Editors/text/x-java/RefactoringActions", name = "CallHierarchyAction", position = 430),
+    @ActionReference(path = "Shortcuts", name = "OCS-M")
+})
 public class ChangeParametersAction extends JavaRefactoringGlobalAction {
     
     /** Creates a new instance of ChangeParametersAction
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldAction.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldAction.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldAction.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/EncapsulateFieldAction.java
@@ -45,6 +45,7 @@
 
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -52,7 +53,10 @@
 
 @ActionID(id = "org.netbeans.modules.refactoring.java.api.ui.EncapsulateFieldAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_EncapsulateFieldsAction", lazy = false)
-@ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "EncapsulateFieldAction", position = 1800)
+@ActionReferences({
+    @ActionReference(path = "Editors/text/x-java/RefactoringActions", name = "EncapsulateFieldAction", position = 1800),
+    @ActionReference(path = "Shortcuts", name = "OCS-E")
+})
 public final class EncapsulateFieldAction extends JavaRefactoringGlobalAction {
 
     public EncapsulateFieldAction() {
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ExtractInterfaceAction.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ExtractInterfaceAction.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ExtractInterfaceAction.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ExtractInterfaceAction.java
@@ -45,6 +45,7 @@
 
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -55,7 +56,10 @@
  */
 @ActionID(id = "org.netbeans.modules.refactoring.java.api.ui.ExtractInterfaceAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_ExtractInterface_Action", lazy = false)
-@ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "ExtractInterfaceAction", position = 700)
+@ActionReferences({
+    @ActionReference(path = "Editors/text/x-java/RefactoringActions", name = "ExtractInterfaceAction", position = 700),
+    @ActionReference(path = "Shortcuts", name = "OS-T")
+})
 public final class ExtractInterfaceAction extends JavaRefactoringGlobalAction {
 
     /**
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ExtractSuperclassAction.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ExtractSuperclassAction.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ExtractSuperclassAction.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ExtractSuperclassAction.java
@@ -45,6 +45,7 @@
 
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -55,19 +56,22 @@
  */
 @ActionID(id = "org.netbeans.modules.refactoring.java.api.ui.ExtractSuperclassAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_ExtractSC_Action", lazy = false)
-@ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "ExtractSuperclassAction", position = 800)
+@ActionReferences({
+    @ActionReference(path = "Editors/text/x-java/RefactoringActions", name = "ExtractSuperclassAction", position = 800),
+    @ActionReference(path = "Shortcuts", name = "OS-S")
+})
 public final class ExtractSuperclassAction extends JavaRefactoringGlobalAction {
 
     public ExtractSuperclassAction() {
         super(NbBundle.getMessage(ExtractInterfaceAction.class, "LBL_ExtractSC_Action"), null); // NOI18N
         putValue("noIconInMenu", Boolean.TRUE); // NOI18N
     }
-    
+
     @Override
     public final void performAction(Lookup context) {
         JavaActionsImplementationFactory.doExtractSuperclass(context);
     }
-    
+
     @Override
     public org.openide.util.HelpCtx getHelpCtx() {
         return HelpCtx.DEFAULT_HELP;
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/InlineAction.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/InlineAction.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/InlineAction.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/InlineAction.java
@@ -43,6 +43,7 @@
 
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -50,7 +51,10 @@
 
 @ActionID(id = "org.netbeans.modules.refactoring.java.api.ui.InlineAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_InlineAction", lazy = false)
-@ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "InlineAction", position = 420)
+@ActionReferences({
+    @ActionReference(path = "Shortcuts", name = "OS-N"),
+    @ActionReference(path = "Editors/text/x-java/RefactoringActions", name = "InlineAction", position = 420)
+})
 public class InlineAction extends JavaRefactoringGlobalAction {
 
     public InlineAction() {
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/InnerToOuterAction.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/InnerToOuterAction.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/InnerToOuterAction.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/InnerToOuterAction.java
@@ -45,6 +45,7 @@
 
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -57,7 +58,10 @@
  */
 @ActionID(id = "org.netbeans.modules.refactoring.java.api.ui.InnerToOuterAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_InnerToOuter_Action", lazy = false)
-@ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "InnerToOuterAction", position = 1000)
+@ActionReferences({
+    @ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "InnerToOuterAction", position = 1000),
+    @ActionReference(path = "Shortcuts", name = "OCS-L"),
+})
 public class InnerToOuterAction extends JavaRefactoringGlobalAction {
     
     /** Creates a new instance of InnerToOuterAction
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/InvertBooleanAction.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/InvertBooleanAction.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/InvertBooleanAction.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/InvertBooleanAction.java
@@ -43,6 +43,7 @@
 import org.netbeans.modules.refactoring.java.ui.JavaRefactoringGlobalAction;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -51,7 +52,10 @@
 
 @ActionID( id = "org.netbeans.modules.java.hints.jackpot.refactoring.InvertBooleanAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_InvertBooleanAction")
-@ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "InvertBooleanAction", position = 1830)
+@ActionReferences({
+    @ActionReference(path = "Editors/text/x-java/RefactoringActions", name = "InvertBooleanAction", position = 1830),
+    @ActionReference(path = "Shortcuts", name = "OCS-I")
+})
 public final class InvertBooleanAction extends JavaRefactoringGlobalAction {
 
     public InvertBooleanAction() {
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/PullUpAction.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/PullUpAction.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/PullUpAction.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/PullUpAction.java
@@ -45,6 +45,7 @@
 
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -56,7 +57,10 @@
  */
 @ActionID(id = "org.netbeans.modules.refactoring.java.api.ui.PullUpAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_PullUp_Action", lazy = false)
-@ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "PullUpAction", position = 500)
+@ActionReferences({
+    @ActionReference(path = "Editors/text/x-java/RefactoringActions", name = "PullUpAction", position = 500),
+    @ActionReference(path = "Shortcuts", name = "OCS-U")
+})
 public class PullUpAction extends JavaRefactoringGlobalAction {
 
     /**
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/PushDownAction.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/PushDownAction.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/PushDownAction.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/PushDownAction.java
@@ -45,6 +45,7 @@
 
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -57,7 +58,10 @@
  */
 @ActionID(id = "org.netbeans.modules.refactoring.java.api.ui.PushDownAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_PushDown_Action", lazy = false)
-@ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "PushDownAction", position = 600)
+@ActionReferences({
+    @ActionReference(path = "Editors/text/x-java/RefactoringActions", name = "PushDownAction", position = 600),
+    @ActionReference(path = "Shortcuts", name = "OCS-D")
+})
 public class PushDownAction extends JavaRefactoringGlobalAction {
     
     /** Creates a new instance of PushDownAction
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ReplaceConstructorWithBuilderAction.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ReplaceConstructorWithBuilderAction.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ReplaceConstructorWithBuilderAction.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ReplaceConstructorWithBuilderAction.java
@@ -47,6 +47,7 @@
 import org.netbeans.modules.refactoring.java.ui.JavaRefactoringGlobalAction;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -57,7 +58,10 @@
  */
 @ActionID(id = "org.netbeans.modules.java.hints.jackpot.refactoring.ReplaceConstructorWithBuilderAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_ReplaceConstructorWithBuilderAction")
-@ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "ReplaceConstructorWithBuilderAction", position = 1825)
+@ActionReferences({
+    @ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "ReplaceConstructorWithBuilderAction", position = 1825),
+    @ActionReference(path = "Shortcuts", name = "OCS-B")
+})
 public final class ReplaceConstructorWithBuilderAction extends JavaRefactoringGlobalAction {
 
     public ReplaceConstructorWithBuilderAction() {
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ReplaceConstructorWithFactoryAction.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ReplaceConstructorWithFactoryAction.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ReplaceConstructorWithFactoryAction.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/ReplaceConstructorWithFactoryAction.java
@@ -43,6 +43,7 @@
 import org.netbeans.modules.refactoring.java.ui.JavaRefactoringGlobalAction;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -50,7 +51,10 @@
 
 @ActionID(id = "org.netbeans.modules.java.hints.jackpot.refactoring.ReplaceConstructorWithFactoryAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_ReplaceConstructorAction")
-@ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "ReplaceConstructorWithFactoryAction", position = 1820)
+@ActionReferences({
+    @ActionReference(path = "Editors/text/x-java/RefactoringActions", name = "ReplaceConstructorWithFactoryAction", position = 1820),
+    @ActionReference(path = "Shortcuts", name = "OCS-F")
+})
 public final class ReplaceConstructorWithFactoryAction extends JavaRefactoringGlobalAction {
 
     public ReplaceConstructorWithFactoryAction() {
diff --git a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/UseSuperTypeAction.java b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/UseSuperTypeAction.java
--- a/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/UseSuperTypeAction.java
+++ b/refactoring.java/src/org/netbeans/modules/refactoring/java/ui/UseSuperTypeAction.java
@@ -47,6 +47,7 @@
 import org.netbeans.api.java.source.TreePathHandle;
 import org.openide.awt.ActionID;
 import org.openide.awt.ActionReference;
+import org.openide.awt.ActionReferences;
 import org.openide.awt.ActionRegistration;
 import org.openide.util.HelpCtx;
 import org.openide.util.Lookup;
@@ -63,7 +64,10 @@
  */
 @ActionID(id = "org.netbeans.modules.refactoring.java.api.ui.UseSuperTypeAction", category = "Refactoring")
 @ActionRegistration(displayName = "#LBL_UseSuperType_Action", lazy = false)
-@ActionReference(path = "Editors/text/x-java/RefactoringActions" , name = "UseSuperTypeAction", position = 900)
+@ActionReferences({
+    @ActionReference(path = "Editors/text/x-java/RefactoringActions", name = "UseSuperTypeAction", position = 900),
+    @ActionReference(path = "Shortcuts", name = "OCS-S")
+})
 public class UseSuperTypeAction extends JavaRefactoringGlobalAction{
     
     private TreePathHandle classTreeHandle = null;