diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/codeInspection/MultipleRepositoryUrlsFix.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/codeInspection/MultipleRepositoryUrlsFix.java index dc4f3cc32543..04c39d4040fe 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/codeInspection/MultipleRepositoryUrlsFix.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/codeInspection/MultipleRepositoryUrlsFix.java @@ -69,7 +69,7 @@ public class MultipleRepositoryUrlsFix extends GroovyFix { @NotNull @Override - public String getName() { + public String getFamilyName() { return GradleInspectionBundle.message("multiple.repository.urls.fix.name"); } } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovyFix.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovyFix.java index 54456d1d4d1d..64ce1d31031d 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovyFix.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/GroovyFix.java @@ -38,18 +38,13 @@ public abstract class GroovyFix implements LocalQuickFix { @NotNull @Override - public String getName() { + public String getFamilyName() { throw new UnsupportedOperationException(); } }; public static final GroovyFix[] EMPTY_ARRAY = new GroovyFix[0]; - //to appear in "Apply Fix" statement when multiple Quick Fixes exist - @Override - @NotNull - public String getFamilyName() { - return ""; - } + @Override public void applyFix(@NotNull Project project, diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrCastFix.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrCastFix.java index f1c72539f92d..d1b004018c74 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrCastFix.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrCastFix.java @@ -26,6 +26,7 @@ import com.intellij.psi.PsiFile; import com.intellij.psi.PsiType; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.codeInspection.GroovyFix; import org.jetbrains.plugins.groovy.lang.psi.GroovyPsiElementFactory; @@ -99,4 +100,11 @@ public class GrCastFix extends GroovyFix implements LocalQuickFix { public String getName() { return "Cast to " + myExpectedType.getPresentableText(); } + + @Nls + @NotNull + @Override + public String getFamilyName() { + return "Add cast"; + } } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrChangeVariableType.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrChangeVariableType.java index 9ae9abaf7f97..d8670e3cc7f2 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrChangeVariableType.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GrChangeVariableType.java @@ -22,6 +22,7 @@ import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiType; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.codeInspection.GroovyFix; import org.jetbrains.plugins.groovy.codeInspection.GroovyInspectionBundle; @@ -73,4 +74,11 @@ public class GrChangeVariableType extends GroovyFix { public String getName() { return GroovyInspectionBundle.message("change.lvalue.type", myName, myType); } + + @Nls + @NotNull + @Override + public String getFamilyName() { + return "Change variable type"; + } } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java index f6d46fb8b8b3..9fc718647396 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/GroovyAssignmentCanBeOperatorAssignmentInspection.java @@ -136,6 +136,13 @@ public class GroovyAssignmentCanBeOperatorAssignmentInspection m_name = "Replace '=' with '" + signText + "='"; } + @Nls + @NotNull + @Override + public String getFamilyName() { + return "Simplify"; + } + @Override @NotNull public String getName() { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/ParameterCastFix.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/ParameterCastFix.java index 9be80db2a98c..5a82c326d156 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/ParameterCastFix.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/ParameterCastFix.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiType; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.codeInspection.GroovyFix; import org.jetbrains.plugins.groovy.lang.psi.api.statements.arguments.GrArgumentList; @@ -77,4 +78,11 @@ public class ParameterCastFix extends GroovyFix { public String getName() { return myName; } + + @Nls + @NotNull + @Override + public String getFamilyName() { + return "Add cast"; + } } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyNonShortCircuitBooleanInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyNonShortCircuitBooleanInspection.java index 1fe3eb70325f..f6b40f56ea71 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyNonShortCircuitBooleanInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyNonShortCircuitBooleanInspection.java @@ -69,7 +69,7 @@ public class GroovyNonShortCircuitBooleanInspection extends BaseInspection { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Replace with short-circuit expression"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckInspection.java index a466c2dddae3..8d24d86cf821 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GroovyRangeTypeCheckInspection.java @@ -99,6 +99,13 @@ public class GroovyRangeTypeCheckInspection extends BaseInspection { public String getName() { return GroovyInspectionBundle.message("fix.class", psiClass.getName()); } + + @Nls + @NotNull + @Override + public String getFamilyName() { + return "Fix range class"; + } }; } return null; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyDoubleNegationInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyDoubleNegationInspection.java index 70ae7dd298dd..9ce569b5d427 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyDoubleNegationInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyDoubleNegationInspection.java @@ -69,7 +69,7 @@ public class GroovyDoubleNegationInspection extends BaseInspection { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Remove double negation"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyPointlessArithmeticInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyPointlessArithmeticInspection.java index 39bf9d188d3c..f11a8208549c 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyPointlessArithmeticInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyPointlessArithmeticInspection.java @@ -108,7 +108,7 @@ public class GroovyPointlessArithmeticInspection extends BaseInspection { private static class PointlessArithmeticFix extends GroovyFix { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Simplify"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyPointlessBooleanInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyPointlessBooleanInspection.java index 9d6095caa1a1..39677502cec8 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyPointlessBooleanInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/confusing/GroovyPointlessBooleanInspection.java @@ -172,7 +172,7 @@ public class GroovyPointlessBooleanInspection extends BaseInspection { @Override @NotNull - public String getName() { + public String getFamilyName() { return GroovyInspectionBundle.message("pointless.boolean.quickfix"); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeConditionalCallInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeConditionalCallInspection.java index f2d41379682f..a220243b9446 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeConditionalCallInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeConditionalCallInspection.java @@ -62,7 +62,7 @@ public class GroovyConditionalCanBeConditionalCallInspection extends BaseInspect private static class CollapseConditionalFix extends GroovyFix { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Replace with conditional call"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeElvisInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeElvisInspection.java index 96d5165692fc..12e05552431b 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeElvisInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeElvisInspection.java @@ -57,7 +57,7 @@ public class GroovyConditionalCanBeElvisInspection extends BaseInspection { return new GroovyFix() { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Convert Conditional to Elvis"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalWithIdenticalBranchesInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalWithIdenticalBranchesInspection.java index 645760ccf1f4..04ea46f02050 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalWithIdenticalBranchesInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalWithIdenticalBranchesInspection.java @@ -58,7 +58,7 @@ public class GroovyConditionalWithIdenticalBranchesInspection extends BaseInspec private static class CollapseConditionalFix extends GroovyFix { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Collapse conditional expression"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConstantConditionalInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConstantConditionalInspection.java index 8171217b888e..3dbc76c23e0e 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConstantConditionalInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConstantConditionalInspection.java @@ -81,7 +81,7 @@ public class GroovyConstantConditionalInspection extends BaseInspection { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Simplify"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConstantIfStatementInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConstantIfStatementInspection.java index ca793d1b6ba7..d0ab8acc0cad 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConstantIfStatementInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConstantIfStatementInspection.java @@ -68,7 +68,7 @@ public class GroovyConstantIfStatementInspection extends BaseInspection { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Simplify"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyIfStatementWithIdenticalBranchesInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyIfStatementWithIdenticalBranchesInspection.java index 5568c4f6fe0f..f1bc40ed8532 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyIfStatementWithIdenticalBranchesInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyIfStatementWithIdenticalBranchesInspection.java @@ -59,7 +59,7 @@ public class GroovyIfStatementWithIdenticalBranchesInspection extends BaseInspec @Override @NotNull - public String getName() { + public String getFamilyName() { return "Collapse 'if' statement'"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyReturnFromClosureCanBeImplicitInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyReturnFromClosureCanBeImplicitInspection.java index 887cdd434bf2..8ad724074860 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyReturnFromClosureCanBeImplicitInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyReturnFromClosureCanBeImplicitInspection.java @@ -70,7 +70,7 @@ public class GroovyReturnFromClosureCanBeImplicitInspection extends BaseInspecti private static class MakeReturnImplicitFix extends GroovyFix { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Make return implicit"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialConditionalInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialConditionalInspection.java index 96211634bae8..e19cbf3ecb88 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialConditionalInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialConditionalInspection.java @@ -82,7 +82,7 @@ public class GroovyTrivialConditionalInspection extends BaseInspection { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Simplify"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialIfInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialIfInspection.java index 6bb5f372c00c..f5c183e3376a 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialIfInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyTrivialIfInspection.java @@ -75,7 +75,7 @@ public class GroovyTrivialIfInspection extends BaseInspection { private static class TrivialIfFix extends GroovyFix { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Simplify"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyUnnecessaryContinueInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyUnnecessaryContinueInspection.java index 6b7ebbb4151e..950b03b16143 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyUnnecessaryContinueInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyUnnecessaryContinueInspection.java @@ -76,7 +76,7 @@ public class GroovyUnnecessaryContinueInspection extends BaseInspection { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Remove unnecessary continue"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyUnnecessaryReturnInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyUnnecessaryReturnInspection.java index 3aa2c6289233..ff21593b91bf 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyUnnecessaryReturnInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyUnnecessaryReturnInspection.java @@ -75,7 +75,7 @@ public class GroovyUnnecessaryReturnInspection extends BaseInspection { private static class UnnecessaryReturnFix extends GroovyFix { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Remove unnecessary return"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListGetCanBeKeyedAccessInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListGetCanBeKeyedAccessInspection.java index 1bca28e67cf3..40e866d093fa 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListGetCanBeKeyedAccessInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListGetCanBeKeyedAccessInspection.java @@ -73,7 +73,7 @@ public class GroovyListGetCanBeKeyedAccessInspection extends BaseInspection { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Replace with keyed access"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListSetCanBeKeyedAccessInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListSetCanBeKeyedAccessInspection.java index 9f76a21f6cd7..d86d79c27885 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListSetCanBeKeyedAccessInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyListSetCanBeKeyedAccessInspection.java @@ -73,7 +73,7 @@ public class GroovyListSetCanBeKeyedAccessInspection extends BaseInspection { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Replace with keyed access"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java index 122b6d60ac2e..2d3b20d0cccf 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapGetCanBeKeyedAccessInspection.java @@ -73,7 +73,7 @@ public class GroovyMapGetCanBeKeyedAccessInspection extends BaseInspection { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Replace with keyed access"; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java index d5c639a70359..2378a20740a9 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/gpath/GroovyMapPutCanBeKeyedAccessInspection.java @@ -74,7 +74,7 @@ public class GroovyMapPutCanBeKeyedAccessInspection extends BaseInspection { @Override @NotNull - public String getName() { + public String getFamilyName() { return "Replace with keyed access"; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateFieldFromConstructorLabelFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateFieldFromConstructorLabelFix.java index 30c434a7e94b..98cdc0af7112 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateFieldFromConstructorLabelFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/CreateFieldFromConstructorLabelFix.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiType; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.GroovyBundle; @@ -70,6 +71,13 @@ public class CreateFieldFromConstructorLabelFix extends GroovyFix { return GroovyBundle.message("create.field.from.usage", getFieldName()); } + @Nls + @NotNull + @Override + public String getFamilyName() { + return "Create field"; + } + @Override protected void doFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) throws IncorrectOperationException { myFix.doFix(project, ArrayUtil.EMPTY_STRING_ARRAY, getFieldName(), calculateTypeConstrains(), myNamedArgument); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddClassToExtendsFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddClassToExtendsFix.java index f43654d7000a..339455cf095b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddClassToExtendsFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddClassToExtendsFix.java @@ -22,6 +22,7 @@ import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.util.InheritanceUtil; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.codeInspection.GroovyFix; import org.jetbrains.plugins.groovy.codeInspection.GroovyInspectionBundle; @@ -108,4 +109,11 @@ public class AddClassToExtendsFix extends GroovyFix { public String getName() { return GroovyInspectionBundle.message("implement.class", myInterfaceName); } + + @Nls + @NotNull + @Override + public String getFamilyName() { + return "Implement"; + } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddMethodFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddMethodFix.java index c73db5624876..b6f5f52fca47 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddMethodFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/bugs/AddMethodFix.java @@ -27,6 +27,7 @@ import com.intellij.psi.PsiTypeParameter; import com.intellij.psi.util.PsiTypesUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.codeInspection.GroovyFix; import org.jetbrains.plugins.groovy.codeInspection.GroovyInspectionBundle; @@ -93,6 +94,13 @@ public class AddMethodFix extends GroovyFix { return GroovyInspectionBundle.message("add.method", myMethodName, myClass.getName()); } + @Nls + @NotNull + @Override + public String getFamilyName() { + return "Add method"; + } + static String generateTypeText(GrTypeDefinition aClass) { StringBuilder returnType = new StringBuilder(aClass.getName()); final PsiTypeParameter[] typeParameters = aClass.getTypeParameters(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/ReplaceWithImportFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/ReplaceWithImportFix.java index 4e0156ebfe80..03ab981ea5de 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/ReplaceWithImportFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/confusing/ReplaceWithImportFix.java @@ -39,7 +39,7 @@ public class ReplaceWithImportFix extends GroovyFix { @NotNull @Override - public String getName() { + public String getFamilyName() { return GroovyInspectionBundle.message("replace.qualified.name.with.import"); } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/RenameFix.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/RenameFix.java index c5a119a8e611..4a895137966f 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/RenameFix.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/codeInspection/naming/RenameFix.java @@ -22,6 +22,7 @@ import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.RefactoringActionHandlerFactory; import com.intellij.refactoring.RefactoringFactory; +import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.plugins.groovy.codeInspection.GroovyFix; @@ -50,6 +51,13 @@ public class RenameFix extends GroovyFix implements RefactoringQuickFix { } } + @Nls + @NotNull + @Override + public String getFamilyName() { + return "Rename"; + } + @Override public void doFix(@NotNull final Project project, @NotNull ProblemDescriptor descriptor) { final PsiElement element = descriptor.getPsiElement();