Skip to content

Commit d2d7bde

Browse files
unv-unvunv-unv
committed
Localizing inspections (part 9).
1 parent 10e2bc5 commit d2d7bde

34 files changed

Lines changed: 3641 additions & 3762 deletions

File tree

‎plugin/src/main/java/com/intellij/java/impl/ig/serialization/ReadResolveAndWriteReplaceProtectedInspection.java‎

Lines changed: 42 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -25,58 +25,54 @@
2525
import com.siyeh.ig.InspectionGadgetsFix;
2626
import com.siyeh.localize.InspectionGadgetsLocalize;
2727
import consulo.annotation.component.ExtensionImpl;
28+
import consulo.localize.LocalizeValue;
2829
import jakarta.annotation.Nonnull;
2930

3031
@ExtensionImpl
31-
public class ReadResolveAndWriteReplaceProtectedInspection
32-
extends BaseInspection {
33-
34-
@Nonnull
35-
public String getDisplayName() {
36-
return InspectionGadgetsLocalize.readresolveWritereplaceProtectedDisplayName().get();
37-
}
38-
39-
@Nonnull
40-
public String buildErrorString(Object... infos) {
41-
return InspectionGadgetsLocalize.readresolveWritereplaceProtectedProblemDescriptor().get();
42-
}
32+
public class ReadResolveAndWriteReplaceProtectedInspection extends BaseInspection {
33+
@Nonnull
34+
@Override
35+
public LocalizeValue getDisplayName() {
36+
return InspectionGadgetsLocalize.readresolveWritereplaceProtectedDisplayName();
37+
}
4338

44-
public BaseInspectionVisitor buildVisitor() {
45-
return new ReadResolveWriteReplaceProtectedVisitor();
46-
}
39+
@Nonnull
40+
public String buildErrorString(Object... infos) {
41+
return InspectionGadgetsLocalize.readresolveWritereplaceProtectedProblemDescriptor().get();
42+
}
4743

48-
public InspectionGadgetsFix buildFix(Object... infos) {
49-
return new ChangeModifierFix(PsiModifier.PROTECTED);
50-
}
44+
public BaseInspectionVisitor buildVisitor() {
45+
return new ReadResolveWriteReplaceProtectedVisitor();
46+
}
5147

52-
private static class ReadResolveWriteReplaceProtectedVisitor
53-
extends BaseInspectionVisitor {
48+
public InspectionGadgetsFix buildFix(Object... infos) {
49+
return new ChangeModifierFix(PsiModifier.PROTECTED);
50+
}
5451

55-
@Override
56-
public void visitMethod(@Nonnull PsiMethod method) {
57-
// no call to super, so it doesn't drill down
58-
final PsiClass aClass = method.getContainingClass();
59-
if (aClass == null) {
60-
return;
61-
}
62-
if (aClass.isInterface() || aClass.isAnnotationType()) {
63-
return;
64-
}
65-
if (method.hasModifierProperty(PsiModifier.PROTECTED)) {
66-
return;
67-
}
68-
if (aClass.hasModifierProperty(PsiModifier.FINAL) &&
69-
method.hasModifierProperty(PsiModifier.PRIVATE)) {
70-
return;
71-
}
72-
if (!SerializationUtils.isReadResolve(method) &&
73-
!SerializationUtils.isWriteReplace(method)) {
74-
return;
75-
}
76-
if (!SerializationUtils.isSerializable(aClass)) {
77-
return;
78-
}
79-
registerMethodError(method);
52+
private static class ReadResolveWriteReplaceProtectedVisitor extends BaseInspectionVisitor {
53+
@Override
54+
public void visitMethod(@Nonnull PsiMethod method) {
55+
// no call to super, so it doesn't drill down
56+
final PsiClass aClass = method.getContainingClass();
57+
if (aClass == null) {
58+
return;
59+
}
60+
if (aClass.isInterface() || aClass.isAnnotationType()) {
61+
return;
62+
}
63+
if (method.hasModifierProperty(PsiModifier.PROTECTED)) {
64+
return;
65+
}
66+
if (aClass.hasModifierProperty(PsiModifier.FINAL) && method.hasModifierProperty(PsiModifier.PRIVATE)) {
67+
return;
68+
}
69+
if (!SerializationUtils.isReadResolve(method) && !SerializationUtils.isWriteReplace(method)) {
70+
return;
71+
}
72+
if (!SerializationUtils.isSerializable(aClass)) {
73+
return;
74+
}
75+
registerMethodError(method);
76+
}
8077
}
81-
}
8278
}

‎plugin/src/main/java/com/intellij/java/impl/ig/serialization/SerialPersistentFieldsWithWrongSignatureInspection.java‎

Lines changed: 50 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -24,68 +24,64 @@
2424
import com.siyeh.ig.BaseInspectionVisitor;
2525
import com.siyeh.localize.InspectionGadgetsLocalize;
2626
import consulo.annotation.component.ExtensionImpl;
27+
import consulo.localize.LocalizeValue;
2728
import jakarta.annotation.Nonnull;
28-
import org.jetbrains.annotations.NonNls;
2929

3030
@ExtensionImpl
31-
public class SerialPersistentFieldsWithWrongSignatureInspection
32-
extends BaseInspection {
33-
34-
@Nonnull
35-
public String getDisplayName() {
36-
return InspectionGadgetsLocalize.serialpersistentfieldsWithWrongSignatureDisplayName().get();
37-
}
38-
39-
@Nonnull
40-
public String buildErrorString(Object... infos) {
41-
return InspectionGadgetsLocalize.serialpersistentfieldsWithWrongSignatureProblemDescriptor().get();
42-
}
31+
public class SerialPersistentFieldsWithWrongSignatureInspection extends BaseInspection {
32+
@Nonnull
33+
@Override
34+
public LocalizeValue getDisplayName() {
35+
return InspectionGadgetsLocalize.serialpersistentfieldsWithWrongSignatureDisplayName();
36+
}
4337

44-
public BaseInspectionVisitor buildVisitor() {
45-
return new SerialPersistentFieldsWithWrongSignatureVisitor();
46-
}
38+
@Nonnull
39+
public String buildErrorString(Object... infos) {
40+
return InspectionGadgetsLocalize.serialpersistentfieldsWithWrongSignatureProblemDescriptor().get();
41+
}
4742

48-
private static class SerialPersistentFieldsWithWrongSignatureVisitor
49-
extends BaseInspectionVisitor {
43+
public BaseInspectionVisitor buildVisitor() {
44+
return new SerialPersistentFieldsWithWrongSignatureVisitor();
45+
}
5046

51-
@Override
52-
public void visitClass(@Nonnull PsiClass aClass) {
53-
// no call to super, so it doesn't drill down
54-
if (aClass.isInterface() || aClass.isAnnotationType()) {
55-
return;
56-
}
57-
PsiField badSerialPersistentFields = null;
58-
final PsiField[] fields = aClass.getFields();
59-
for (final PsiField field : fields) {
60-
if (isSerialPersistentFields(field)) {
61-
if (!field.hasModifierProperty(PsiModifier.PRIVATE) ||
62-
!field.hasModifierProperty(PsiModifier.STATIC) ||
63-
!field.hasModifierProperty(PsiModifier.FINAL)) {
64-
badSerialPersistentFields = field;
65-
break;
66-
}
67-
else {
68-
final PsiType type = field.getType();
69-
if (!type.equalsToText("java.io.ObjectStreamField" +
70-
"[]")) {
71-
badSerialPersistentFields = field;
72-
break;
47+
private static class SerialPersistentFieldsWithWrongSignatureVisitor extends BaseInspectionVisitor {
48+
@Override
49+
public void visitClass(@Nonnull PsiClass aClass) {
50+
// no call to super, so it doesn't drill down
51+
if (aClass.isInterface() || aClass.isAnnotationType()) {
52+
return;
53+
}
54+
PsiField badSerialPersistentFields = null;
55+
final PsiField[] fields = aClass.getFields();
56+
for (final PsiField field : fields) {
57+
if (isSerialPersistentFields(field)) {
58+
if (!field.hasModifierProperty(PsiModifier.PRIVATE) ||
59+
!field.hasModifierProperty(PsiModifier.STATIC) ||
60+
!field.hasModifierProperty(PsiModifier.FINAL)) {
61+
badSerialPersistentFields = field;
62+
break;
63+
}
64+
else {
65+
final PsiType type = field.getType();
66+
if (!type.equalsToText("java.io.ObjectStreamField[]")) {
67+
badSerialPersistentFields = field;
68+
break;
69+
}
70+
}
71+
}
72+
}
73+
if (badSerialPersistentFields == null) {
74+
return;
7375
}
74-
}
76+
if (!SerializationUtils.isSerializable(aClass)) {
77+
return;
78+
}
79+
registerFieldError(badSerialPersistentFields);
7580
}
76-
}
77-
if (badSerialPersistentFields == null) {
78-
return;
79-
}
80-
if (!SerializationUtils.isSerializable(aClass)) {
81-
return;
82-
}
83-
registerFieldError(badSerialPersistentFields);
84-
}
8581

86-
private static boolean isSerialPersistentFields(PsiField field) {
87-
@NonNls final String fieldName = field.getName();
88-
return "serialPersistentFields".equals(fieldName);
82+
private static boolean isSerialPersistentFields(PsiField field) {
83+
final String fieldName = field.getName();
84+
return "serialPersistentFields".equals(fieldName);
85+
}
8986
}
90-
}
9187
}

‎plugin/src/main/java/com/intellij/java/impl/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java‎

Lines changed: 71 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -26,97 +26,94 @@
2626
import consulo.language.editor.inspection.ProblemDescriptor;
2727
import consulo.language.psi.PsiElement;
2828
import consulo.language.util.IncorrectOperationException;
29+
import consulo.localize.LocalizeValue;
2930
import consulo.project.Project;
3031
import jakarta.annotation.Nonnull;
3132

3233
@ExtensionImpl
3334
public class SerialVersionUIDNotStaticFinalInspection extends BaseInspection {
34-
35-
@Override
36-
@Nonnull
37-
public String getID() {
38-
return "SerialVersionUIDWithWrongSignature";
39-
}
40-
41-
@Override
42-
@Nonnull
43-
public String getDisplayName() {
44-
return InspectionGadgetsLocalize.serialversionuidPrivateStaticFinalLongDisplayName().get();
45-
}
46-
47-
@Override
48-
@Nonnull
49-
public String buildErrorString(Object... infos) {
50-
return InspectionGadgetsLocalize.serialversionuidPrivateStaticFinalLongProblemDescriptor().get();
51-
}
52-
53-
@Override
54-
protected InspectionGadgetsFix buildFix(Object... infos) {
55-
if ((Boolean)infos[0]) {
56-
return null;
35+
@Override
36+
@Nonnull
37+
public String getID() {
38+
return "SerialVersionUIDWithWrongSignature";
5739
}
58-
return new SerialVersionUIDNotStaticFinalFix();
59-
}
6040

61-
private static class SerialVersionUIDNotStaticFinalFix
62-
extends InspectionGadgetsFix {
41+
@Nonnull
42+
@Override
43+
public LocalizeValue getDisplayName() {
44+
return InspectionGadgetsLocalize.serialversionuidPrivateStaticFinalLongDisplayName();
45+
}
6346

47+
@Override
6448
@Nonnull
65-
public String getName() {
66-
return InspectionGadgetsLocalize.serialversionuidPrivateStaticFinalLongQuickfix().get();
49+
public String buildErrorString(Object... infos) {
50+
return InspectionGadgetsLocalize.serialversionuidPrivateStaticFinalLongProblemDescriptor().get();
6751
}
6852

6953
@Override
70-
protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
71-
final PsiElement element = descriptor.getPsiElement();
72-
final PsiElement parent = element.getParent();
73-
if (!(parent instanceof PsiField)) {
74-
return;
75-
}
76-
final PsiField field = (PsiField)parent;
77-
final PsiModifierList modifierList = field.getModifierList();
78-
if (modifierList == null) {
79-
return;
80-
}
81-
modifierList.setModifierProperty(PsiModifier.PRIVATE, true);
82-
modifierList.setModifierProperty(PsiModifier.STATIC, true);
83-
modifierList.setModifierProperty(PsiModifier.FINAL, true);
54+
protected InspectionGadgetsFix buildFix(Object... infos) {
55+
if ((Boolean) infos[0]) {
56+
return null;
57+
}
58+
return new SerialVersionUIDNotStaticFinalFix();
8459
}
85-
}
8660

61+
private static class SerialVersionUIDNotStaticFinalFix extends InspectionGadgetsFix {
62+
@Nonnull
63+
@Override
64+
public LocalizeValue getName() {
65+
return InspectionGadgetsLocalize.serialversionuidPrivateStaticFinalLongQuickfix();
66+
}
8767

88-
@Override
89-
public BaseInspectionVisitor buildVisitor() {
90-
return new SerialVersionUIDNotStaticFinalVisitor();
91-
}
68+
@Override
69+
protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException {
70+
final PsiElement element = descriptor.getPsiElement();
71+
final PsiElement parent = element.getParent();
72+
if (!(parent instanceof PsiField)) {
73+
return;
74+
}
75+
final PsiField field = (PsiField) parent;
76+
final PsiModifierList modifierList = field.getModifierList();
77+
if (modifierList == null) {
78+
return;
79+
}
80+
modifierList.setModifierProperty(PsiModifier.PRIVATE, true);
81+
modifierList.setModifierProperty(PsiModifier.STATIC, true);
82+
modifierList.setModifierProperty(PsiModifier.FINAL, true);
83+
}
84+
}
9285

93-
private static class SerialVersionUIDNotStaticFinalVisitor
94-
extends BaseInspectionVisitor {
9586

9687
@Override
97-
public void visitClass(@Nonnull PsiClass aClass) {
98-
// no call to super, so it doesn't drill down
99-
if (aClass.isInterface() || aClass.isAnnotationType()) {
100-
return;
101-
}
102-
final PsiField field =
103-
aClass.findFieldByName(
104-
HardcodedMethodConstants.SERIAL_VERSION_UID, false);
105-
if (field == null) {
106-
return;
107-
}
108-
final PsiType type = field.getType();
109-
final boolean wrongType = !PsiType.LONG.equals(type);
110-
if (field.hasModifierProperty(PsiModifier.STATIC) &&
111-
field.hasModifierProperty(PsiModifier.PRIVATE) &&
112-
field.hasModifierProperty(PsiModifier.FINAL) &&
113-
!wrongType) {
114-
return;
115-
}
116-
if (!SerializationUtils.isSerializable(aClass)) {
117-
return;
118-
}
119-
registerFieldError(field, Boolean.valueOf(wrongType));
88+
public BaseInspectionVisitor buildVisitor() {
89+
return new SerialVersionUIDNotStaticFinalVisitor();
90+
}
91+
92+
private static class SerialVersionUIDNotStaticFinalVisitor extends BaseInspectionVisitor {
93+
@Override
94+
public void visitClass(@Nonnull PsiClass aClass) {
95+
// no call to super, so it doesn't drill down
96+
if (aClass.isInterface() || aClass.isAnnotationType()) {
97+
return;
98+
}
99+
final PsiField field =
100+
aClass.findFieldByName(
101+
HardcodedMethodConstants.SERIAL_VERSION_UID, false);
102+
if (field == null) {
103+
return;
104+
}
105+
final PsiType type = field.getType();
106+
final boolean wrongType = !PsiType.LONG.equals(type);
107+
if (field.hasModifierProperty(PsiModifier.STATIC) &&
108+
field.hasModifierProperty(PsiModifier.PRIVATE) &&
109+
field.hasModifierProperty(PsiModifier.FINAL) &&
110+
!wrongType) {
111+
return;
112+
}
113+
if (!SerializationUtils.isSerializable(aClass)) {
114+
return;
115+
}
116+
registerFieldError(field, Boolean.valueOf(wrongType));
117+
}
120118
}
121-
}
122119
}

0 commit comments

Comments
 (0)