MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

use the proper API in rename (IDEA-113698 Getter code generation removing "is" from getter method name)

Browse Source
This commit is contained in:
peter
2013-09-28 17:31:41 +02:00
parent ae5e14584a
commit b545c62aa2
6 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java
+1 -2
View File
@@ -44,8 +44,7 @@ public class CreateGetterOrSetterFix implements IntentionAction, LowPriorityActi
myCreateGetter = createGetter;
myCreateSetter = createSetter;
myField = field;
Project project = field.getProject();
myPropertyName = PropertyUtil.suggestPropertyName(project, field);
myPropertyName = PropertyUtil.suggestPropertyName(field);
}
@Override
java/java-impl/src/com/intellij/ide/structureView/impl/java/PropertyGroup.java
+1 -1
View File
@@ -63,7 +63,7 @@ public class PropertyGroup implements Group, ColoredItemPresentation, AccessLeve
public static PropertyGroup createOn(PsiElement object, final TreeElement treeElement) {
if (object instanceof PsiField) {
PsiField field = (PsiField)object;
PropertyGroup group = new PropertyGroup(PropertyUtil.suggestPropertyName(field.getProject(), field), field.getType(),
PropertyGroup group = new PropertyGroup(PropertyUtil.suggestPropertyName(field), field.getType(),
field.hasModifierProperty(PsiModifier.STATIC), object.getProject());
group.setField(field);
group.myChildren.add(treeElement);
java/java-impl/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanProcessor.java
+1 -2
View File
@@ -49,8 +49,7 @@ public class RemoveMiddlemanProcessor extends FixableUsagesRefactoringProcessor
super(field.getProject());
this.field = field;
containingClass = field.getContainingClass();
final Project project = field.getProject();
final String propertyName = PropertyUtil.suggestPropertyName(project, field);
final String propertyName = PropertyUtil.suggestPropertyName(field);
final boolean isStatic = field.hasModifierProperty(PsiModifier.STATIC);
getter = PropertyUtil.findPropertyGetter(containingClass, propertyName, isStatic, false);
myDelegateMethodInfos = memberInfos;
java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java
+2 -2
View File
@@ -144,8 +144,8 @@ public class RenameJavaVariableProcessor extends RenameJavaMemberProcessor {
Project project = field.getProject();
final JavaCodeStyleManager manager = JavaCodeStyleManager.getInstance(project);
final String propertyName = manager.variableNameToPropertyName(field.getName(), VariableKind.FIELD);
String newPropertyName = manager.variableNameToPropertyName(newName, VariableKind.FIELD);
final String propertyName = PropertyUtil.suggestPropertyName(field, field.getName());
String newPropertyName = PropertyUtil.suggestPropertyName(field, newName);
boolean isStatic = field.hasModifierProperty(PsiModifier.STATIC);
java/java-psi-api/src/com/intellij/psi/util/PropertyUtil.java
+12 -13
View File
@@ -293,7 +293,7 @@ public class PropertyUtil {
for (PsiField field : fields) {
if (field.hasModifierProperty(PsiModifier.STATIC) != isStatic) continue;
if (propertyName.equals(suggestPropertyName(project, field))) return field;
if (propertyName.equals(suggestPropertyName(field))) return field;
}
return null;
@@ -304,7 +304,7 @@ public class PropertyUtil {
while (fields.hasNext()) {
PsiField field = fields.next();
if (field.hasModifierProperty(PsiModifier.STATIC) != isStatic) continue;
if (propertyName.equals(suggestPropertyName(project, field))) {
if (propertyName.equals(suggestPropertyName(field))) {
if (type.equals(field.getType())) return field;
}
}
@@ -527,13 +527,14 @@ public class PropertyUtil {
modifierList.addAfter(factory.createAnnotationFromText("@" + annotationQName, listOwner), null);
}
public static String suggestPropertyName(PsiField field) {
return suggestPropertyName(field.getProject(), field);
public static String suggestPropertyName(@NotNull PsiField field) {
return suggestPropertyName(field, field.getName());
}
public static String suggestPropertyName(Project project, PsiField field) {
JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(project);
public static String suggestPropertyName(@NotNull PsiField field, @NotNull String fieldName) {
JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(field.getProject());
VariableKind kind = codeStyleManager.getVariableKind(field);
String name = codeStyleManager.variableNameToPropertyName(field.getName(), kind);
String name = codeStyleManager.variableNameToPropertyName(fieldName, kind);
if (!field.hasModifierProperty(PsiModifier.STATIC) && isBoolean(field.getType())) {
if (name.startsWith(IS_PREFIX) && name.length() > IS_PREFIX.length() && Character.isUpperCase(name.charAt(IS_PREFIX.length()))) {
name = Introspector.decapitalize(name.substring(IS_PREFIX.length()));
@@ -543,12 +544,12 @@ public class PropertyUtil {
}
public static String suggestGetterName(Project project, PsiField field) {
String propertyName = suggestPropertyName(project, field);
String propertyName = suggestPropertyName(field);
return suggestGetterName(propertyName, field.getType());
}
public static String suggestSetterName(Project project, PsiField field) {
String propertyName = suggestPropertyName(project, field);
String propertyName = suggestPropertyName(field);
return suggestSetterName(propertyName);
}
@@ -656,16 +657,14 @@ public class PropertyUtil {
public static PsiMethod findSetterForField(PsiField field) {
final PsiClass containingClass = field.getContainingClass();
final Project project = field.getProject();
final String propertyName = suggestPropertyName(project, field);
final String propertyName = suggestPropertyName(field);
final boolean isStatic = field.hasModifierProperty(PsiModifier.STATIC);
return findPropertySetter(containingClass, propertyName, isStatic, true);
}
public static PsiMethod findGetterForField(PsiField field) {
final PsiClass containingClass = field.getContainingClass();
final Project project = field.getProject();
final String propertyName = suggestPropertyName(project, field);
final String propertyName = suggestPropertyName(field);
final boolean isStatic = field.hasModifierProperty(PsiModifier.STATIC);
return findPropertyGetter(containingClass, propertyName, isStatic, true);
}
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/FieldHasSetterButNoGetterInspection.java
+1 -2
View File
@@ -52,8 +52,7 @@ public class FieldHasSetterButNoGetterInspection extends BaseInspection {
@Override
public void visitField(@NotNull PsiField field) {
final Project project = field.getProject();
final String propertyName = PropertyUtil.suggestPropertyName(project, field);
final String propertyName = PropertyUtil.suggestPropertyName(field);
final boolean isStatic = field.hasModifierProperty(PsiModifier.STATIC);
final PsiClass containingClass = field.getContainingClass();
final PsiMethod setter = PropertyUtil.findPropertySetter(containingClass, propertyName, isStatic, false);