From 791a6010143a1feab16352696eb366a6081a0429 Mon Sep 17 00:00:00 2001
From: UNV <nikolay@yurchenko.su>
Date: Wed, 29 Oct 2025 22:18:31 +0300
Subject: [PATCH] Adding @ActionImpl annotations to Refactoring actions.
 Refactoring and localizing.

---
 java-properties-impl/pom.xml                  | 21 ++++-
 .../properties/impl/i18n/I18nizeAction.java   |  5 ++
 ...roperties.impl.JavaPropertiesLocalize.yaml |  4 +
 .../actions/AnonymousToInnerAction.java       | 54 +++++++----
 .../ConvertToInstanceMethodAction.java        | 45 +++++++---
 .../actions/EncapsulateFieldsAction.java      | 89 ++++++++++++-------
 .../InheritanceToDelegationAction.java        | 36 +++++---
 .../IntroduceParameterObjectAction.java       | 37 ++++++--
 .../actions/InvertBooleanAction.java          | 49 ++++++----
 .../refactoring/actions/MakeStaticAction.java | 45 ++++++----
 .../actions/MethodDuplicatesAction.java       | 28 ++++--
 .../refactoring/actions/MigrateAction.java    | 32 ++++---
 .../actions/RefactoringMenu1Group.java        | 34 +++++++
 .../actions/RefactoringMenu2Group.java        | 32 +++++++
 .../actions/RefactoringMenu4Group.java        | 61 +++++++++++++
 .../actions/RemoveMiddlemanAction.java        | 40 ++++++---
 .../ReplaceConstructorWithBuilderAction.java  | 58 +++++++-----
 .../ReplaceConstructorWithFactoryAction.java  | 34 ++++---
 .../ReplaceMethodWithMethodObjectAction.java  | 47 +++++++---
 .../actions/TempWithQueryAction.java          | 41 ++++++---
 .../actions/TurnRefsToSuperAction.java        | 30 +++++--
 .../refactoring/actions/TypeCookAction.java   | 64 +++++++------
 .../actions/ChangeTypeSignatureAction.java    | 88 +++++++++---------
 .../WrapReturnValueAction.java                | 55 +++++++-----
 .../en_US/consulo.java.JavaLocalize.yaml      | 60 ++++++-------
 plugin/src/main/resources/META-INF/plugin.xml | 45 ----------
 26 files changed, 745 insertions(+), 389 deletions(-)
 create mode 100644 java-properties-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.properties.impl.JavaPropertiesLocalize.yaml
 create mode 100644 plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RefactoringMenu1Group.java
 create mode 100644 plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RefactoringMenu2Group.java
 create mode 100644 plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RefactoringMenu4Group.java

diff --git a/java-properties-impl/pom.xml b/java-properties-impl/pom.xml
index b3e87ba9dd..a0214e0e57 100644
--- a/java-properties-impl/pom.xml
+++ b/java-properties-impl/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  - Copyright 2013-2017 consulo.io
+  - Copyright 2013-2025 consulo.io
   -
   - Licensed under the Apache License, Version 2.0 (the "License");
   - you may not use this file except in compliance with the License.
@@ -41,6 +41,25 @@
     <version>3-SNAPSHOT</version>
     <packaging>jar</packaging>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>consulo.maven</groupId>
+                <artifactId>maven-consulo-plugin</artifactId>
+                <extensions>true</extensions>
+                <executions>
+                    <execution>
+                        <id>generate-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate-localize</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
     <dependencies>
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/java-properties-impl/src/main/java/consulo/java/properties/impl/i18n/I18nizeAction.java b/java-properties-impl/src/main/java/consulo/java/properties/impl/i18n/I18nizeAction.java
index 5ab2d0005c..b32cd5b279 100644
--- a/java-properties-impl/src/main/java/consulo/java/properties/impl/i18n/I18nizeAction.java
+++ b/java-properties-impl/src/main/java/consulo/java/properties/impl/i18n/I18nizeAction.java
@@ -24,6 +24,7 @@
 import consulo.codeEditor.Editor;
 import consulo.document.util.TextRange;
 import consulo.java.analysis.impl.util.JavaI18nUtil;
+import consulo.java.properties.impl.localize.JavaPropertiesLocalize;
 import consulo.language.editor.FileModificationService;
 import consulo.language.editor.localize.CodeInsightLocalize;
 import consulo.language.editor.refactoring.util.CommonRefactoringUtil;
@@ -48,6 +49,10 @@
 public class I18nizeAction extends AnAction {
     private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.i18n.I18nizeAction");
 
+    public I18nizeAction() {
+        super(JavaPropertiesLocalize.actionI18nizeText(), JavaPropertiesLocalize.actionI18nizeDescription());
+    }
+
     @Override
     @RequiredUIAccess
     public void update(@Nonnull AnActionEvent e) {
diff --git a/java-properties-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.properties.impl.JavaPropertiesLocalize.yaml b/java-properties-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.properties.impl.JavaPropertiesLocalize.yaml
new file mode 100644
index 0000000000..31c1ebe4eb
--- /dev/null
+++ b/java-properties-impl/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.properties.impl.JavaPropertiesLocalize.yaml
@@ -0,0 +1,4 @@
+action.I18nize.description:
+    text: Replace Java string literal or JSP text with internationalized expression
+action.I18nize.text:
+    text: Internationali_ze...
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/AnonymousToInnerAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/AnonymousToInnerAction.java
index 471cfdf241..f4a79aa839 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/AnonymousToInnerAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/AnonymousToInnerAction.java
@@ -18,8 +18,11 @@
 import com.intellij.java.impl.refactoring.anonymousToInner.AnonymousToInnerHandler;
 import com.intellij.java.language.psi.PsiAnonymousClass;
 import com.intellij.java.language.psi.PsiNewExpression;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataContext;
 import consulo.codeEditor.Editor;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -28,28 +31,43 @@
 
 import jakarta.annotation.Nonnull;
 
+@ActionImpl(id = "AnonymousToInner")
 public class AnonymousToInnerAction extends BaseRefactoringAction {
-  public boolean isAvailableInEditorOnly() {
-    return true;
-  }
+    public AnonymousToInnerAction() {
+        super(JavaLocalize.actionAnonymousToInnerText(), JavaLocalize.actionAnonymousToInnerDescription());
+    }
 
-  public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    return false;
-  }
+    @Override
+    public boolean isAvailableInEditorOnly() {
+        return true;
+    }
 
-  protected boolean isAvailableOnElementInEditorAndFile(@Nonnull final PsiElement element, @Nonnull final Editor editor, @Nonnull PsiFile file, @Nonnull DataContext context) {
-    final PsiElement targetElement = file.findElementAt(editor.getCaretModel().getOffset());
-    if (PsiTreeUtil.getParentOfType(targetElement, PsiAnonymousClass.class) != null) {
-      return true;
+    @Override
+    public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return false;
     }
-    if (PsiTreeUtil.getParentOfType(element, PsiAnonymousClass.class) != null) {
-      return true;
+
+    @Override
+    @RequiredReadAction
+    protected boolean isAvailableOnElementInEditorAndFile(
+        @Nonnull PsiElement element,
+        @Nonnull Editor editor,
+        @Nonnull PsiFile file,
+        @Nonnull DataContext context
+    ) {
+        PsiElement targetElement = file.findElementAt(editor.getCaretModel().getOffset());
+        if (PsiTreeUtil.getParentOfType(targetElement, PsiAnonymousClass.class) != null) {
+            return true;
+        }
+        if (PsiTreeUtil.getParentOfType(element, PsiAnonymousClass.class) != null) {
+            return true;
+        }
+        PsiNewExpression newExpression = PsiTreeUtil.getParentOfType(element, PsiNewExpression.class);
+        return newExpression != null && newExpression.getAnonymousClass() != null;
     }
-    final PsiNewExpression newExpression = PsiTreeUtil.getParentOfType(element, PsiNewExpression.class);
-    return newExpression != null && newExpression.getAnonymousClass() != null;
-  }
 
-  public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
-    return new AnonymousToInnerHandler();
-  }
+    @Override
+    public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new AnonymousToInnerHandler();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ConvertToInstanceMethodAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ConvertToInstanceMethodAction.java
index df855aa61f..1b61851935 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ConvertToInstanceMethodAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ConvertToInstanceMethodAction.java
@@ -18,9 +18,10 @@
 import com.intellij.java.impl.refactoring.convertToInstanceMethod.ConvertToInstanceMethodHandler;
 import com.intellij.java.language.psi.PsiIdentifier;
 import com.intellij.java.language.psi.PsiMethod;
-import com.intellij.java.language.psi.PsiModifier;
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataContext;
 import consulo.codeEditor.Editor;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
@@ -31,21 +32,37 @@
 /**
  * @author dsl
  */
+@ActionImpl(id = "ConvertToInstanceMethod")
 public class ConvertToInstanceMethodAction extends BaseRefactoringAction {
-  protected boolean isAvailableInEditorOnly() {
-    return false;
-  }
+    public ConvertToInstanceMethodAction() {
+        super(JavaLocalize.actionConvertToInstanceMethodText(), JavaLocalize.actionConvertToInstanceMethodDescription());
+    }
 
-  protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    return elements.length == 1 && elements[0] instanceof PsiMethod;
-  }
+    @Override
+    protected boolean isAvailableInEditorOnly() {
+        return false;
+    }
 
-  protected boolean isAvailableOnElementInEditorAndFile(@Nonnull PsiElement element, @Nonnull final Editor editor, @Nonnull PsiFile file, @Nonnull DataContext context) {
-    if (element instanceof PsiIdentifier) element = element.getParent();
-    return element instanceof PsiMethod && ((PsiMethod) element).hasModifierProperty(PsiModifier.STATIC);
-  }
+    @Override
+    protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return elements.length == 1 && elements[0] instanceof PsiMethod;
+    }
 
-  protected RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
-    return new ConvertToInstanceMethodHandler();
-  }
+    @Override
+    protected boolean isAvailableOnElementInEditorAndFile(
+        @Nonnull PsiElement element,
+        @Nonnull Editor editor,
+        @Nonnull PsiFile file,
+        @Nonnull DataContext context
+    ) {
+        if (element instanceof PsiIdentifier) {
+            element = element.getParent();
+        }
+        return element instanceof PsiMethod method && method.isStatic();
+    }
+
+    @Override
+    protected RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new ConvertToInstanceMethodHandler();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/EncapsulateFieldsAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/EncapsulateFieldsAction.java
index bfc45b9316..448ab2ea0b 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/EncapsulateFieldsAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/EncapsulateFieldsAction.java
@@ -19,8 +19,11 @@
 import com.intellij.java.language.JavaLanguage;
 import com.intellij.java.language.psi.PsiClass;
 import com.intellij.java.language.psi.PsiField;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataContext;
 import consulo.codeEditor.Editor;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -28,45 +31,65 @@
 import consulo.language.editor.refactoring.action.BaseRefactoringAction;
 import jakarta.annotation.Nonnull;
 
+@ActionImpl(id = "EncapsulateFields")
 public class EncapsulateFieldsAction extends BaseRefactoringAction {
-  public boolean isAvailableInEditorOnly() {
-    return false;
-  }
+    public EncapsulateFieldsAction() {
+        super(JavaLocalize.actionEncapsulateFieldsText(), JavaLocalize.actionEncapsulateFieldsDescription());
+    }
 
-  @Override
-  protected boolean isAvailableOnElementInEditorAndFile(@Nonnull PsiElement element, @Nonnull Editor editor, @Nonnull PsiFile file, @Nonnull DataContext context) {
-    final PsiElement psiElement = file.findElementAt(editor.getCaretModel().getOffset());
-    final PsiClass containingClass = PsiTreeUtil.getParentOfType(psiElement, PsiClass.class, false);
-    if (containingClass != null) {
-      final PsiField[] fields = containingClass.getFields();
-      for (PsiField field : fields) {
-        if (isAcceptedField(field)) return true;
-      }
+    @Override
+    public boolean isAvailableInEditorOnly() {
+        return false;
     }
-    return false;
-  }
 
-  public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    if (elements.length == 1) {
-      return elements[0] instanceof PsiClass && elements[0].getLanguage().isKindOf(JavaLanguage.INSTANCE) || isAcceptedField(elements[0]);
-    } else if (elements.length > 1) {
-      for (int idx = 0; idx < elements.length; idx++) {
-        if (!isAcceptedField(elements[idx])) {
-          return false;
+    @Override
+    @RequiredReadAction
+    protected boolean isAvailableOnElementInEditorAndFile(
+        @Nonnull PsiElement element,
+        @Nonnull Editor editor,
+        @Nonnull PsiFile file,
+        @Nonnull DataContext context
+    ) {
+        PsiElement psiElement = file.findElementAt(editor.getCaretModel().getOffset());
+        PsiClass containingClass = PsiTreeUtil.getParentOfType(psiElement, PsiClass.class, false);
+        if (containingClass != null) {
+            PsiField[] fields = containingClass.getFields();
+            for (PsiField field : fields) {
+                if (isAcceptedField(field)) {
+                    return true;
+                }
+            }
         }
-      }
-      return true;
+        return false;
     }
-    return false;
-  }
 
-  public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
-    return new EncapsulateFieldsHandler();
-  }
+    @Override
+    @RequiredReadAction
+    public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        if (elements.length == 1) {
+            return elements[0] instanceof PsiClass psiClass && psiClass.getLanguage().isKindOf(JavaLanguage.INSTANCE)
+                || isAcceptedField(elements[0]);
+        }
+        else if (elements.length > 1) {
+            for (PsiElement element : elements) {
+                if (!isAcceptedField(element)) {
+                    return false;
+                }
+            }
+            return true;
+        }
+        return false;
+    }
 
-  private static boolean isAcceptedField(PsiElement element) {
-    return element instanceof PsiField &&
-        element.getLanguage().isKindOf(JavaLanguage.INSTANCE) &&
-        ((PsiField) element).getContainingClass() != null;
-  }
+    @Override
+    public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new EncapsulateFieldsHandler();
+    }
+
+    @RequiredReadAction
+    private static boolean isAcceptedField(PsiElement element) {
+        return element instanceof PsiField field
+            && field.getLanguage().isKindOf(JavaLanguage.INSTANCE)
+            && field.getContainingClass() != null;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/InheritanceToDelegationAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/InheritanceToDelegationAction.java
index d71c30290e..50c078cbcc 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/InheritanceToDelegationAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/InheritanceToDelegationAction.java
@@ -18,25 +18,37 @@
 import com.intellij.java.impl.refactoring.inheritanceToDelegation.InheritanceToDelegationHandler;
 import com.intellij.java.language.JavaLanguage;
 import com.intellij.java.language.psi.PsiClass;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataContext;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
 import consulo.language.editor.refactoring.action.BaseRefactoringAction;
 import jakarta.annotation.Nonnull;
 
+@ActionImpl(id = "InheritanceToDelegation")
 public class InheritanceToDelegationAction extends BaseRefactoringAction {
-  public boolean isAvailableInEditorOnly() {
-    return false;
-  }
+    public InheritanceToDelegationAction() {
+        super(JavaLocalize.actionInheritanceToDelegationText(), JavaLocalize.actionInheritanceToDelegationDescription());
+    }
 
-  public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    return elements.length == 1 &&
-        elements[0] instanceof PsiClass &&
-        !((PsiClass) elements[0]).isInterface() &&
-        elements[0].getLanguage().isKindOf(JavaLanguage.INSTANCE);
-  }
+    @Override
+    public boolean isAvailableInEditorOnly() {
+        return false;
+    }
 
-  public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
-    return new InheritanceToDelegationHandler();
-  }
+    @Override
+    @RequiredReadAction
+    public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return elements.length == 1
+            && elements[0] instanceof PsiClass psiClass
+            && !psiClass.isInterface()
+            && psiClass.getLanguage().isKindOf(JavaLanguage.INSTANCE);
+    }
+
+    @Override
+    public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new InheritanceToDelegationHandler();
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/IntroduceParameterObjectAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/IntroduceParameterObjectAction.java
index 2ccc598b70..152fa22353 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/IntroduceParameterObjectAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/IntroduceParameterObjectAction.java
@@ -17,24 +17,43 @@
 
 import com.intellij.java.impl.refactoring.introduceparameterobject.IntroduceParameterObjectHandler;
 import com.intellij.java.language.psi.PsiMethod;
+import consulo.annotation.component.ActionImpl;
+import consulo.annotation.component.ActionParentRef;
+import consulo.annotation.component.ActionRef;
+import consulo.annotation.component.ActionRefAnchor;
 import consulo.dataContext.DataContext;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
 import consulo.language.editor.refactoring.action.BaseRefactoringAction;
 import jakarta.annotation.Nonnull;
 
+@ActionImpl(
+    id = "IntroduceParameterObject",
+    parents = @ActionParentRef(
+        value = @ActionRef(id = "IntroduceActionsGroup"),
+        anchor = ActionRefAnchor.AFTER,
+        relatedToAction = @ActionRef(id = "IntroduceParameter")
+    )
+)
 public class IntroduceParameterObjectAction extends BaseRefactoringAction {
+    public IntroduceParameterObjectAction() {
+        super(JavaLocalize.actionIntroduceParameterObjectText(), JavaLocalize.actionIntroduceParameterObjectDescription());
+    }
 
-  protected boolean isAvailableInEditorOnly() {
-    return false;
-  }
+    @Override
+    protected boolean isAvailableInEditorOnly() {
+        return false;
+    }
 
-  protected boolean isEnabledOnElements(@Nonnull final PsiElement[] elements) {
-    return elements.length == 1 && PsiTreeUtil.getParentOfType(elements[0], PsiMethod.class, false) != null;
-  }
+    @Override
+    protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return elements.length == 1 && PsiTreeUtil.getParentOfType(elements[0], PsiMethod.class, false) != null;
+    }
 
-  protected RefactoringActionHandler getHandler(@Nonnull DataContext context) {
-    return new IntroduceParameterObjectHandler();
-  }
+    @Override
+    protected RefactoringActionHandler getHandler(@Nonnull DataContext context) {
+        return new IntroduceParameterObjectHandler();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/InvertBooleanAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/InvertBooleanAction.java
index c49bb235e1..3b8d999fdd 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/InvertBooleanAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/InvertBooleanAction.java
@@ -19,8 +19,10 @@
 import com.intellij.java.language.psi.PsiMethod;
 import com.intellij.java.language.psi.PsiType;
 import com.intellij.java.language.psi.PsiVariable;
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataContext;
 import consulo.codeEditor.Editor;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
@@ -31,25 +33,40 @@
 /**
  * @author ven
  */
+@ActionImpl(id = "InvertBoolean")
 public class InvertBooleanAction extends BaseRefactoringAction {
-  protected boolean isAvailableInEditorOnly() {
-    return false;
-  }
+    public InvertBooleanAction() {
+      super(JavaLocalize.actionInvertbooleanText(), JavaLocalize.actionInvertbooleanText());
+    }
 
-  protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    return elements.length == 1 && (elements[0] instanceof PsiMethod || elements[0] instanceof PsiVariable);
-  }
+    @Override
+    protected boolean isAvailableInEditorOnly() {
+        return false;
+    }
 
-  protected boolean isAvailableOnElementInEditorAndFile(@Nonnull final PsiElement element, @Nonnull final Editor editor, @Nonnull PsiFile file, @Nonnull DataContext context) {
-    if (element instanceof PsiVariable) {
-      return PsiType.BOOLEAN.equals(((PsiVariable) element).getType());
-    } else if (element instanceof PsiMethod) {
-      return PsiType.BOOLEAN.equals(((PsiMethod) element).getReturnType());
+    @Override
+    protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return elements.length == 1 && (elements[0] instanceof PsiMethod || elements[0] instanceof PsiVariable);
     }
-    return false;
-  }
 
-  protected RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
-    return new InvertBooleanHandler();
-  }
+    @Override
+    protected boolean isAvailableOnElementInEditorAndFile(
+        @Nonnull PsiElement element,
+        @Nonnull Editor editor,
+        @Nonnull PsiFile file,
+        @Nonnull DataContext context
+    ) {
+        if (element instanceof PsiVariable variable) {
+            return PsiType.BOOLEAN.equals(variable.getType());
+        }
+        else if (element instanceof PsiMethod method) {
+            return PsiType.BOOLEAN.equals(method.getReturnType());
+        }
+        return false;
+    }
+
+    @Override
+    protected RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new InvertBooleanHandler();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/MakeStaticAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/MakeStaticAction.java
index f922805db0..b8381de7a3 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/MakeStaticAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/MakeStaticAction.java
@@ -28,8 +28,10 @@
 import com.intellij.java.language.psi.PsiIdentifier;
 import com.intellij.java.language.psi.PsiMethod;
 import com.intellij.java.language.psi.PsiTypeParameterListOwner;
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataContext;
 import consulo.codeEditor.Editor;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
@@ -37,24 +39,37 @@
 
 import jakarta.annotation.Nonnull;
 
+@ActionImpl(id = "MakeStatic")
 public class MakeStaticAction extends BaseRefactoringAction {
-  protected boolean isAvailableInEditorOnly() {
-    return false;
-  }
+    public MakeStaticAction() {
+        super(JavaLocalize.actionMakestaticText(), JavaLocalize.actionMakestaticDescription());
+    }
 
-  protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    return (elements.length == 1) && (elements[0] instanceof PsiMethod) && !((PsiMethod) elements[0]).isConstructor();
-  }
+    @Override
+    protected boolean isAvailableInEditorOnly() {
+        return false;
+    }
 
-  protected boolean isAvailableOnElementInEditorAndFile(@Nonnull PsiElement element, @Nonnull final Editor editor, @Nonnull PsiFile file, @Nonnull DataContext context) {
-    if (element instanceof PsiIdentifier) {
-      element = element.getParent();
+    @Override
+    protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return elements.length == 1 && elements[0] instanceof PsiMethod method && !method.isConstructor();
     }
-    return element instanceof PsiTypeParameterListOwner &&
-        MakeStaticHandler.validateTarget((PsiTypeParameterListOwner) element) == null;
-  }
 
-  protected RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
-    return new MakeStaticHandler();
-  }
+    @Override
+    protected boolean isAvailableOnElementInEditorAndFile(
+        @Nonnull PsiElement element,
+        @Nonnull Editor editor,
+        @Nonnull PsiFile file,
+        @Nonnull DataContext context
+    ) {
+        if (element instanceof PsiIdentifier) {
+            element = element.getParent();
+        }
+        return element instanceof PsiTypeParameterListOwner paramListOwner && MakeStaticHandler.validateTarget(paramListOwner) == null;
+    }
+
+    @Override
+    protected RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new MakeStaticHandler();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/MethodDuplicatesAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/MethodDuplicatesAction.java
index 1c5afff552..dcb648855d 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/MethodDuplicatesAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/MethodDuplicatesAction.java
@@ -16,7 +16,9 @@
 package com.intellij.java.impl.refactoring.actions;
 
 import com.intellij.java.impl.refactoring.util.duplicates.MethodDuplicatesHandler;
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataContext;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
 import consulo.language.editor.refactoring.action.BaseRefactoringAction;
@@ -25,16 +27,24 @@
 /**
  * @author dsl
  */
+@ActionImpl(id = "MethodDuplicates")
 public class MethodDuplicatesAction extends BaseRefactoringAction {
-  protected boolean isAvailableInEditorOnly() {
-    return true;
-  }
+    public MethodDuplicatesAction() {
+      super(JavaLocalize.actionMethodDuplicatesText(), JavaLocalize.actionMethodDuplicatesDescription());
+    }
 
-  protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    return false;
-  }
+    @Override
+    protected boolean isAvailableInEditorOnly() {
+        return true;
+    }
 
-  protected RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
-    return new MethodDuplicatesHandler();
-  }
+    @Override
+    protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return false;
+    }
+
+    @Override
+    protected RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new MethodDuplicatesHandler();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/MigrateAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/MigrateAction.java
index aefc703160..a0205d49d9 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/MigrateAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/MigrateAction.java
@@ -16,25 +16,29 @@
 package com.intellij.java.impl.refactoring.actions;
 
 import com.intellij.java.impl.refactoring.RefactoringManager;
+import consulo.annotation.component.ActionImpl;
+import consulo.java.localize.JavaLocalize;
 import consulo.project.Project;
 import consulo.ui.annotation.RequiredUIAccess;
 import consulo.ui.ex.action.AnAction;
 import consulo.ui.ex.action.AnActionEvent;
-import consulo.ui.ex.action.Presentation;
 
+@ActionImpl(id = "Migrate")
 public class MigrateAction extends AnAction {
-  @RequiredUIAccess
-  @Override
-  public void actionPerformed(AnActionEvent e) {
-    Project project = e.getData(Project.KEY);
-    RefactoringManager.getInstance(project).getMigrateManager().showMigrationDialog();
-  }
+    public MigrateAction() {
+        super(JavaLocalize.actionMigrateText(), JavaLocalize.actionMigrateDescription());
+    }
 
-  @RequiredUIAccess
-  @Override
-  public void update(AnActionEvent e) {
-    Presentation presentation = e.getPresentation();
-    Project project = e.getData(Project.KEY);
-    presentation.setEnabled(project != null);
-  }
+    @Override
+    @RequiredUIAccess
+    public void actionPerformed(AnActionEvent e) {
+        Project project = e.getRequiredData(Project.KEY);
+        RefactoringManager.getInstance(project).getMigrateManager().showMigrationDialog();
+    }
+
+    @Override
+    @RequiredUIAccess
+    public void update(AnActionEvent e) {
+        e.getPresentation().setEnabled(e.hasData(Project.KEY));
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RefactoringMenu1Group.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RefactoringMenu1Group.java
new file mode 100644
index 0000000000..276f3c0ee6
--- /dev/null
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RefactoringMenu1Group.java
@@ -0,0 +1,34 @@
+package com.intellij.java.impl.refactoring.actions;
+
+import com.intellij.java.impl.refactoring.typeMigration.actions.ChangeTypeSignatureAction;
+import consulo.annotation.component.ActionImpl;
+import consulo.annotation.component.ActionParentRef;
+import consulo.annotation.component.ActionRef;
+import consulo.annotation.component.ActionRefAnchor;
+import consulo.application.dumb.DumbAware;
+import consulo.localize.LocalizeValue;
+import consulo.ui.ex.action.DefaultActionGroup;
+import consulo.ui.ex.action.IdeActions;
+
+/**
+ * @author UNV
+ * @since 2025-09-23
+ */
+@ActionImpl(
+    id = "RefactoringMenu1",
+    children = {
+        @ActionRef(type = ChangeTypeSignatureAction.class),
+        @ActionRef(type = MakeStaticAction.class),
+        @ActionRef(type = ConvertToInstanceMethodAction.class)
+    },
+    parents = @ActionParentRef(
+        value = @ActionRef(id = IdeActions.GROUP_REFACTOR),
+        anchor = ActionRefAnchor.AFTER,
+        relatedToAction = @ActionRef(id = "ChangeSignature")
+    )
+)
+public class RefactoringMenu1Group extends DefaultActionGroup implements DumbAware {
+    public RefactoringMenu1Group() {
+        super(LocalizeValue.empty(), false);
+    }
+}
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RefactoringMenu2Group.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RefactoringMenu2Group.java
new file mode 100644
index 0000000000..a8a7bb0603
--- /dev/null
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RefactoringMenu2Group.java
@@ -0,0 +1,32 @@
+package com.intellij.java.impl.refactoring.actions;
+
+import consulo.annotation.component.ActionImpl;
+import consulo.annotation.component.ActionParentRef;
+import consulo.annotation.component.ActionRef;
+import consulo.annotation.component.ActionRefAnchor;
+import consulo.application.dumb.DumbAware;
+import consulo.localize.LocalizeValue;
+import consulo.ui.ex.action.DefaultActionGroup;
+import consulo.ui.ex.action.IdeActions;
+
+/**
+ * @author UNV
+ * @since 2025-09-23
+ */
+@ActionImpl(
+    id = "RefactoringMenu2",
+    children = {
+        @ActionRef(type = MethodDuplicatesAction.class),
+        @ActionRef(type = InvertBooleanAction.class)
+    },
+    parents = @ActionParentRef(
+        value = @ActionRef(id = IdeActions.GROUP_REFACTOR),
+        anchor = ActionRefAnchor.AFTER,
+        relatedToAction = @ActionRef(id = "Inline")
+    )
+)
+public class RefactoringMenu2Group extends DefaultActionGroup implements DumbAware {
+    public RefactoringMenu2Group() {
+        super(LocalizeValue.empty(), false);
+    }
+}
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RefactoringMenu4Group.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RefactoringMenu4Group.java
new file mode 100644
index 0000000000..fb966498df
--- /dev/null
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RefactoringMenu4Group.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2013-2025 consulo.io
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.java.impl.refactoring.actions;
+
+import com.intellij.java.impl.refactoring.wrapreturnvalue.WrapReturnValueAction;
+import consulo.annotation.component.ActionImpl;
+import consulo.annotation.component.ActionParentRef;
+import consulo.annotation.component.ActionRef;
+import consulo.annotation.component.ActionRefAnchor;
+import consulo.application.dumb.DumbAware;
+import consulo.localize.LocalizeValue;
+import consulo.ui.ex.action.AnSeparator;
+import consulo.ui.ex.action.DefaultActionGroup;
+import consulo.ui.ex.action.IdeActions;
+
+/**
+ * @author UNV
+ * @since 2025-10-29
+ */
+@ActionImpl(
+    id = "RefactoringMenu4",
+    children = {
+        @ActionRef(type = TurnRefsToSuperAction.class),
+        @ActionRef(type = InheritanceToDelegationAction.class),
+        @ActionRef(type = RemoveMiddlemanAction.class),
+        @ActionRef(type = WrapReturnValueAction.class),
+        @ActionRef(type = AnSeparator.class),
+        @ActionRef(type = AnonymousToInnerAction.class),
+        @ActionRef(type = EncapsulateFieldsAction.class),
+        @ActionRef(type = TempWithQueryAction.class),
+        @ActionRef(type = ReplaceConstructorWithFactoryAction.class),
+        @ActionRef(type = ReplaceConstructorWithBuilderAction.class),
+        @ActionRef(type = AnSeparator.class),
+        @ActionRef(type = TypeCookAction.class),
+        @ActionRef(type = MigrateAction.class),
+        @ActionRef(type = AnSeparator.class)
+    },
+    parents = @ActionParentRef(
+        value = @ActionRef(id = IdeActions.GROUP_REFACTOR),
+        anchor = ActionRefAnchor.AFTER,
+        relatedToAction = @ActionRef(id = "MemberPushDown")
+    )
+)
+public class RefactoringMenu4Group extends DefaultActionGroup implements DumbAware {
+    public RefactoringMenu4Group() {
+        super(LocalizeValue.empty(), false);
+    }
+}
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RemoveMiddlemanAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RemoveMiddlemanAction.java
index 9dcc069794..960aa8a403 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RemoveMiddlemanAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/RemoveMiddlemanAction.java
@@ -17,8 +17,10 @@
 
 import com.intellij.java.impl.refactoring.removemiddleman.RemoveMiddlemanHandler;
 import com.intellij.java.language.psi.PsiField;
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataContext;
 import consulo.codeEditor.Editor;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
@@ -27,22 +29,34 @@
 
 import jakarta.annotation.Nonnull;
 
+@ActionImpl(id = "RemoveMiddleman")
 public class RemoveMiddlemanAction extends BaseRefactoringAction {
+    public RemoveMiddlemanAction() {
+        super(JavaLocalize.actionRemoveMiddlemanText(), JavaLocalize.actionRemoveMiddlemanDescription());
+    }
 
-  protected RefactoringActionHandler getHandler(@Nonnull DataContext context) {
-    return new RemoveMiddlemanHandler();
-  }
+    @Override
+    protected RefactoringActionHandler getHandler(@Nonnull DataContext context) {
+        return new RemoveMiddlemanHandler();
+    }
 
-  @Override
-  protected boolean isAvailableOnElementInEditorAndFile(@Nonnull PsiElement element, @Nonnull Editor editor, @Nonnull PsiFile file, @Nonnull DataContext context) {
-    return element instanceof PsiField;
-  }
+    @Override
+    protected boolean isAvailableOnElementInEditorAndFile(
+        @Nonnull PsiElement element,
+        @Nonnull Editor editor,
+        @Nonnull PsiFile file,
+        @Nonnull DataContext context
+    ) {
+        return element instanceof PsiField;
+    }
 
-  public boolean isAvailableInEditorOnly() {
-    return false;
-  }
+    @Override
+    public boolean isAvailableInEditorOnly() {
+        return false;
+    }
 
-  public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    return elements.length == 1 && PsiTreeUtil.getParentOfType(elements[0], PsiField.class, false) != null;
-  }
+    @Override
+    public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return elements.length == 1 && PsiTreeUtil.getParentOfType(elements[0], PsiField.class, false) != null;
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ReplaceConstructorWithBuilderAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ReplaceConstructorWithBuilderAction.java
index c61ceec393..a4e9ee6f25 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ReplaceConstructorWithBuilderAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ReplaceConstructorWithBuilderAction.java
@@ -13,17 +13,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/*
- * User: anna
- * Date: 07-May-2008
- */
 package com.intellij.java.impl.refactoring.actions;
 
 import com.intellij.java.impl.refactoring.replaceConstructorWithBuilder.ReplaceConstructorWithBuilderHandler;
 import com.intellij.java.language.psi.PsiClass;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataContext;
 import consulo.codeEditor.Editor;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
@@ -31,24 +29,42 @@
 
 import jakarta.annotation.Nonnull;
 
+/**
+ * @author anna
+ * @since 2008-05-07
+ */
+@ActionImpl(id = "ReplaceConstructorWithBuilder")
 public class ReplaceConstructorWithBuilderAction extends BaseRefactoringAction {
-  protected boolean isAvailableInEditorOnly() {
-    return true;
-  }
+    public ReplaceConstructorWithBuilderAction() {
+        super(JavaLocalize.actionReplaceConstructorWithBuilderText(), JavaLocalize.actionReplaceConstructorWithBuilderDescription());
+    }
+
+    @Override
+    protected boolean isAvailableInEditorOnly() {
+        return true;
+    }
 
-  @Override
-  protected boolean isAvailableOnElementInEditorAndFile(@Nonnull PsiElement element, @Nonnull Editor editor, @Nonnull PsiFile file, @Nonnull DataContext context) {
-    final int offset = editor.getCaretModel().getOffset();
-    final PsiElement elementAt = file.findElementAt(offset);
-    final PsiClass psiClass = ReplaceConstructorWithBuilderHandler.getParentNamedClass(elementAt);
-    return psiClass != null && psiClass.getConstructors().length > 0;
-  }
+    @Override
+    @RequiredReadAction
+    protected boolean isAvailableOnElementInEditorAndFile(
+        @Nonnull PsiElement element,
+        @Nonnull Editor editor,
+        @Nonnull PsiFile file,
+        @Nonnull DataContext context
+    ) {
+        int offset = editor.getCaretModel().getOffset();
+        PsiElement elementAt = file.findElementAt(offset);
+        PsiClass psiClass = ReplaceConstructorWithBuilderHandler.getParentNamedClass(elementAt);
+        return psiClass != null && psiClass.getConstructors().length > 0;
+    }
 
-  protected boolean isEnabledOnElements(@Nonnull final PsiElement[] elements) {
-    return false;
-  }
+    @Override
+    protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return false;
+    }
 
-  protected RefactoringActionHandler getHandler(@Nonnull final DataContext dataContext) {
-    return new ReplaceConstructorWithBuilderHandler();
-  }
+    @Override
+    protected RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new ReplaceConstructorWithBuilderHandler();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ReplaceConstructorWithFactoryAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ReplaceConstructorWithFactoryAction.java
index 4943cde367..1224d6524e 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ReplaceConstructorWithFactoryAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ReplaceConstructorWithFactoryAction.java
@@ -19,7 +19,10 @@
 import com.intellij.java.language.JavaLanguage;
 import com.intellij.java.language.psi.PsiClass;
 import com.intellij.java.language.psi.PsiMethod;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataContext;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
 import consulo.language.editor.refactoring.action.BaseRefactoringAction;
@@ -29,18 +32,27 @@
 /**
  * @author dsl
  */
+@ActionImpl(id = "ReplaceConstructorWithFactory")
 public class ReplaceConstructorWithFactoryAction extends BaseRefactoringAction {
-  protected boolean isAvailableInEditorOnly() {
-    return false;
-  }
+    public ReplaceConstructorWithFactoryAction() {
+        super(JavaLocalize.actionReplaceConstructorWithFactoryText(), JavaLocalize.actionReplaceConstructorWithFactoryDescription());
+    }
 
-  protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    return elements.length == 1 &&
-        (elements[0] instanceof PsiMethod && ((PsiMethod) elements[0]).isConstructor() || elements[0] instanceof PsiClass)
-        && elements[0].getLanguage().isKindOf(JavaLanguage.INSTANCE);
-  }
+    @Override
+    protected boolean isAvailableInEditorOnly() {
+        return false;
+    }
 
-  protected RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
-    return new ReplaceConstructorWithFactoryHandler();
-  }
+    @Override
+    @RequiredReadAction
+    protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return elements.length == 1
+            && (elements[0] instanceof PsiMethod method && method.isConstructor() || elements[0] instanceof PsiClass)
+            && elements[0].getLanguage().isKindOf(JavaLanguage.INSTANCE);
+    }
+
+    @Override
+    protected RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new ReplaceConstructorWithFactoryHandler();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ReplaceMethodWithMethodObjectAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ReplaceMethodWithMethodObjectAction.java
index f5dba7c62a..87a48df831 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ReplaceMethodWithMethodObjectAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/ReplaceMethodWithMethodObjectAction.java
@@ -13,30 +13,49 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-/*
- * User: anna
- * Date: 06-May-2008
- */
 package com.intellij.java.impl.refactoring.actions;
 
 import com.intellij.java.impl.refactoring.extractMethodObject.ExtractMethodObjectHandler;
+import consulo.annotation.component.ActionImpl;
+import consulo.annotation.component.ActionParentRef;
+import consulo.annotation.component.ActionRef;
+import consulo.annotation.component.ActionRefAnchor;
 import consulo.dataContext.DataContext;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
 import consulo.language.editor.refactoring.action.BaseRefactoringAction;
 import jakarta.annotation.Nonnull;
 
+/**
+ * @author anna
+ * @since 2008-05-06
+ */
+@ActionImpl(
+    id = "ReplaceMethodWithMethodObject",
+    parents = @ActionParentRef(
+        value = @ActionRef(id = "IntroduceActionsGroup"),
+        anchor = ActionRefAnchor.AFTER,
+        relatedToAction = @ActionRef(id = "ExtractMethod")
+    )
+)
 public class ReplaceMethodWithMethodObjectAction extends BaseRefactoringAction {
-  protected boolean isAvailableInEditorOnly() {
-    return true;
-  }
+    public ReplaceMethodWithMethodObjectAction() {
+        super(JavaLocalize.actionReplaceMethodWithMethodObjectText(), JavaLocalize.actionReplaceMethodWithMethodObjectDescription());
+    }
+
+    @Override
+    protected boolean isAvailableInEditorOnly() {
+        return true;
+    }
 
-  protected boolean isEnabledOnElements(@Nonnull final PsiElement[] elements) {
-    return false;
-  }
+    @Override
+    protected boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return false;
+    }
 
-  protected RefactoringActionHandler getHandler(@Nonnull final DataContext dataContext) {
-    return new ExtractMethodObjectHandler();
-  }
+    @Override
+    protected RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new ExtractMethodObjectHandler();
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/TempWithQueryAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/TempWithQueryAction.java
index 22d5e54ae0..f58e4636a2 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/TempWithQueryAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/TempWithQueryAction.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright 2000-2009 JetBrains s.r.o.
  *
@@ -18,28 +17,44 @@
 
 import com.intellij.java.impl.refactoring.tempWithQuery.TempWithQueryHandler;
 import com.intellij.java.language.psi.PsiLocalVariable;
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataContext;
 import consulo.codeEditor.Editor;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
 import consulo.language.editor.refactoring.action.BaseRefactoringAction;
 import jakarta.annotation.Nonnull;
 
+@ActionImpl(id = "ReplaceTempWithQuery")
 public class TempWithQueryAction extends BaseRefactoringAction {
-  public boolean isAvailableInEditorOnly() {
-    return true;
-  }
+    public TempWithQueryAction() {
+        super(JavaLocalize.actionReplaceTempWithQueryText(), JavaLocalize.actionReplaceTempWithQueryDescription());
+    }
+
+    @Override
+    public boolean isAvailableInEditorOnly() {
+        return true;
+    }
 
-  public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    return false;
-  }
+    @Override
+    public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return false;
+    }
 
-  public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
-    return new TempWithQueryHandler();
-  }
+    @Override
+    public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new TempWithQueryHandler();
+    }
 
-  protected boolean isAvailableOnElementInEditorAndFile(@Nonnull final PsiElement element, @Nonnull final Editor editor, @Nonnull PsiFile file, @Nonnull DataContext context) {
-    return element instanceof PsiLocalVariable && ((PsiLocalVariable) element).getInitializer() != null;
-  }
+    @Override
+    protected boolean isAvailableOnElementInEditorAndFile(
+        @Nonnull PsiElement element,
+        @Nonnull Editor editor,
+        @Nonnull PsiFile file,
+        @Nonnull DataContext context
+    ) {
+        return element instanceof PsiLocalVariable localVar && localVar.getInitializer() != null;
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/TurnRefsToSuperAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/TurnRefsToSuperAction.java
index d9e4c3a339..8beb5bb1ac 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/TurnRefsToSuperAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/TurnRefsToSuperAction.java
@@ -18,23 +18,35 @@
 import com.intellij.java.impl.refactoring.turnRefsToSuper.TurnRefsToSuperHandler;
 import com.intellij.java.language.JavaLanguage;
 import com.intellij.java.language.psi.PsiClass;
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataContext;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.psi.PsiElement;
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
 import consulo.language.editor.refactoring.action.BaseRefactoringAction;
 
 import jakarta.annotation.Nonnull;
 
+@ActionImpl(id = "TurnRefsToSuper")
 public class TurnRefsToSuperAction extends BaseRefactoringAction {
-  public boolean isAvailableInEditorOnly() {
-    return false;
-  }
+    public TurnRefsToSuperAction() {
+        super(JavaLocalize.actionTurnRefsToSuperText(), JavaLocalize.actionTurnRefsToSuperDescription());
+    }
 
-  public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    return elements.length == 1 && elements[0] instanceof PsiClass && elements[0].getLanguage() == JavaLanguage.INSTANCE;
-  }
+    @Override
+    public boolean isAvailableInEditorOnly() {
+        return false;
+    }
 
-  public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
-    return new TurnRefsToSuperHandler();
-  }
+    @Override
+    @RequiredReadAction
+    public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        return elements.length == 1 && elements[0] instanceof PsiClass psiClass && psiClass.getLanguage() == JavaLanguage.INSTANCE;
+    }
+
+    @Override
+    public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new TurnRefsToSuperHandler();
+    }
 }
\ No newline at end of file
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/TypeCookAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/TypeCookAction.java
index d9ce8535ce..c9f57182f6 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/TypeCookAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/actions/TypeCookAction.java
@@ -15,12 +15,14 @@
  */
 package com.intellij.java.impl.refactoring.actions;
 
+import consulo.annotation.component.ActionImpl;
 import consulo.dataContext.DataManager;
 import com.intellij.java.impl.refactoring.typeCook.TypeCookHandler;
 import com.intellij.java.language.JavaLanguage;
 import com.intellij.java.language.psi.PsiClass;
 import com.intellij.java.language.psi.PsiJavaFile;
 import com.intellij.java.language.psi.PsiJavaPackage;
+import consulo.java.localize.JavaLocalize;
 import consulo.language.Language;
 import consulo.dataContext.DataContext;
 import consulo.project.Project;
@@ -31,42 +33,46 @@
 
 import jakarta.annotation.Nonnull;
 
+@ActionImpl(id = "Generify")
 public class TypeCookAction extends BaseRefactoringAction {
+    public TypeCookAction() {
+        super(JavaLocalize.actionGenerifyText(), JavaLocalize.actionGenerifyDescription());
+    }
 
-  @Override
-  protected boolean isAvailableInEditorOnly() {
-    return false;
-  }
+    @Override
+    protected boolean isAvailableInEditorOnly() {
+        return false;
+    }
 
-  @Override
-  public boolean isAvailableForLanguage(Language language) {
-    return language.equals(JavaLanguage.INSTANCE);
-  }
+    @Override
+    public boolean isAvailableForLanguage(Language language) {
+        return JavaLanguage.INSTANCE.equals(language);
+    }
 
-  @Override
-  public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    Project project = DataManager.getInstance().getDataContext().getData(Project.KEY);
+    @Override
+    public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        Project project = DataManager.getInstance().getDataContext().getData(Project.KEY);
 
-    if (project == null) {
-      return false;
-    }
+        if (project == null) {
+            return false;
+        }
 
-    for (PsiElement element : elements) {
-      if (!(element instanceof PsiClass || element instanceof PsiJavaFile
-        || element instanceof PsiDirectory || element instanceof PsiJavaPackage)) {
-        return false;
-      }
-    }
+        for (PsiElement element : elements) {
+            if (!(element instanceof PsiClass || element instanceof PsiJavaFile
+                || element instanceof PsiDirectory || element instanceof PsiJavaPackage)) {
+                return false;
+            }
+        }
 
-    return true;
-  }
+        return true;
+    }
 
-  @Override
-  public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
-    return getHandler();
-  }
+    @Override
+    public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return getHandler();
+    }
 
-  public RefactoringActionHandler getHandler() {
-    return new TypeCookHandler();
-  }
+    public RefactoringActionHandler getHandler() {
+        return new TypeCookHandler();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeMigration/actions/ChangeTypeSignatureAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeMigration/actions/ChangeTypeSignatureAction.java
index 60abdbfd66..f4b2a27322 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/typeMigration/actions/ChangeTypeSignatureAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/typeMigration/actions/ChangeTypeSignatureAction.java
@@ -15,6 +15,9 @@
  */
 package com.intellij.java.impl.refactoring.typeMigration.actions;
 
+import consulo.annotation.access.RequiredReadAction;
+import consulo.annotation.component.ActionImpl;
+import consulo.java.localize.JavaLocalize;
 import jakarta.annotation.Nonnull;
 
 import consulo.dataContext.DataContext;
@@ -31,49 +34,54 @@
 import com.intellij.java.impl.refactoring.typeMigration.ChangeTypeSignatureHandler;
 import consulo.language.editor.TargetElementUtil;
 
-public class ChangeTypeSignatureAction extends BaseRefactoringAction
-{
-	@Override
-	public boolean isAvailableInEditorOnly()
-	{
-		return false;
-	}
+@ActionImpl(id = "ChangeTypeSignature")
+public class ChangeTypeSignatureAction extends BaseRefactoringAction {
+    public ChangeTypeSignatureAction() {
+        super(
+            JavaLocalize.actionChangeTypeSignatureText(),
+            JavaLocalize.actionChangeTypeSignatureDescription()
+        );
+    }
 
-	@Override
-	public boolean isEnabledOnElements(@Nonnull PsiElement[] elements)
-	{
-		if(elements.length > 1)
-		{
-			return false;
-		}
+    @Override
+    public boolean isAvailableInEditorOnly() {
+        return false;
+    }
 
-		for(PsiElement element : elements)
-		{
-			if(!(element instanceof PsiMethod || element instanceof PsiVariable))
-			{
-				return false;
-			}
-		}
+    @Override
+    public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        if (elements.length > 1) {
+            return false;
+        }
 
-		return true;
-	}
+        for (PsiElement element : elements) {
+            if (!(element instanceof PsiMethod || element instanceof PsiVariable)) {
+                return false;
+            }
+        }
 
-	@Override
-	protected boolean isAvailableOnElementInEditorAndFile(@Nonnull final PsiElement element, @Nonnull final Editor editor, @Nonnull PsiFile file, @Nonnull DataContext context)
-	{
-		final int offset = TargetElementUtil.adjustOffset(file, editor.getDocument(), editor.getCaretModel().getOffset());
-		final PsiElement psiElement = file.findElementAt(offset);
-		final PsiReferenceParameterList referenceParameterList = PsiTreeUtil.getParentOfType(psiElement, PsiReferenceParameterList.class);
-		if(referenceParameterList != null)
-		{
-			return referenceParameterList.getTypeArguments().length > 0;
-		}
-		return PsiTreeUtil.getParentOfType(psiElement, PsiTypeElement.class) != null;
-	}
+        return true;
+    }
 
-	@Override
-	public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext)
-	{
-		return new ChangeTypeSignatureHandler();
-	}
+    @Override
+    @RequiredReadAction
+    protected boolean isAvailableOnElementInEditorAndFile(
+        @Nonnull PsiElement element,
+        @Nonnull Editor editor,
+        @Nonnull PsiFile file,
+        @Nonnull DataContext context
+    ) {
+        int offset = TargetElementUtil.adjustOffset(file, editor.getDocument(), editor.getCaretModel().getOffset());
+        PsiElement psiElement = file.findElementAt(offset);
+        PsiReferenceParameterList referenceParameterList = PsiTreeUtil.getParentOfType(psiElement, PsiReferenceParameterList.class);
+        if (referenceParameterList != null) {
+            return referenceParameterList.getTypeArguments().length > 0;
+        }
+        return PsiTreeUtil.getParentOfType(psiElement, PsiTypeElement.class) != null;
+    }
+
+    @Override
+    public RefactoringActionHandler getHandler(@Nonnull DataContext dataContext) {
+        return new ChangeTypeSignatureHandler();
+    }
 }
diff --git a/plugin/src/main/java/com/intellij/java/impl/refactoring/wrapreturnvalue/WrapReturnValueAction.java b/plugin/src/main/java/com/intellij/java/impl/refactoring/wrapreturnvalue/WrapReturnValueAction.java
index f735d451aa..23f9fc3e0a 100644
--- a/plugin/src/main/java/com/intellij/java/impl/refactoring/wrapreturnvalue/WrapReturnValueAction.java
+++ b/plugin/src/main/java/com/intellij/java/impl/refactoring/wrapreturnvalue/WrapReturnValueAction.java
@@ -15,6 +15,8 @@
  */
 package com.intellij.java.impl.refactoring.wrapreturnvalue;
 
+import consulo.annotation.component.ActionImpl;
+import consulo.java.localize.JavaLocalize;
 import jakarta.annotation.Nonnull;
 
 import com.intellij.java.language.psi.PsiMethod;
@@ -26,33 +28,44 @@
 import consulo.language.editor.refactoring.action.RefactoringActionHandler;
 import consulo.language.editor.refactoring.action.BaseRefactoringAction;
 
-public class WrapReturnValueAction extends BaseRefactoringAction{
+@ActionImpl(id = "WrapReturnValue")
+public class WrapReturnValueAction extends BaseRefactoringAction {
+    public WrapReturnValueAction() {
+        super(JavaLocalize.actionWrapReturnValueText(), JavaLocalize.actionWrapReturnValueDescription());
+    }
 
-  protected RefactoringActionHandler getHandler(@Nonnull DataContext context){
+    @Override
+    protected RefactoringActionHandler getHandler(@Nonnull DataContext context) {
         return new WrapReturnValueHandler();
     }
 
-  public boolean isAvailableInEditorOnly(){
-      return false;
-  }
-
-  @Override
-  protected boolean isAvailableOnElementInEditorAndFile(@Nonnull PsiElement element, @Nonnull Editor editor, @Nonnull PsiFile file, @Nonnull DataContext context) {
-    final PsiMethod psiMethod = PsiTreeUtil.getParentOfType(element, PsiMethod.class, false);
-    if (psiMethod != null && !(psiMethod instanceof PsiCompiledElement)) {
-      final PsiType returnType = psiMethod.getReturnType();
-      return returnType != null && !PsiType.VOID.equals(returnType);
+    @Override
+    public boolean isAvailableInEditorOnly() {
+        return false;
     }
-    return false;
-  }
 
-  public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
-    if (elements.length != 1) {
+    @Override
+    protected boolean isAvailableOnElementInEditorAndFile(
+        @Nonnull PsiElement element,
+        @Nonnull Editor editor,
+        @Nonnull PsiFile file,
+        @Nonnull DataContext context
+    ) {
+        PsiMethod psiMethod = PsiTreeUtil.getParentOfType(element, PsiMethod.class, false);
+        if (psiMethod != null && !(psiMethod instanceof PsiCompiledElement)) {
+            PsiType returnType = psiMethod.getReturnType();
+            return returnType != null && !PsiType.VOID.equals(returnType);
+        }
         return false;
     }
-    final PsiElement element = elements[0];
-    final PsiMethod containingMethod =
-            PsiTreeUtil.getParentOfType(element, PsiMethod.class, false);
-    return containingMethod != null;
-  }
+
+    @Override
+    public boolean isEnabledOnElements(@Nonnull PsiElement[] elements) {
+        if (elements.length != 1) {
+            return false;
+        }
+        PsiElement element = elements[0];
+        PsiMethod containingMethod = PsiTreeUtil.getParentOfType(element, PsiMethod.class, false);
+        return containingMethod != null;
+    }
 }
diff --git a/plugin/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.JavaLocalize.yaml b/plugin/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.JavaLocalize.yaml
index dcf4960807..e76e95b6ca 100644
--- a/plugin/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.JavaLocalize.yaml
+++ b/plugin/src/main/resources/LOCALIZE-LIB/en_US/consulo.java.JavaLocalize.yaml
@@ -1,14 +1,14 @@
-action.AnonymousToInner.description:
+action.anonymous.to.inner.description:
     text: Convert anonymous class into an inner class
-action.AnonymousToInner.text:
+action.anonymous.to.inner.text:
     text: Convert Anon_ymous to Inner...
-action.ConvertToInstanceMethod.description:
+action.convert.to.instance.method.description:
     text: Convert static method to instance method and correct all references
-action.ConvertToInstanceMethod.text:
+action.convert.to.instance.method.text:
     text: C_onvert To Instance Method...
-action.EncapsulateFields.description:
+action.encapsulate.fields.description:
     text: Replace direct access to fields in the selected class with use of accessor methods
-action.EncapsulateFields.text:
+action.encapsulate.fields.text:
     text: _Encapsulate Fields...
 action.ExportThreads.description:
     text: Save all threads information to a text file or clipboard
@@ -46,21 +46,17 @@ action.Hotswap.description:
     text: Reload all changed classes into application being debugged (HotSwap)
 action.Hotswap.text:
     text: Relo_ad Changed Classes
-action.I18nize.description:
-    text: Replace Java string literal or JSP text with internationalized expression
-action.I18nize.text:
-    text: Internationali_ze...
 action.InferNullity.description:
     text: Infer nullity
 action.InferNullity.text:
     text: Infer _Nullity...
-action.InheritanceToDelegation.description:
+action.inheritance.to.delegation.description:
     text: Replace inheritance with delegation
-action.InheritanceToDelegation.text:
+action.inheritance.to.delegation.text:
     text: Replace _Inheritance with Delegation...
-action.IntroduceParameterObject.description:
+action.introduce.parameter.object.description:
     text: Replaces method parameters list with object
-action.IntroduceParameterObject.text:
+action.introduce.parameter.object.text:
     text: Introduce Parameter Ob_ject...
 action.InvertBoolean.description:
     text: Makes the method return or variable contain the opposite value and corrects the references
@@ -74,33 +70,33 @@ action.MakeStatic.description:
     text: Convert method or inner class to static and correct all references
 action.MakeStatic.text:
     text: Make S_tatic...
-action.MethodDuplicates.description:
+action.method.duplicates.description:
     text: Finds code in selected scope that can be transformed into a call of selected method/constant
-action.MethodDuplicates.text:
+action.method.duplicates.text:
     text: Find and Replace _Code Duplicates...
-action.Migrate.description:
+action.migrate.description:
     text: Open migration dialog
-action.Migrate.text:
+action.migrate.text:
     text: _Migrate...
-action.RemoveMiddleman.description:
+action.remove.middleman.description:
     text: Inline delegate to the selected field methods
-action.RemoveMiddleman.text:
+action.remove.middleman.text:
     text: Remove _Middleman...
-action.ReplaceConstructorWithBuilder.description:
+action.replace.constructor.with.builder.description:
     text: Replace current class constructors calls with chained calls to the builder
-action.ReplaceConstructorWithBuilder.text:
+action.replace.constructor.with.builder.text:
     text: Replace Constructor with Builder...
-action.ReplaceConstructorWithFactory.description:
+action.replace.constructor.with.factory.description:
     text: Create a static factory method and use it instead of a constructor
-action.ReplaceConstructorWithFactory.text:
+action.replace.constructor.with.factory.text:
     text: Replace Constructor with F_actory Method...
-action.ReplaceMethodWithMethodObject.description:
+action.replace.method.with.method.object.description:
     text: Turn the method into its own object so that all the parameters become fields on that object
-action.ReplaceMethodWithMethodObject.text:
+action.replace.method.with.method.object.text:
     text: Method Ob_ject...
-action.ReplaceTempWithQuery.description:
+action.replace.temp.with.query.description:
     text: Turn the selected variable into a method
-action.ReplaceTempWithQuery.text:
+action.replace.temp.with.query.text:
     text: Replace Temp with _Query...
 action.ShowPackageCycles.description:
     text: Browse code chosen analysis item used in cycles
@@ -116,17 +112,17 @@ action.SliceForward.text:
     text: Analyze Data Flow _from Here
 action.SliceSliceForward.description:
     text: Search for values escaped from this location
-action.TurnRefsToSuper.description:
+action.turn.refs.to.super.description:
     text: Change usages of a class to those of its superclass or interface
-action.TurnRefsToSuper.text:
+action.turn.refs.to.super.text:
     text: Use Interface _Where Possible...
 action.Unscramble.description:
     text: Open console with the navigatable stacktrace
 action.Unscramble.text:
     text: Analyze _Stacktrace...
-action.WrapReturnValue.description:
+action.wrap.return.value.description:
     text: Wrap return value of the specified method with object
-action.WrapReturnValue.text:
+action.wrap.return.value.text:
     text: Wrap Method Re_turn Value...
 action.change.type.signature.description:
     text: Change type of the return type of the method, field, parameter, variable or class type arguments and correct all references
diff --git a/plugin/src/main/resources/META-INF/plugin.xml b/plugin/src/main/resources/META-INF/plugin.xml
index 0261db29ac..ed389ba5c1 100644
--- a/plugin/src/main/resources/META-INF/plugin.xml
+++ b/plugin/src/main/resources/META-INF/plugin.xml
@@ -39,55 +39,11 @@
 	</permissions>
 
 	<actions>
-		<group id="RefactoringMenu1">
-			<action id="ChangeTypeSignature"
-					class="com.intellij.java.impl.refactoring.typeMigration.actions.ChangeTypeSignatureAction"
-					text="T_ype Migration..."
-					description="Change type of the return type of the method, field, parameter, variable or class type arguments and correct all references"/>
-			<action id="MakeStatic" class="com.intellij.java.impl.refactoring.actions.MakeStaticAction"/>
-			<action id="ConvertToInstanceMethod" class="com.intellij.java.impl.refactoring.actions.ConvertToInstanceMethodAction"/>
-			<add-to-group group-id="RefactoringMenu" anchor="after" relative-to-action="ChangeSignature"/>
-		</group>
-
-		<group id="RefactoringMenu2">
-			<action id="MethodDuplicates" class="com.intellij.java.impl.refactoring.actions.MethodDuplicatesAction"/>
-
-			<action id="InvertBoolean" class="com.intellij.java.impl.refactoring.actions.InvertBooleanAction"/>
-			<add-to-group group-id="RefactoringMenu" anchor="after" relative-to-action="Inline"/>
-		</group>
-
-		<action id="ReplaceMethodWithMethodObject" class="com.intellij.java.impl.refactoring.actions.ReplaceMethodWithMethodObjectAction">
-			<add-to-group group-id="IntroduceActionsGroup" anchor="after" relative-to-action="ExtractMethod"/>
-		</action>
-
-		<action id="IntroduceParameterObject" class="com.intellij.java.impl.refactoring.actions.IntroduceParameterObjectAction">
-			<add-to-group group-id="IntroduceActionsGroup" anchor="after" relative-to-action="IntroduceParameter"/>
-		</action>
-
 		<action id="RenameFile" class="com.intellij.java.impl.refactoring.actions.RenameFileAction">
 			<add-to-group group-id="RefactoringMenu" anchor="after" relative-to-action="RenameElement"/>
 			<add-to-group group-id="EditorTabPopupMenuEx" anchor="after" relative-to-action="AddAllToFavorites"/>
 		</action>
 
-		<group id="RefactoringMenu4" require-module-extensions="java" can-use-project-as-default="true">
-			<action id="TurnRefsToSuper" class="com.intellij.java.impl.refactoring.actions.TurnRefsToSuperAction"/>
-			<action id="InheritanceToDelegation" class="com.intellij.java.impl.refactoring.actions.InheritanceToDelegationAction"/>
-			<action id="RemoveMiddleman" class="com.intellij.java.impl.refactoring.actions.RemoveMiddlemanAction"/>
-			<action id="WrapReturnValue" class="com.intellij.java.impl.refactoring.wrapreturnvalue.WrapReturnValueAction"/>
-			<separator/>
-			<action id="AnonymousToInner" class="com.intellij.java.impl.refactoring.actions.AnonymousToInnerAction"/>
-			<action id="EncapsulateFields" class="com.intellij.java.impl.refactoring.actions.EncapsulateFieldsAction"/>
-			<action id="ReplaceTempWithQuery" class="com.intellij.java.impl.refactoring.actions.TempWithQueryAction"/>
-			<action id="ReplaceConstructorWithFactory" class="com.intellij.java.impl.refactoring.actions.ReplaceConstructorWithFactoryAction"/>
-			<action id="ReplaceConstructorWithBuilder" class="com.intellij.java.impl.refactoring.actions.ReplaceConstructorWithBuilderAction"/>
-			<separator/>
-			<action id="Generify" class="com.intellij.java.impl.refactoring.actions.TypeCookAction"/>
-			<action id="Migrate" class="com.intellij.java.impl.refactoring.actions.MigrateAction"/>
-			<separator/>
-
-			<add-to-group group-id="RefactoringMenu" anchor="after" relative-to-action="MemberPushDown"/>
-		</group>
-
 		<action id="Hotswap" class="com.intellij.java.debugger.impl.actions.HotSwapAction">
 			<add-to-group group-id="DebugMainMenu" anchor="before" relative-to-action="StepOver"/>
 		</action>
@@ -138,7 +94,6 @@
 			<add-to-group group-id="CallHierarchyPopupMenu" anchor="first"/>
 		</action>
 
-
 		<group id="Debugger.FramePanelPopup">
 			<reference ref="Debugger.AdjustArrayRange"/>
 			<reference ref="XDebugger.Inspect"/>