diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java index b7d32ac58130..66cb12fad3ed 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java @@ -734,15 +734,12 @@ public final class PsiUtil extends PsiUtilCore { if (!allowPublicAbstract && aClass.hasModifierProperty(PsiModifier.ABSTRACT) && !aClass.isEnum()) { modifier = PsiModifier.PROTECTED; } - else if (aClass.hasModifierProperty(PsiModifier.PACKAGE_LOCAL)) { + else if (aClass.hasModifierProperty(PsiModifier.PACKAGE_LOCAL) || aClass.isEnum()) { modifier = PsiModifier.PACKAGE_LOCAL; } else if (aClass.hasModifierProperty(PsiModifier.PRIVATE)) { modifier = PsiModifier.PRIVATE; } - else if (aClass.isEnum()) { - modifier = PsiModifier.PRIVATE; - } return modifier; } diff --git a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/afterGenerateEnumPrivateConstructor.java b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/afterGenerateEnumPrivateConstructor.java index 53ec37bf6f57..2c8757516f39 100644 --- a/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/afterGenerateEnumPrivateConstructor.java +++ b/java/java-tests/testData/codeInsight/daemonCodeAnalyzer/quickFix/createConstructorParameterFromField/afterGenerateEnumPrivateConstructor.java @@ -4,7 +4,7 @@ public enum MyEnum VALUE_ONE(myField); private final int myField; - private MyEnum(int myField) { + MyEnum(int myField) { this.myField = myField; } } \ No newline at end of file diff --git a/java/java-tests/testData/codeInsight/generateConstructor/afterEnumWithAbstractMethod.java b/java/java-tests/testData/codeInsight/generateConstructor/afterEnumWithAbstractMethod.java index f12bc94ae242..8a38e2b50e73 100644 --- a/java/java-tests/testData/codeInsight/generateConstructor/afterEnumWithAbstractMethod.java +++ b/java/java-tests/testData/codeInsight/generateConstructor/afterEnumWithAbstractMethod.java @@ -7,6 +7,6 @@ public enum Operation { abstract int eval(int x, int y); - private Operation() { + Operation() { } } \ No newline at end of file