IDEA-19519 no 'create getter and setter' and 'create setter' intention for final fields. Also no 'create getter' intention for static final (const) fields

This commit is contained in:
Danila Ponomarenko
2012-05-11 14:40:43 +04:00
parent 392839afdf
commit 46c3023f9b
13 changed files with 119 additions and 5 deletions
@@ -76,19 +76,39 @@ public class CreateGetterOrSetterFix implements IntentionAction, LowPriorityActi
@Override
public boolean isAvailable(@NotNull Project project, Editor editor, PsiFile file) {
if (!myField.isValid()) return false;
PsiClass aClass = myField.getContainingClass();
final PsiClass aClass = myField.getContainingClass();
if (aClass == null) {
return false;
}
if (myCreateGetter && PropertyUtil.findPropertyGetter(aClass, myPropertyName, myField.hasModifierProperty(PsiModifier.STATIC), false) != null) {
return false;
if (myCreateGetter){
if (isStaticFinal(myField) || PropertyUtil.findPropertyGetter(aClass, myPropertyName, isStatic(myField), false) != null){
return false;
}
}
if (myCreateSetter && PropertyUtil.findPropertySetter(aClass, myPropertyName, myField.hasModifierProperty(PsiModifier.STATIC), false) != null) {
return false;
if (myCreateSetter){
if(isFinal(myField) || PropertyUtil.findPropertySetter(aClass, myPropertyName, isStatic(myField), false) != null){
return false;
}
}
return true;
}
private static boolean isFinal(@NotNull PsiField field){
return field.hasModifierProperty(PsiModifier.FINAL);
}
private static boolean isStatic(@NotNull PsiField field){
return field.hasModifierProperty(PsiModifier.STATIC);
}
private static boolean isStaticFinal(@NotNull PsiField field){
return isStatic(field) && isFinal(field);
}
@Override
public void invoke(@NotNull Project project, Editor editor, PsiFile file) throws IncorrectOperationException {
if (!CodeInsightUtilBase.preparePsiElementForWrite(myField)) return;