MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

revert lower accessibility for getters/setters (IDEA-108598) + consistency to getter/setter completion

Browse Source
This commit is contained in:
anna
2013-07-24 20:17:48 +02:00
parent 689f2a1686
commit 40d22fb15b
9 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java
View File

@@ -122,10 +122,6 @@ public class CreateGetterOrSetterFix implements IntentionAction, LowPriorityActi
methods.add(PropertyUtil.generateSetterPrototype(myField));
}
for (PsiMethod method : methods) {
String modifier = PsiUtil.getMaximumModifierForMember(aClass);
if (modifier != null) {
PsiUtil.setModifierProperty(method, modifier, true);
}
aClass.add(method);
}
}

4
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java
View File

@@ -242,10 +242,6 @@ public class CreatePropertyFromUsageFix extends CreateFromUsageBaseFix implement
}
accessor.setName(callText);
PsiUtil.setModifierProperty(accessor, PsiModifier.STATIC, isStatic);
final String modifier = PsiUtil.getMaximumModifierForMember(targetClass);
if (modifier != null) {
PsiUtil.setModifierProperty(accessor, modifier, true);
}
TemplateBuilderImpl builder = new TemplateBuilderImpl(accessor);
builder.replaceElement(typeReference, TYPE_VARIABLE, new TypeExpression(project, expectedTypes), true);

13
java/java-impl/src/com/intellij/codeInsight/generation/PsiFieldMember.java
View File

@@ -83,17 +83,6 @@ public class PsiFieldMember extends PsiElementClassMember<PsiField> implements P
@Nullable
private static PsiMethod createMethodIfNotExists(PsiClass aClass, final PsiMethod template) {
PsiMethod existing = aClass.findMethodBySignature(template, false);
if (existing == null) {
if (template != null) {
String modifier = aClass.isEnum() && aClass.hasModifierProperty(PsiModifier.PUBLIC) ? null : PsiUtil.getMaximumModifierForMember(aClass);
if (modifier != null) {
PsiUtil.setModifierProperty(template, modifier, true);
}
}
return template;
}
else {
return null;
}
return existing == null ? template : null;
}
}