From c95dcb1535ec49e8381bb4ae0c97306eb1d18890 Mon Sep 17 00:00:00 2001
From: Danila Ponomarenko <Danila.Ponomarenko@jetbrains.com>
Date: Fri, 15 Jun 2012 15:03:57 +0400
Subject: [PATCH] family name fixed

---
 .../intention/impl/BaseRunRefactoringAction.java   |  8 +-------
 .../intention/impl/EncapsulateFieldAction.java     |  8 +++++++-
 ....java => IntroduceVariableIntentionAction.java} |  8 +++++++-
 .../intention/impl/RunRefactoringAction.java       |  8 +++++++-
 .../src/messages/CodeInsightBundle.properties      |  1 -
 resources/src/META-INF/IdeaPlugin.xml              | 14 +++++++-------
 6 files changed, 29 insertions(+), 18 deletions(-)
 rename java/java-impl/src/com/intellij/codeInsight/intention/impl/{IntroduceVariableAction.java => IntroduceVariableIntentionAction.java} (94%)

diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/BaseRunRefactoringAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/BaseRunRefactoringAction.java
index b9fbab23fa76..01678b5fceb5 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/BaseRunRefactoringAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/BaseRunRefactoringAction.java
@@ -28,15 +28,9 @@ import javax.swing.*;
 /**
  * @author Danila Ponomarenko
  */
-public abstract class BaseRunRefactoringAction<T extends RefactoringActionHandler> implements IntentionAction, Iconable, LowPriorityAction {
+public abstract class BaseRunRefactoringAction implements IntentionAction, Iconable, LowPriorityAction {
   public static final Icon REFACTORING_BULB = AllIcons.Actions.RefactoringBulb;
 
-  @NotNull
-  @Override
-  public final String getFamilyName() {
-    return CodeInsightBundle.message("intention.refactoring.family");
-  }
-
   @Override
   public final boolean startInWriteAction() {
     return false;
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/EncapsulateFieldAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/EncapsulateFieldAction.java
index 685f37b375b0..cc6f7bee9a25 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/EncapsulateFieldAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/EncapsulateFieldAction.java
@@ -28,7 +28,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * @author Danila Ponomarenko
  */
-public class EncapsulateFieldAction extends BaseRunRefactoringAction<EncapsulateFieldsHandler> {
+public class EncapsulateFieldAction extends BaseRunRefactoringAction {
 
   @NotNull
   @Override
@@ -36,6 +36,12 @@ public class EncapsulateFieldAction extends BaseRunRefactoringAction<Encapsulate
     return CodeInsightBundle.message("intention.encapsulate.field.text");
   }
 
+  @NotNull
+  @Override
+  public final String getFamilyName() {
+    return getText();
+  }
+
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
     final PsiField field = getField(getElement(editor, file));
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableIntentionAction.java
similarity index 94%
rename from java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableAction.java
rename to java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableIntentionAction.java
index f629c1bfc21c..5fe4582ece56 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/IntroduceVariableIntentionAction.java
@@ -29,7 +29,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * @author Danila Ponomarenko
  */
-public class IntroduceVariableAction extends BaseRunRefactoringAction<IntroduceVariableHandler> {
+public class IntroduceVariableIntentionAction extends BaseRunRefactoringAction {
 
   @NotNull
   @Override
@@ -37,6 +37,12 @@ public class IntroduceVariableAction extends BaseRunRefactoringAction<IntroduceV
     return CodeInsightBundle.message("intention.introduce.variable.text");
   }
 
+  @NotNull
+  @Override
+  public String getFamilyName() {
+    return getText();
+  }
+
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
     final PsiElement element = getElement(editor, file);
diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/RunRefactoringAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/RunRefactoringAction.java
index 6462dbe404b9..eaffe844dda9 100644
--- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/RunRefactoringAction.java
+++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/RunRefactoringAction.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull;
  * User: anna
  * Date: 9/5/11
  */
-public class RunRefactoringAction extends BaseRunRefactoringAction<RefactoringActionHandler> {
+public class RunRefactoringAction extends BaseRunRefactoringAction {
   private final RefactoringActionHandler myHandler;
   private final String myCommandName;
 
@@ -41,6 +41,12 @@ public class RunRefactoringAction extends BaseRunRefactoringAction<RefactoringAc
     return myCommandName;
   }
 
+  @NotNull
+  @Override
+  public final String getFamilyName() {
+    return getText();
+  }
+
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
     return true;
diff --git a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
index 773e1c1cd3cf..355e2c4179e8 100644
--- a/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
+++ b/platform/platform-resources-en/src/messages/CodeInsightBundle.properties
@@ -156,7 +156,6 @@ intention.make.type.generic.family=Make Type Generic
 intention.make.type.generic.text=Change type of {0} to {1}
 intention.split.if.family=Split If
 intention.split.if.text=Split into 2 if's
-intention.refactoring.family=Refactoring
 intention.introduce.variable.text=Introduce local variable
 intention.encapsulate.field.text=Encapsulate field
 intention.implement.abstract.method.family=Implement Abstract Method
diff --git a/resources/src/META-INF/IdeaPlugin.xml b/resources/src/META-INF/IdeaPlugin.xml
index 777b53bc910c..442ee82d5606 100644
--- a/resources/src/META-INF/IdeaPlugin.xml
+++ b/resources/src/META-INF/IdeaPlugin.xml
@@ -640,17 +640,17 @@
       <category>Declaration</category>
     </intentionAction>
     <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.IntroduceVariableAction</className>
-      <category>Declaration</category>
-    </intentionAction>
-    <intentionAction>
-      <className>com.intellij.codeInsight.intention.impl.EncapsulateFieldAction</className>
+      <className>com.intellij.codeInsight.daemon.impl.quickfix.DelegateWithDefaultParamValueIntentionAction</className>
       <category>Declaration</category>
     </intentionAction>
 
     <intentionAction>
-      <className>com.intellij.codeInsight.daemon.impl.quickfix.DelegateWithDefaultParamValueIntentionAction</className>
-      <category>Declaration</category>
+      <className>com.intellij.codeInsight.intention.impl.IntroduceVariableAction</className>
+      <category>Refactorings</category>
+    </intentionAction>
+    <intentionAction>
+      <className>com.intellij.codeInsight.intention.impl.EncapsulateFieldAction</className>
+      <category>Refactorings</category>
     </intentionAction>
 
     <intentionAction>