diff --git a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java index 43b66f10df3a..b1f590a5cd4b 100644 --- a/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java +++ b/java/compiler/impl/src/com/intellij/compiler/chainsSearch/context/ChainCompletionContext.java @@ -26,10 +26,7 @@ import com.intellij.psi.scope.BaseScopeProcessor; import com.intellij.psi.scope.ElementClassHint; import com.intellij.psi.scope.util.PsiScopesUtil; import com.intellij.psi.search.GlobalSearchScope; -import com.intellij.psi.util.ClassUtil; -import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; +import com.intellij.psi.util.*; import com.intellij.util.SmartList; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.FactoryMap; @@ -235,7 +232,7 @@ public class ChainCompletionContext { @Override public boolean execute(@NotNull PsiElement element, @NotNull ResolveState state) { - if ((!(element instanceof PsiMethod) || PropertyUtil.isSimplePropertyAccessor((PsiMethod)element)) && + if ((!(element instanceof PsiMethod) || PropertyUtilBase.isSimplePropertyAccessor((PsiMethod)element)) && (!(element instanceof PsiVariable) || !myExcludedVariables.contains(element)) && (!(element instanceof PsiMember) || myResolveHelper.isAccessible((PsiMember)element, myPlace, null))) { PsiType type = getType(element); diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java index 376c4dd0db22..1a8b181e3cdd 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/UnusedSymbolUtil.java @@ -34,6 +34,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.PsiSearchHelper; import com.intellij.psi.search.SearchScope; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.usageView.UsageInfo; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; @@ -232,7 +233,7 @@ public class UnusedSymbolUtil { } if (member instanceof PsiMethod) { - String propertyName = PropertyUtil.getPropertyName(member); + String propertyName = PropertyUtilBase.getPropertyName(member); if (propertyName != null) { SearchScope fileScope = containingFile.getUseScope(); if (fileScope instanceof GlobalSearchScope && @@ -286,7 +287,7 @@ public class UnusedSymbolUtil { if (!(containingFile instanceof PsiJavaFile)) return true; // Groovy field can be referenced from Java by getter if (member instanceof PsiField) return false; //Java field cannot be referenced by anything but its name if (member instanceof PsiMethod) { - return PropertyUtil.isSimplePropertyAccessor((PsiMethod)member); //Java accessors can be referenced by field name from Groovy + return PropertyUtilBase.isSimplePropertyAccessor((PsiMethod)member); //Java accessors can be referenced by field name from Groovy } return false; } diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java index 7a4ead47e763..5e10a8ee9915 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java @@ -3063,7 +3063,7 @@ public class HighlightUtil extends HighlightUtilBase { final PsiClass containingClass = psiField.getContainingClass(); if (containingClass != null) { if (PsiUtil.isOnAssignmentLeftHand((PsiExpression)place)) { - final PsiMethod setterPrototype = PropertyUtil.generateSetterPrototype(psiField); + final PsiMethod setterPrototype = PropertyUtilBase.generateSetterPrototype(psiField); final PsiMethod setter = containingClass.findMethodBySignature(setterPrototype, true); if (setter != null && PsiUtil.isAccessible(setter, place, accessObjectClass)) { final PsiElement element = PsiTreeUtil.skipParentsOfType(place, PsiParenthesizedExpression.class); @@ -3073,7 +3073,7 @@ public class HighlightUtil extends HighlightUtilBase { } } else if (PsiUtil.isAccessedForReading((PsiExpression)place)) { - final PsiMethod getterPrototype = PropertyUtil.generateGetterPrototype(psiField); + final PsiMethod getterPrototype = PropertyUtilBase.generateGetterPrototype(psiField); final PsiMethod getter = containingClass.findMethodBySignature(getterPrototype, true); if (getter != null && PsiUtil.isAccessible(getter, place, accessObjectClass)) { QuickFixAction.registerQuickFixAction(error, QUICK_FIX_FACTORY.createReplaceInaccessibleFieldWithGetterSetterFix(place, getter, false)); diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PostHighlightingVisitor.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PostHighlightingVisitor.java index d9a9a2340f9b..3876037ffa46 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PostHighlightingVisitor.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/PostHighlightingVisitor.java @@ -50,10 +50,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.impl.PsiClassImplUtil; import com.intellij.psi.search.searches.OverridingMethodsSearch; import com.intellij.psi.search.searches.SuperMethodsSearch; -import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.PsiUtilCore; +import com.intellij.psi.util.*; import com.intellij.util.VisibilityUtil; import com.intellij.util.containers.ConcurrentFactoryMap; import com.intellij.codeInspection.unusedImport.UnusedImportInspection; @@ -227,7 +224,7 @@ class PostHighlightingVisitor { } } if (parent instanceof PsiMethod) { - if (myUnusedSymbolInspection.isIgnoreAccessors() && PropertyUtil.isSimplePropertyAccessor((PsiMethod)parent)) { + if (myUnusedSymbolInspection.isIgnoreAccessors() && PropertyUtilBase.isSimplePropertyAccessor((PsiMethod)parent)) { return null; } if (compareVisibilities((PsiModifierListOwner)parent, myUnusedSymbolInspection.getMethodVisibility())) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspectionBase.java index 5430b6dcc8f1..b4c1c6aad903 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspectionBase.java @@ -24,7 +24,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.*; import com.intellij.psi.*; import com.intellij.psi.javadoc.*; -import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; @@ -297,7 +297,7 @@ public class JavaDocLocalInspectionBase extends BaseJavaBatchLocalInspectionTool if (IGNORE_DEPRECATED && isDeprecated(psiMethod)) { return null; } - if (myIgnoreSimpleAccessors && PropertyUtil.isSimplePropertyAccessor(psiMethod)) { + if (myIgnoreSimpleAccessors && PropertyUtilBase.isSimplePropertyAccessor(psiMethod)) { return null; } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java index 7a1daea8dd16..b05cbaa64ce7 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java @@ -384,7 +384,7 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo NullableNotNullManager manager, final String anno, final List annoToRemove, @NotNull ProblemsHolder holder) { String propName = JavaCodeStyleManager.getInstance(project).variableNameToPropertyName(field.getName(), VariableKind.FIELD); final boolean isStatic = field.hasModifierProperty(PsiModifier.STATIC); - final PsiMethod getter = PropertyUtil.findPropertyGetter(field.getContainingClass(), propName, isStatic, false); + final PsiMethod getter = PropertyUtilBase.findPropertyGetter(field.getContainingClass(), propName, isStatic, false); final PsiIdentifier nameIdentifier = getter == null ? null : getter.getNameIdentifier(); if (nameIdentifier != null && nameIdentifier.isPhysical()) { if (PropertyUtil.isSimpleGetter(getter)) { @@ -406,7 +406,7 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo } final PsiClass containingClass = field.getContainingClass(); - final PsiMethod setter = PropertyUtil.findPropertySetter(containingClass, propName, isStatic, false); + final PsiMethod setter = PropertyUtilBase.findPropertySetter(containingClass, propName, isStatic, false); if (setter != null && setter.isPhysical() && PropertyUtil.isSimpleSetter(setter)) { final PsiParameter[] parameters = setter.getParameterList().getParameters(); assert parameters.length == 1 : setter.getText(); diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java index 7ad9b1e7f3cb..9117705794f9 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/FieldNotUsedInToStringInspection.java @@ -19,6 +19,7 @@ import com.intellij.codeInspection.ProblemHighlightType; import com.intellij.codeInspection.ProblemsHolder; import com.intellij.psi.*; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import gnu.trove.THashSet; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -145,7 +146,7 @@ public class FieldNotUsedInToStringInspection extends AbstractToStringInspection } else { myUnusedMethods.remove(method); - final PsiField field = PropertyUtil.findPropertyFieldByMember(method); + final PsiField field = PropertyUtilBase.findPropertyFieldByMember(method); myUnusedFields.remove(field); } } diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/psi/PsiAdapter.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/psi/PsiAdapter.java index 3c923deb54f5..6069c93e4458 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/psi/PsiAdapter.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/psi/PsiAdapter.java @@ -25,7 +25,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.javadoc.PsiDocComment; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.InheritanceUtil; -import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; @@ -492,7 +492,7 @@ public class PsiAdapter { if (!isGetterMethod(method)) { return null; } - return PropertyUtil.getPropertyNameByGetter(method); + return PropertyUtilBase.getPropertyNameByGetter(method); } /** diff --git a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java index 366c2d997c17..dd5c8322cb1e 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExpectedTypesProvider.java @@ -410,8 +410,8 @@ public class ExpectedTypesProvider { private void visitMethodReturnType(final PsiMethod scopeMethod, PsiType type, boolean tailTypeSemicolon) { if (type != null) { NullableComputable expectedName; - if (PropertyUtil.isSimplePropertyAccessor(scopeMethod)) { - expectedName = () -> PropertyUtil.getPropertyName(scopeMethod); + if (PropertyUtilBase.isSimplePropertyAccessor(scopeMethod)) { + expectedName = () -> PropertyUtilBase.getPropertyName(scopeMethod); } else { expectedName = ExpectedTypeInfoImpl.NULL; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java index 2819dddfb0a8..f79f0770b2f3 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMemberNameCompletionContributor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,10 +30,7 @@ import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.SuggestedNameInfo; import com.intellij.psi.codeStyle.VariableKind; -import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.PsiUtilCore; +import com.intellij.psi.util.*; import com.intellij.refactoring.introduceField.InplaceIntroduceFieldPopup; import com.intellij.refactoring.introduceVariable.IntroduceVariableBase; import com.intellij.util.ArrayUtil; @@ -112,7 +109,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor { if (variableKind == VariableKind.PARAMETER) { final PsiMethod method = PsiTreeUtil.getParentOfType(var, PsiMethod.class); if (method != null) { - propertyName = PropertyUtil.getPropertyName(method); + propertyName = PropertyUtilBase.getPropertyName(method); } if (method != null && method.getName().startsWith("with")) { propertyName = StringUtil.decapitalize(method.getName().substring(4)); @@ -393,7 +390,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor { if (staticContext && (modifierList != null && !modifierList.hasModifierProperty(PsiModifier.STATIC))) continue; if (fieldType.equals(varType)) { - final String getterName = PropertyUtil.suggestGetterName(field); + final String getterName = PropertyUtilBase.suggestGetterName(field); if ((psiClass.findMethodsByName(getterName, true).length == 0 || psiClass.findMethodBySignature(GenerateMembersUtil.generateGetterPrototype(field), true) == null)) { propertyHandlers.add(getterName); @@ -401,7 +398,7 @@ public class JavaMemberNameCompletionContributor extends CompletionContributor { } if (PsiType.VOID.equals(varType)) { - final String setterName = PropertyUtil.suggestSetterName(field); + final String setterName = PropertyUtilBase.suggestSetterName(field); if ((psiClass.findMethodsByName(setterName, true).length == 0 || psiClass.findMethodBySignature(GenerateMembersUtil.generateSetterPrototype(field), true) == null)) { propertyHandlers.add(setterName); diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java index c15e9f651099..7b6dbda1d7f9 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/PreferByKindWeigher.java @@ -29,10 +29,7 @@ import com.intellij.patterns.ElementPattern; import com.intellij.psi.*; import com.intellij.psi.filters.getters.MembersGetter; import com.intellij.psi.impl.source.tree.JavaElementType; -import com.intellij.psi.util.InheritanceUtil; -import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; +import com.intellij.psi.util.*; import com.intellij.psi.util.proximity.KnownElementWeigher; import com.intellij.util.ThreeState; import com.intellij.util.containers.ContainerUtil; @@ -328,7 +325,7 @@ public class PreferByKindWeigher extends LookupElementWeigher { if (!(object instanceof PsiMethod)) return false; PsiMethod method = (PsiMethod)object; - if (!PropertyUtil.hasGetterName(method)) return false; + if (!PropertyUtilBase.hasGetterName(method)) return false; return !KnownElementWeigher.isGetClass(method); } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/RecursionWeigher.java b/java/java-impl/src/com/intellij/codeInsight/completion/RecursionWeigher.java index 0409c50d7233..2835852739e4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/RecursionWeigher.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/RecursionWeigher.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ import com.intellij.psi.filters.element.ExcludeSillyAssignment; import com.intellij.psi.impl.search.MethodDeepestSuperSearcher; import com.intellij.psi.scope.ElementClassFilter; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.CommonProcessors; import org.jetbrains.annotations.NotNull; @@ -170,15 +171,15 @@ class RecursionWeigher extends LookupElementWeigher { @Nullable private String getSetterPropertyName(@Nullable PsiMethod calledMethod) { - if (PropertyUtil.isSimplePropertySetter(calledMethod)) { + if (PropertyUtilBase.isSimplePropertySetter(calledMethod)) { assert calledMethod != null; - return PropertyUtil.getPropertyName(calledMethod); + return PropertyUtilBase.getPropertyName(calledMethod); } PsiReferenceExpression reference = ExcludeSillyAssignment.getAssignedReference(myPosition); if (reference != null) { PsiElement target = reference.resolve(); if (target instanceof PsiField) { - return PropertyUtil.suggestPropertyName((PsiField)target); + return PropertyUtilBase.suggestPropertyName((PsiField)target); } } return null; @@ -189,12 +190,12 @@ class RecursionWeigher extends LookupElementWeigher { if (prop == null) return false; if (lookupObject instanceof PsiField && - prop.equals(PropertyUtil.suggestPropertyName((PsiField)lookupObject))) { + prop.equals(PropertyUtilBase.suggestPropertyName((PsiField)lookupObject))) { return true; } if (lookupObject instanceof PsiMethod && - PropertyUtil.isSimplePropertyGetter((PsiMethod)lookupObject) && - prop.equals(PropertyUtil.getPropertyName((PsiMethod)lookupObject))) { + PropertyUtilBase.isSimplePropertyGetter((PsiMethod)lookupObject) && + prop.equals(PropertyUtilBase.getPropertyName((PsiMethod)lookupObject))) { return true; } return false; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java index 88f8a1724d4d..73194b1ad888 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterOrSetterFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -47,7 +48,7 @@ public class CreateGetterOrSetterFix implements IntentionAction, LowPriorityActi myCreateGetter = createGetter; myCreateSetter = createSetter; myField = field; - myPropertyName = PropertyUtil.suggestPropertyName(field); + myPropertyName = PropertyUtilBase.suggestPropertyName(field); } @Override @@ -86,13 +87,13 @@ public class CreateGetterOrSetterFix implements IntentionAction, LowPriorityActi } if (myCreateGetter){ - if (isStaticFinal(myField) || PropertyUtil.findPropertyGetter(aClass, myPropertyName, isStatic(myField), false) != null){ + if (isStaticFinal(myField) || PropertyUtilBase.findPropertyGetter(aClass, myPropertyName, isStatic(myField), false) != null){ return false; } } if (myCreateSetter){ - if(isFinal(myField) || PropertyUtil.findPropertySetter(aClass, myPropertyName, isStatic(myField), false) != null){ + if(isFinal(myField) || PropertyUtilBase.findPropertySetter(aClass, myPropertyName, isStatic(myField), false) != null){ return false; } } diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterSetterPropertyFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterSetterPropertyFromUsageFix.java index dea4567383b6..6825a380770a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterSetterPropertyFromUsageFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateGetterSetterPropertyFromUsageFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2012 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ import com.intellij.psi.PsiField; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiMethodCallExpression; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import org.jetbrains.annotations.NotNull; import java.util.List; @@ -41,10 +42,10 @@ public class CreateGetterSetterPropertyFromUsageFix extends CreatePropertyFromUs @Override protected boolean checkTargetClasses(List classes, String methodName) { - String propertyName = PropertyUtil.getPropertyName(methodName); + String propertyName = PropertyUtilBase.getPropertyName(methodName); if (propertyName == null) return false; - String getterName = PropertyUtil.suggestGetterName(propertyName, null); - String setterName = PropertyUtil.suggestSetterName(propertyName); + String getterName = PropertyUtilBase.suggestGetterName(propertyName, null); + String setterName = PropertyUtilBase.suggestSetterName(propertyName); for (PsiClass aClass : classes) { if (aClass.findMethodsByName(getterName, false).length > 0 || aClass.findMethodsByName(setterName, false).length > 0) return false; } diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java index 35afe19cde74..69f51adac58e 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreatePropertyFromUsageFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -35,6 +35,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.refactoring.util.RefactoringUtil; @@ -84,7 +85,7 @@ public class CreatePropertyFromUsageFix extends CreateFromUsageBaseFix implement PsiReferenceExpression ref = myMethodCall.getMethodExpression(); String methodName = myMethodCall.getMethodExpression().getReferenceName(); LOG.assertTrue(methodName != null); - String propertyName = PropertyUtil.getPropertyName(methodName); + String propertyName = PropertyUtilBase.getPropertyName(methodName); if (propertyName == null || propertyName.isEmpty()) return false; String getterOrSetter = null; @@ -321,7 +322,7 @@ public class CreatePropertyFromUsageFix extends CreateFromUsageBaseFix implement private static String getVariableName(PsiMethodCallExpression methodCall, boolean isStatic) { JavaCodeStyleManager codeStyleManager = JavaCodeStyleManager.getInstance(methodCall.getProject()); String methodName = methodCall.getMethodExpression().getReferenceName(); - String propertyName = PropertyUtil.getPropertyName(methodName); + String propertyName = PropertyUtilBase.getPropertyName(methodName); if (propertyName != null && !propertyName.isEmpty()) { VariableKind kind = isStatic ? VariableKind.STATIC_FIELD : VariableKind.FIELD; return codeStyleManager.propertyNameToVariableName(propertyName, kind); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java index 58c451778094..0aa00b8975bb 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/quickFix/CreateFieldOrPropertyFix.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,6 +34,7 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PropertyMemberType; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -126,7 +127,7 @@ public class CreateFieldOrPropertyFix implements IntentionAction, LocalQuickFix boolean first = true; @NonNls final String TYPE_NAME_VAR = "TYPE_NAME_VAR"; for (GenerationInfo prototype : prototypes) { - final PsiTypeElement typeElement = PropertyUtil.getPropertyTypeElement(prototype.getPsiMember()); + final PsiTypeElement typeElement = PropertyUtilBase.getPropertyTypeElement(prototype.getPsiMember()); if (first) { first = false; builder.replaceElement(typeElement, TYPE_NAME_VAR, expression, true); diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java index 32d6808d30b0..10ea5acc23d8 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -378,7 +378,7 @@ public class GenerateDelegateHandler implements LanguageCodeInsightActionHandler final PsiClass containingClass = method.getContainingClass(); if (containingClass == null || CommonClassNames.JAVA_LANG_OBJECT.equals(containingClass.getQualifiedName())) continue; final PsiType returnType = method.getReturnType(); - if (returnType != null && PropertyUtil.isSimplePropertyGetter(method) && helper.isAccessible(method, aClass, aClass) && + if (returnType != null && PropertyUtilBase.isSimplePropertyGetter(method) && helper.isAccessible(method, aClass, aClass) && returnType instanceof PsiClassType && !(PsiTreeUtil.isAncestor(method, element, false) && targetClass != aClass)) { result.add(new PsiMethodMember(method, TypeConversionUtil.getSuperClassSubstitutor( containingClass, aClass,PsiSubstitutor.EMPTY))); } diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateFieldOrPropertyHandler.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateFieldOrPropertyHandler.java index 79a39f38408e..d957084080e4 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateFieldOrPropertyHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateFieldOrPropertyHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.util.PropertyMemberType; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; @@ -71,8 +72,8 @@ public class GenerateFieldOrPropertyHandler extends GenerateMembersHandlerBase { for (GenerationInfo info : infos) { PsiMember member = info.getPsiMember(); if (!(member instanceof PsiMethod)) continue; - if (myMemberType == PropertyMemberType.GETTER && PropertyUtil.isSimplePropertyGetter((PsiMethod)member) || - myMemberType == PropertyMemberType.SETTER && PropertyUtil.isSimplePropertySetter((PsiMethod)member)) { + if (myMemberType == PropertyMemberType.GETTER && PropertyUtilBase.isSimplePropertyGetter((PsiMethod)member) || + myMemberType == PropertyMemberType.SETTER && PropertyUtilBase.isSimplePropertySetter((PsiMethod)member)) { targetMember = member; break; } diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java index 538d28a62bab..e4d227e3c07d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersUtil.java @@ -609,15 +609,15 @@ public class GenerateMembersUtil { //java bean getters/setters public static PsiMethod generateSimpleGetterPrototype(@NotNull PsiField field) { - return generatePrototype(field, PropertyUtil.generateGetterPrototype(field)); + return generatePrototype(field, PropertyUtilBase.generateGetterPrototype(field)); } public static PsiMethod generateSimpleSetterPrototype(@NotNull PsiField field) { - return generatePrototype(field, PropertyUtil.generateSetterPrototype(field)); + return generatePrototype(field, PropertyUtilBase.generateSetterPrototype(field)); } public static PsiMethod generateSimpleSetterPrototype(PsiField field, PsiClass targetClass) { - return generatePrototype(field, PropertyUtil.generateSetterPrototype(field, targetClass)); + return generatePrototype(field, PropertyUtilBase.generateSetterPrototype(field, targetClass)); } //custom getters/setters @@ -680,7 +680,7 @@ public class GenerateMembersUtil { catch (IncorrectOperationException e) { if (ignoreInvalidTemplate) { LOG.info(e); - result = isGetter ? PropertyUtil.generateGetterPrototype(field) : PropertyUtil.generateSetterPrototype(field); + result = isGetter ? PropertyUtilBase.generateGetterPrototype(field) : PropertyUtilBase.generateSetterPrototype(field); assert result != null : field.getText(); } else { diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/GetterSetterPrototypeProvider.java b/java/java-impl/src/com/intellij/codeInsight/generation/GetterSetterPrototypeProvider.java index 12a7e7cf9cef..af315591b188 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/GetterSetterPrototypeProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/GetterSetterPrototypeProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import com.intellij.psi.PsiField; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiModifier; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; public abstract class GetterSetterPrototypeProvider { public static final ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.getterSetterProvider"); @@ -74,7 +75,7 @@ public abstract class GetterSetterPrototypeProvider { if (getterSetter != null) return getterSetter; } } - final PsiMethod propertyGetterSetter = PropertyUtil.findPropertyGetter(aClass, propertyName, isStatic, false); + final PsiMethod propertyGetterSetter = PropertyUtilBase.findPropertyGetter(aClass, propertyName, isStatic, false); if (propertyGetterSetter != null) { return new PsiMethod[] {propertyGetterSetter}; } diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java index 3707f5b5fa82..dd8500f95c7c 100644 --- a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java +++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java @@ -42,6 +42,7 @@ import com.intellij.openapi.vfs.VirtualFileManager; import com.intellij.profile.codeInspection.ui.SingleInspectionProfilePanel; import com.intellij.psi.*; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.safeDelete.SafeDeleteHandler; import com.intellij.ui.HyperlinkAdapter; @@ -520,7 +521,7 @@ public class UnusedDeclarationPresentation extends DefaultInspectionToolPresenta //todo store in the graph tool.isIgnoreAccessors()) { final PsiModifierListOwner listOwner = ((RefMethod)element).getElement(); - if (listOwner instanceof PsiMethod && PropertyUtil.isSimplePropertyAccessor((PsiMethod)listOwner)) { + if (listOwner instanceof PsiMethod && PropertyUtilBase.isSimplePropertyAccessor((PsiMethod)listOwner)) { return null; } } diff --git a/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java b/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java index 0a666ff45051..26d4bffd9a0e 100644 --- a/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -465,7 +465,7 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool { if (!(initializer instanceof PsiLiteralExpression)) return null; Object val = ((PsiLiteralExpression)initializer).getValue(); if (!(val instanceof String)) return null; - PsiMethod setter = PropertyUtil.findPropertySetter(method.getContainingClass(), (String)val, false, false); + PsiMethod setter = PropertyUtilBase.findPropertySetter(method.getContainingClass(), (String)val, false, false); if (setter == null) return null; // try the @beaninfo of the corresponding setter PsiElement navigationElement = setter.getNavigationElement(); @@ -482,12 +482,12 @@ public class MagicConstantInspection extends BaseJavaLocalInspectionTool { PsiClass aClass = method.getContainingClass(); if (aClass == null) return null; - if (PropertyUtil.isSimplePropertyGetter(method)) { - List setters = PropertyUtil.getSetters(aClass, PropertyUtil.getPropertyNameByGetter(method)); + if (PropertyUtilBase.isSimplePropertyGetter(method)) { + List setters = PropertyUtilBase.getSetters(aClass, PropertyUtilBase.getPropertyNameByGetter(method)); if (setters.size() != 1) return null; method = setters.get(0); } - if (!PropertyUtil.isSimplePropertySetter(method)) return null; + if (!PropertyUtilBase.isSimplePropertySetter(method)) return null; PsiDocComment doc = method.getDocComment(); if (doc == null) return null; PsiDocTag beaninfo = doc.findTagByName("beaninfo"); diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java index 0cdfd0ac57e3..fe32c0f5f132 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java +++ b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java @@ -25,6 +25,7 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiModifier; import com.intellij.psi.PsiReference; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -54,7 +55,7 @@ public class UnusedReturnValue extends GlobalJavaBatchInspectionTool{ if (!refMethod.isReturnValueUsed()) { final PsiMethod psiMethod = (PsiMethod)refMethod.getElement(); if (psiMethod == null) return null; - if (IGNORE_BUILDER_PATTERN && PropertyUtil.isSimplePropertySetter(psiMethod)) return null; + if (IGNORE_BUILDER_PATTERN && PropertyUtilBase.isSimplePropertySetter(psiMethod)) return null; final boolean isNative = psiMethod.hasModifierProperty(PsiModifier.NATIVE); if (refMethod.isExternalOverride() && !isNative) return null; diff --git a/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValueLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValueLocalInspection.java index 0191c56131d0..7ec7cffee589 100644 --- a/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValueLocalInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValueLocalInspection.java @@ -24,6 +24,7 @@ import com.intellij.openapi.progress.EmptyProgressIndicator; import com.intellij.patterns.PsiJavaPatterns; import com.intellij.psi.*; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.siyeh.ig.psiutils.MethodUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -61,7 +62,7 @@ public class UnusedReturnValueLocalInspection extends BaseJavaLocalInspectionToo public ProblemDescriptor[] checkMethod(@NotNull PsiMethod method, @NotNull InspectionManager manager, boolean isOnTheFly) { if (method.isConstructor() || PsiType.VOID.equals(method.getReturnType()) || - myGlobal.IGNORE_BUILDER_PATTERN && PropertyUtil.isSimplePropertySetter(method) || + myGlobal.IGNORE_BUILDER_PATTERN && PropertyUtilBase.isSimplePropertySetter(method) || method.hasModifierProperty(PsiModifier.NATIVE) || MethodUtils.hasSuper(method) || RefUtil.isImplicitRead(method)) return null; diff --git a/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java index 8b56b0a431c6..cf8bf3f4ee5a 100644 --- a/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java +++ b/java/java-impl/src/com/intellij/find/findUsages/JavaFindUsagesHandler.java @@ -34,10 +34,7 @@ import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.searches.FunctionalExpressionSearch; import com.intellij.psi.search.searches.MethodReferencesSearch; import com.intellij.psi.search.searches.OverridingMethodsSearch; -import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiSuperMethodUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.PsiUtilCore; +import com.intellij.psi.util.*; import com.intellij.refactoring.util.JavaNonCodeSearchElementDescriptionProvider; import com.intellij.refactoring.util.NonCodeSearchDescriptionLocation; import com.intellij.usageView.UsageInfo; @@ -177,13 +174,13 @@ public class JavaFindUsagesHandler extends FindUsagesHandler{ final String propertyName = JavaCodeStyleManager.getInstance(getProject()).variableNameToPropertyName(fieldName, VariableKind.FIELD); Set accessors = new THashSet<>(); boolean isStatic = field.hasModifierProperty(PsiModifier.STATIC); - PsiMethod getter = PropertyUtil.findPropertyGetterWithType(propertyName, isStatic, field.getType(), - ContainerUtil.iterate(containingClass.getMethods())); + PsiMethod getter = PropertyUtilBase.findPropertyGetterWithType(propertyName, isStatic, field.getType(), + ContainerUtil.iterate(containingClass.getMethods())); if (getter != null) accessors.add(getter); - PsiMethod setter = PropertyUtil.findPropertySetterWithType(propertyName, isStatic, field.getType(), - ContainerUtil.iterate(containingClass.getMethods())); + PsiMethod setter = PropertyUtilBase.findPropertySetterWithType(propertyName, isStatic, field.getType(), + ContainerUtil.iterate(containingClass.getMethods())); if (setter != null) accessors.add(setter); - accessors.addAll(PropertyUtil.getAccessors(containingClass, fieldName)); + accessors.addAll(PropertyUtilBase.getAccessors(containingClass, fieldName)); if (!accessors.isEmpty()) { boolean containsPhysical = ContainerUtil.find(accessors, psiMethod -> psiMethod.isPhysical()) != null; final boolean doSearch = !containsPhysical || askShouldSearchAccessors(fieldName); diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java index 83b9b749a4fb..8df4fa8be2ec 100644 --- a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java +++ b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java @@ -24,6 +24,7 @@ import com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens; import com.intellij.psi.search.searches.SuperMethodsSearch; import com.intellij.psi.util.MethodSignatureBackedByPsiMethod; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiUtil; import com.intellij.util.Functions; import com.intellij.util.containers.ContainerUtil; @@ -427,13 +428,13 @@ public class JavaArrangementVisitor extends JavaRecursiveElementVisitor { private void parseProperties(PsiMethod method, JavaElementArrangementEntry entry) { String propertyName = null; boolean getter = true; - if (PropertyUtil.isSimplePropertyGetter(method)) { + if (PropertyUtilBase.isSimplePropertyGetter(method)) { entry.addModifier(GETTER); - propertyName = PropertyUtil.getPropertyNameByGetter(method); + propertyName = PropertyUtilBase.getPropertyNameByGetter(method); } - else if (PropertyUtil.isSimplePropertySetter(method)) { + else if (PropertyUtilBase.isSimplePropertySetter(method)) { entry.addModifier(SETTER); - propertyName = PropertyUtil.getPropertyNameBySetter(method); + propertyName = PropertyUtilBase.getPropertyNameBySetter(method); getter = false; } diff --git a/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanProperty.java b/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanProperty.java index a21a9abae12f..b362aabca520 100644 --- a/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanProperty.java +++ b/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanProperty.java @@ -22,6 +22,7 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiNamedElement; import com.intellij.psi.PsiType; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -51,13 +52,13 @@ public class BeanProperty { @NotNull public String getName() { - final String name = PropertyUtil.getPropertyName(myMethod); + final String name = PropertyUtilBase.getPropertyName(myMethod); return name == null ? "" : name; } @NotNull public PsiType getPropertyType() { - PsiType type = PropertyUtil.getPropertyType(myMethod); + PsiType type = PropertyUtilBase.getPropertyType(myMethod); assert type != null; return type; } @@ -69,29 +70,29 @@ public class BeanProperty { @Nullable public PsiMethod getGetter() { - if (PropertyUtil.isSimplePropertyGetter(myMethod)) { + if (PropertyUtilBase.isSimplePropertyGetter(myMethod)) { return myMethod; } - return PropertyUtil.findPropertyGetter(myMethod.getContainingClass(), getName(), false, true); + return PropertyUtilBase.findPropertyGetter(myMethod.getContainingClass(), getName(), false, true); } @Nullable public PsiMethod getSetter() { - if (PropertyUtil.isSimplePropertySetter(myMethod)) { + if (PropertyUtilBase.isSimplePropertySetter(myMethod)) { return myMethod; } - return PropertyUtil.findPropertySetter(myMethod.getContainingClass(), getName(), false, true); + return PropertyUtilBase.findPropertySetter(myMethod.getContainingClass(), getName(), false, true); } public void setName(String newName) throws IncorrectOperationException { final PsiMethod setter = getSetter(); final PsiMethod getter = getGetter(); if (getter != null) { - final String getterName = PropertyUtil.suggestGetterName(newName, getter.getReturnType()); + final String getterName = PropertyUtilBase.suggestGetterName(newName, getter.getReturnType()); getter.setName(getterName); } if (setter != null) { - final String setterName = PropertyUtil.suggestSetterName(newName); + final String setterName = PropertyUtilBase.suggestSetterName(newName); setter.setName(setterName); } } @@ -103,6 +104,6 @@ public class BeanProperty { @Nullable public static BeanProperty createBeanProperty(@NotNull PsiMethod method) { - return PropertyUtil.isSimplePropertyAccessor(method) ? new BeanProperty(method) : null; + return PropertyUtilBase.isSimplePropertyAccessor(method) ? new BeanProperty(method) : null; } } diff --git a/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java b/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java index 602db4863edd..8842925bfd3e 100644 --- a/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java +++ b/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2013 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ import com.intellij.psi.meta.PsiMetaData; import com.intellij.psi.meta.PsiMetaOwner; import com.intellij.psi.meta.PsiPresentableMetaData; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -48,7 +49,7 @@ public class BeanPropertyElement extends FakePsiElement implements PsiMetaOwner, @Nullable public PsiType getPropertyType() { - return PropertyUtil.getPropertyType(myMethod); + return PropertyUtilBase.getPropertyType(myMethod); } @NotNull diff --git a/java/java-impl/src/com/intellij/psi/impl/beanProperties/CreateJavaBeanPropertyFix.java b/java/java-impl/src/com/intellij/psi/impl/beanProperties/CreateJavaBeanPropertyFix.java index e435264e8b76..176377c32915 100644 --- a/java/java-impl/src/com/intellij/psi/impl/beanProperties/CreateJavaBeanPropertyFix.java +++ b/java/java-impl/src/com/intellij/psi/impl/beanProperties/CreateJavaBeanPropertyFix.java @@ -28,6 +28,7 @@ import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -125,7 +126,7 @@ public class CreateJavaBeanPropertyFix implements LocalQuickFix, IntentionAction private void createSetter(final boolean createField) throws IncorrectOperationException { final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myPsiClass.getProject()).getElementFactory(); - final String methodName = PropertyUtil.suggestSetterName(myPropertyName); + final String methodName = PropertyUtilBase.suggestSetterName(myPropertyName); final String typeName = myType.getCanonicalText(); @NonNls final String text; @@ -154,7 +155,7 @@ public class CreateJavaBeanPropertyFix implements LocalQuickFix, IntentionAction private void createGetter(final boolean createField) throws IncorrectOperationException { final PsiElementFactory elementFactory = JavaPsiFacade.getInstance(myPsiClass.getProject()).getElementFactory(); - final String methodName = PropertyUtil.suggestGetterName(myPropertyName, myType); + final String methodName = PropertyUtilBase.suggestGetterName(myPropertyName, myType); final String typeName = myType.getCanonicalText(); @NonNls final String text; PsiClass psiClass = myPsiClass.getElement(); diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/MethodPropertyReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/MethodPropertyReference.java index 307d608ddbd8..96a513343cbb 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/MethodPropertyReference.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/MethodPropertyReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -18,6 +18,7 @@ package com.intellij.psi.impl.source.resolve.reference.impl.providers; import com.intellij.psi.*; import com.intellij.psi.jsp.JspSpiUtil; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlAttributeValue; import com.intellij.psi.xml.XmlTag; @@ -89,7 +90,7 @@ public class MethodPropertyReference extends BasicAttributeValueReference { @Override public PsiElement handleElementRename(String _newElementName) throws IncorrectOperationException { - String newElementName = PropertyUtil.getPropertyName(_newElementName); + String newElementName = PropertyUtilBase.getPropertyName(_newElementName); if (newElementName == null) newElementName = _newElementName; return super.handleElementRename(newElementName); diff --git a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java index 8860f67e1808..68e0f059fdcb 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java @@ -35,10 +35,7 @@ import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.PsiUtilCore; +import com.intellij.psi.util.*; import com.intellij.refactoring.BaseRefactoringProcessor; import com.intellij.refactoring.HelpID; import com.intellij.refactoring.classMembers.MemberInfoBase; @@ -257,7 +254,7 @@ public class ExtractMethodObjectProcessor extends BaseRefactoringProcessor { myInnerClass.add(outputField); field = outputField; } else { - field = PropertyUtil.findPropertyField(myInnerClass, name, false); + field = PropertyUtilBase.findPropertyField(myInnerClass, name, false); } LOG.assertTrue(field != null, "i:" + i + "; output variables: " + Arrays.toString(outputVariables) + "; parameters: " + Arrays.toString(getMethod().getParameterList().getParameters()) + "; output field: " + outputField ); myInnerClass.add(GenerateMembersUtil.generateGetterPrototype(field)); diff --git a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java index a100a5dafd31..90f8e168c163 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,6 +24,7 @@ import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtil; +import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.text.StringUtil; @@ -33,10 +34,7 @@ import com.intellij.psi.javadoc.PsiDocTagValue; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.InheritanceUtil; -import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; +import com.intellij.psi.util.*; import com.intellij.refactoring.MoveDestination; import com.intellij.refactoring.RefactorJBundle; import com.intellij.refactoring.extractclass.usageInfo.*; @@ -602,7 +600,7 @@ public class ExtractClassProcessor extends FixableUsagesRefactoringProcessor { if (myGenerateAccessors) { getter = GenerateMembersUtil.suggestGetterName(field); } else { - final PsiMethod fieldGetter = PropertyUtil.findPropertyGetter(sourceClass, field.getName(), false, false); + final PsiMethod fieldGetter = PropertyUtilBase.findPropertyGetter(sourceClass, field.getName(), false, false); if (fieldGetter != null && isInMovedElement(fieldGetter)) { getter = fieldGetter.getName(); } @@ -612,7 +610,7 @@ public class ExtractClassProcessor extends FixableUsagesRefactoringProcessor { if (myGenerateAccessors) { setter = GenerateMembersUtil.suggestSetterName(field); } else { - final PsiMethod fieldSetter = PropertyUtil.findPropertySetter(sourceClass, field.getName(), false, false); + final PsiMethod fieldSetter = PropertyUtilBase.findPropertySetter(sourceClass, field.getName(), false, false); if (fieldSetter != null && isInMovedElement(fieldSetter)) { setter = fieldSetter.getName(); } @@ -707,7 +705,7 @@ public class ExtractClassProcessor extends FixableUsagesRefactoringProcessor { if (myMoveDestination != null) { directory = myMoveDestination.getTargetDirectory(containingDirectory); } else { - final Module module = ModuleUtil.findModuleForPsiElement(containingFile); + final Module module = ModuleUtilCore.findModuleForPsiElement(containingFile); assert module != null; directory = PackageUtil.findOrCreateDirectoryForPackage(module, newPackageName, containingDirectory, false, true); } diff --git a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectClassDescriptor.java b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectClassDescriptor.java index 27d2b503261c..85a82a7ce492 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectClassDescriptor.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectClassDescriptor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,10 +26,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.JavaCodeStyleManager; -import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiTypesUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.TypeConversionUtil; +import com.intellij.psi.util.*; import com.intellij.refactoring.MoveDestination; import com.intellij.refactoring.changeSignature.ParameterInfoImpl; import com.intellij.refactoring.introduceParameterObject.IntroduceParameterObjectClassDescriptor; @@ -207,12 +204,12 @@ public class JavaIntroduceParameterObjectClassDescriptor extends IntroduceParame bean.setField(field); - final PsiMethod getterForField = PropertyUtil.findGetterForField(field); + final PsiMethod getterForField = PropertyUtilBase.findGetterForField(field); if (getterForField != null) { bean.setGetter(getterForField.getName()); } - final PsiMethod setterForField = PropertyUtil.findSetterForField(field); + final PsiMethod setterForField = PropertyUtilBase.findSetterForField(field); if (setterForField != null) { bean.setSetter(setterForField.getName()); } diff --git a/java/java-impl/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanProcessor.java b/java/java-impl/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanProcessor.java index 0695ad6d34f1..aae5bd5cdcb8 100644 --- a/java/java-impl/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/removemiddleman/RemoveMiddlemanProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import com.intellij.psi.*; import com.intellij.psi.presentation.java.SymbolPresentationUtil; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.refactoring.RefactorJBundle; import com.intellij.refactoring.removemiddleman.usageInfo.DeleteMethod; import com.intellij.refactoring.removemiddleman.usageInfo.InlineDelegatingCall; @@ -48,9 +49,9 @@ public class RemoveMiddlemanProcessor extends FixableUsagesRefactoringProcessor super(field.getProject()); this.field = field; containingClass = field.getContainingClass(); - final String propertyName = PropertyUtil.suggestPropertyName(field); + final String propertyName = PropertyUtilBase.suggestPropertyName(field); final boolean isStatic = field.hasModifierProperty(PsiModifier.STATIC); - getter = PropertyUtil.findPropertyGetter(containingClass, propertyName, isStatic, false); + getter = PropertyUtilBase.findPropertyGetter(containingClass, propertyName, isStatic, false); myDelegateMethodInfos = memberInfos; } diff --git a/java/java-impl/src/com/intellij/refactoring/rename/BeanPropertyRenameHandler.java b/java/java-impl/src/com/intellij/refactoring/rename/BeanPropertyRenameHandler.java index 368309f84005..577b9392a0bc 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/BeanPropertyRenameHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/BeanPropertyRenameHandler.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.impl.beanProperties.BeanProperty; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.refactoring.RenameRefactoring; import com.intellij.refactoring.openapi.impl.JavaRenameRefactoringImpl; import org.jetbrains.annotations.Contract; @@ -91,7 +92,7 @@ public abstract class BeanPropertyRenameHandler implements RenameHandler { final PsiElement setterSubstitutor = substituteElementToRename(setter, editor); if (setterSubstitutor != null) { if (setterSubstitutor == setter) { - rename.addElement(setterSubstitutor, PropertyUtil.suggestSetterName(newName)); + rename.addElement(setterSubstitutor, PropertyUtilBase.suggestSetterName(newName)); } else { rename.addElement(setterSubstitutor, newName); @@ -110,7 +111,7 @@ public abstract class BeanPropertyRenameHandler implements RenameHandler { final PsiElement getterSubstitutor = substituteElementToRename(getter, editor); if (getterSubstitutor != null) { if (getterSubstitutor == getter) { - rename.addElement(getterSubstitutor, PropertyUtil.suggestGetterName(newName, getter.getReturnType())); + rename.addElement(getterSubstitutor, PropertyUtilBase.suggestGetterName(newName, getter.getReturnType())); } else { rename.addElement(getterSubstitutor, newName); diff --git a/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java b/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java index fb4eedd640b5..87fdf3a194b4 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/JavaNameSuggestionProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ import com.intellij.psi.codeStyle.NameUtil; import com.intellij.psi.codeStyle.SuggestedNameInfo; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.usageView.UsageViewUtil; import com.intellij.util.ArrayUtil; @@ -48,7 +49,7 @@ public class JavaNameSuggestionProvider implements NameSuggestionProvider { if (nameSuggestionContextParent instanceof PsiParameterList) { final PsiElement parentOfParent = nameSuggestionContextParent.getParent(); if (parentOfParent instanceof PsiMethod) { - final String propName = PropertyUtil.getPropertyName((PsiMethod)parentOfParent); + final String propName = PropertyUtilBase.getPropertyName((PsiMethod)parentOfParent); if (propName != null) { parameterName = propName; } diff --git a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java index 507068fb4624..30c0218c56c2 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/RenameJavaVariableProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,6 +28,7 @@ import com.intellij.psi.controlFlow.ControlFlowUtil; import com.intellij.psi.search.searches.ClassInheritorsSearch; import com.intellij.psi.search.searches.OverridingMethodsSearch; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.refactoring.HelpID; @@ -148,14 +149,14 @@ public class RenameJavaVariableProcessor extends RenameJavaMemberProcessor { Project project = field.getProject(); final JavaCodeStyleManager manager = JavaCodeStyleManager.getInstance(project); - final String propertyName = PropertyUtil.suggestPropertyName(field, field.getName()); - final String newPropertyName = PropertyUtil.suggestPropertyName(field, newName); + final String propertyName = PropertyUtilBase.suggestPropertyName(field, field.getName()); + final String newPropertyName = PropertyUtilBase.suggestPropertyName(field, newName); boolean isStatic = field.hasModifierProperty(PsiModifier.STATIC); PsiMethod[] getters = GetterSetterPrototypeProvider.findGetters(aClass, propertyName, isStatic); - PsiMethod setter = PropertyUtil.findPropertySetter(aClass, propertyName, isStatic, false); + PsiMethod setter = PropertyUtilBase.findPropertySetter(aClass, propertyName, isStatic, false); boolean shouldRenameSetterParameter = false; @@ -170,7 +171,7 @@ public class RenameJavaVariableProcessor extends RenameJavaMemberProcessor { String getterId = null; if (newGetterName == null) { getterId = getter.getName(); - newGetterName = PropertyUtil.suggestGetterName(newPropertyName, field.getType(), getterId); + newGetterName = PropertyUtilBase.suggestGetterName(newPropertyName, field.getType(), getterId); } if (newGetterName.equals(getterId)) { continue; @@ -192,7 +193,7 @@ public class RenameJavaVariableProcessor extends RenameJavaMemberProcessor { String newSetterName = ""; if (setter != null) { - newSetterName = PropertyUtil.suggestSetterName(newPropertyName); + newSetterName = PropertyUtilBase.suggestSetterName(newPropertyName); final String newSetterParameterName = manager.propertyNameToVariableName(newPropertyName, VariableKind.PARAMETER); if (newSetterName.equals(setter.getName())) { setter = null; @@ -222,7 +223,7 @@ public class RenameJavaVariableProcessor extends RenameJavaMemberProcessor { for (PsiMethod getter : getters) { String newGetterName = GetterSetterPrototypeProvider.suggestNewGetterName(propertyName, newPropertyName, getter); if (newGetterName == null) { - newGetterName = PropertyUtil.suggestGetterName(newPropertyName, field.getType(), getter.getName()); + newGetterName = PropertyUtilBase.suggestGetterName(newPropertyName, field.getType(), getter.getName()); } addOverriddenAndImplemented(getter, newGetterName, null, propertyName, manager, allRenames); } diff --git a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ParameterData.java b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ParameterData.java index 5479ca9ecc02..b31cc605d279 100644 --- a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ParameterData.java +++ b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ParameterData.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import com.intellij.psi.*; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.refactoring.util.RefactoringUtil; import java.util.Map; @@ -87,7 +88,7 @@ public class ParameterData { parameterData = new ParameterData(paramName, parameter.getType()); parameterData.setFieldName(styleManager.suggestVariableName(VariableKind.FIELD, uniqueParamName, null, parameter.getType()).names[0]); - parameterData.setSetterName(PropertyUtil.suggestSetterName(uniqueParamName, setterPrefix)); + parameterData.setSetterName(PropertyUtilBase.suggestSetterName(uniqueParamName, setterPrefix)); result.put(uniqueParamName, parameterData); } diff --git a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java index fb8fb60d5d72..f14c7ebf5450 100644 --- a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderDialog.java @@ -37,6 +37,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.refactoring.PackageWrapper; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.move.moveClassesOrPackages.DestinationFolderComboBox; @@ -154,7 +155,7 @@ public class ReplaceConstructorWithBuilderDialog extends RefactoringDialog { final ParameterData data = myParametersMap.get(paramName); paramName = data.getParamName(); final String propertyName = javaCodeStyleManager.variableNameToPropertyName(paramName, VariableKind.PARAMETER); - data.setSetterName(PropertyUtil.suggestSetterName(propertyName, setterPrefix)); + data.setSetterName(PropertyUtilBase.suggestSetterName(propertyName, setterPrefix)); } myTable.revalidate(); myTable.repaint(); diff --git a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderProcessor.java b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderProcessor.java index c33335187fd8..3ab38492196f 100644 --- a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,6 +19,7 @@ import com.intellij.ide.highlighter.JavaFileType; import com.intellij.ide.util.PackageUtil; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtil; +import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Ref; @@ -29,10 +30,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.searches.ReferencesSearch; -import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; -import com.intellij.psi.util.TypeConversionUtil; +import com.intellij.psi.util.*; import com.intellij.refactoring.MoveDestination; import com.intellij.refactoring.replaceConstructorWithBuilder.usageInfo.ReplaceConstructorWithSettersChainInfo; import com.intellij.refactoring.util.FixableUsageInfo; @@ -118,7 +116,7 @@ public class ReplaceConstructorWithBuilderProcessor extends FixableUsagesRefacto if (myMoveDestination != null) { directory = myMoveDestination.getTargetDirectory(containingDirectory); } else { - final Module module = ModuleUtil.findModuleForPsiElement(containingFile); + final Module module = ModuleUtilCore.findModuleForPsiElement(containingFile); assert module != null; directory = PackageUtil.findOrCreateDirectoryForPackage(module, myPackageName, containingDirectory, true, true); } @@ -178,7 +176,7 @@ public class ReplaceConstructorWithBuilderProcessor extends FixableUsagesRefacto } } if (setter == null) { - setter = PropertyUtil.generateSetterPrototype(field, builderClass, true); + setter = PropertyUtilBase.generateSetterPrototype(field, builderClass, true); final PsiIdentifier nameIdentifier = setter.getNameIdentifier(); assert nameIdentifier != null; nameIdentifier.replace(myElementFactory.createIdentifier(parameterData.getSetterName())); @@ -217,7 +215,7 @@ public class ReplaceConstructorWithBuilderProcessor extends FixableUsagesRefacto private void fixSetterReturnType(PsiClass builderClass, PsiField field, PsiMethod method) { if (PsiUtil.resolveClassInType(method.getReturnType()) != builderClass) { final PsiCodeBlock body = method.getBody(); - final PsiCodeBlock generatedBody = PropertyUtil.generateSetterPrototype(field, builderClass, true).getBody(); + final PsiCodeBlock generatedBody = PropertyUtilBase.generateSetterPrototype(field, builderClass, true).getBody(); assert body != null; assert generatedBody != null; body.replace(generatedBody); diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java index 4e501efbd4cd..964ee645f568 100644 --- a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java @@ -35,10 +35,7 @@ import com.intellij.psi.search.LocalSearchScope; import com.intellij.psi.search.searches.FunctionalExpressionSearch; import com.intellij.psi.search.searches.OverridingMethodsSearch; import com.intellij.psi.search.searches.ReferencesSearch; -import com.intellij.psi.util.MethodSignatureUtil; -import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.PsiUtil; +import com.intellij.psi.util.*; import com.intellij.refactoring.JavaRefactoringSettings; import com.intellij.refactoring.RefactoringBundle; import com.intellij.refactoring.changeSignature.inCallers.AbstractJavaMemberCallerChooser; @@ -233,7 +230,7 @@ public class JavaSafeDeleteProcessor extends SafeDeleteProcessorDelegateBase { getters = validGetters.isEmpty() ? null : validGetters.toArray(new PsiMethod[validGetters.size()]); } - PsiMethod setter = PropertyUtil.findPropertySetter(aClass, propertyName, isStatic, false); + PsiMethod setter = PropertyUtilBase.findPropertySetter(aClass, propertyName, isStatic, false); if (allElementsToDelete.contains(setter) || setter != null && !setter.isPhysical()) setter = null; if (askUser && (getters != null || setter != null)) { final String message = @@ -928,7 +925,7 @@ public class JavaSafeDeleteProcessor extends SafeDeleteProcessorDelegateBase { return true; }); - PsiMethod setterPrototype = PropertyUtil.generateSetterPrototype(psiField, psiField.getContainingClass()); + PsiMethod setterPrototype = PropertyUtilBase.generateSetterPrototype(psiField, psiField.getContainingClass()); PsiParameter setterParameter = setterPrototype.getParameterList().getParameters()[0]; for (PsiParameter parameter : parameters) { PsiElement scope = parameter.getDeclarationScope(); diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java index 26ee4011e98a..d10ab603419d 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationStatementProcessor.java @@ -705,7 +705,8 @@ class TypeMigrationStatementProcessor extends JavaRecursiveElementVisitor { PsiField field = (PsiField) resolved; final NavigatablePsiElement containingMethod = PsiTreeUtil.getParentOfType(expression, PsiMethod.class, PsiLambdaExpression.class); if (containingMethod instanceof PsiMethod) { - final PsiMethod setter = PropertyUtil.findPropertySetter(field.getContainingClass(), field.getName(), field.hasModifierProperty(PsiModifier.STATIC), false); + final PsiMethod setter = PropertyUtilBase + .findPropertySetter(field.getContainingClass(), field.getName(), field.hasModifierProperty(PsiModifier.STATIC), false); if (containingMethod.isEquivalentTo(setter)) { return true; } diff --git a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java index e87ddf3a3994..1a85b1e5fe06 100644 --- a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -31,6 +31,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.searches.OverridingMethodsSearch; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiUtil; import com.intellij.psi.util.TypeConversionUtil; import com.intellij.refactoring.MoveDestination; @@ -110,7 +111,7 @@ public class WrapReturnValueProcessor extends FixableUsagesRefactoringProcessor return unboxedType.getCanonicalText() + "Value()"; } - final PsiMethod getter = PropertyUtil.findGetterForField(myDelegateField); + final PsiMethod getter = PropertyUtilBase.findGetterForField(myDelegateField); return getter != null ? getter.getName() : ""; } return ""; diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/SimpleAccessorReferenceSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/SimpleAccessorReferenceSearcher.java index 4d939ddd3e1b..71cd62b649b9 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/SimpleAccessorReferenceSearcher.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/SimpleAccessorReferenceSearcher.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.UsageSearchContext; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.util.Processor; import org.jetbrains.annotations.NotNull; @@ -47,7 +48,7 @@ public class SimpleAccessorReferenceSearcher extends QueryExecutorBase { public static String getAnnotationValue(PsiField psiField, Class annotationClass) { final PsiConstantEvaluationHelper evalHelper = JavaPsiFacade.getInstance(psiField.getProject()).getConstantEvaluationHelper(); - final PsiMethod getter = PropertyUtil.findGetterForField(psiField); - final PsiMethod setter = PropertyUtil.findSetterForField(psiField); + final PsiMethod getter = PropertyUtilBase.findGetterForField(psiField); + final PsiMethod setter = PropertyUtilBase.findSetterForField(psiField); final PsiAnnotation attrAnno = ExtensionDomExtender.findAnnotation(annotationClass, psiField, getter, setter); if (attrAnno != null) { return ExtensionDomExtender.getStringAttribute(attrAnno, "value", evalHelper); diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/element/ElementFactory.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/element/ElementFactory.java index c6c09aeae7d7..30bceb5f425e 100644 --- a/plugins/generate-tostring/src/org/jetbrains/java/generate/element/ElementFactory.java +++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/element/ElementFactory.java @@ -18,6 +18,7 @@ package org.jetbrains.java.generate.element; import com.intellij.openapi.diagnostic.Logger; import com.intellij.psi.*; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import org.jetbrains.java.generate.psi.PsiAdapter; /** @@ -71,7 +72,7 @@ public class ElementFactory { public static FieldElement newFieldElement(PsiField field, boolean useAccessor) { FieldElement fe = new FieldElement(); fe.setName(field.getName()); - final PsiMethod getterForField = useAccessor ? PropertyUtil.findGetterForField(field) : null; + final PsiMethod getterForField = useAccessor ? PropertyUtilBase.findGetterForField(field) : null; fe.setAccessor(getterForField != null ? getterForField.getName() + "()" : field.getName()); if (PsiAdapter.isConstantField(field)) fe.setConstant(true); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/NamedArgumentReference.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/NamedArgumentReference.java index b6751bdb684e..ea5e52b5d7e9 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/NamedArgumentReference.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/extensions/impl/NamedArgumentReference.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,6 +20,7 @@ import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiPolyVariantReferenceBase; import com.intellij.psi.PsiSubstitutor; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; @@ -59,8 +60,8 @@ public class NamedArgumentReference extends PsiPolyVariantReferenceBase properties = PropertyUtil.getAllProperties(true, false, methods); + final Map properties = PropertyUtilBase.getAllProperties(true, false, methods); for (PsiField field : CollectClassMembersUtil.getFields(psiClass, false)) { final String name = field.getName(); if (includeFields || diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ast/builder/strategy/ExternalBuilderStrategySupport.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ast/builder/strategy/ExternalBuilderStrategySupport.java index 987ca20b3151..a4710851928c 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ast/builder/strategy/ExternalBuilderStrategySupport.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/ast/builder/strategy/ExternalBuilderStrategySupport.java @@ -18,6 +18,7 @@ package org.jetbrains.plugins.groovy.lang.resolve.ast.builder.strategy; import com.intellij.psi.*; import com.intellij.psi.impl.light.LightMethodBuilder; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition; @@ -49,7 +50,7 @@ public class ExternalBuilderStrategySupport extends BuilderAnnotationContributor context.addMethod(DefaultBuilderStrategySupport.createFieldSetter(context.getCodeClass(), field, annotation)); } } else { - Collection properties = PropertyUtil.getAllProperties(constructedClass, true, false, includeSuper).values(); + Collection properties = PropertyUtilBase.getAllProperties(constructedClass, true, false, includeSuper).values(); for (PsiMethod setter : properties) { final PsiMethod builderSetter = createFieldSetter(context.getCodeClass(), setter, annotation); if (builderSetter != null) context.addMethod(builderSetter); @@ -62,8 +63,8 @@ public class ExternalBuilderStrategySupport extends BuilderAnnotationContributor public static LightMethodBuilder createFieldSetter(@NotNull PsiClass builderClass, @NotNull PsiMethod setter, @NotNull PsiAnnotation annotation) { - final String name = PropertyUtil.getPropertyNameBySetter(setter); - final PsiType type = PropertyUtil.getPropertyType(setter); + final String name = PropertyUtilBase.getPropertyNameBySetter(setter); + final PsiType type = PropertyUtilBase.getPropertyType(setter); if (type == null) return null; return DefaultBuilderStrategySupport.createFieldSetter(builderClass, name, type, annotation, setter); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/encapsulateFields/GroovyEncapsulateFieldHelper.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/encapsulateFields/GroovyEncapsulateFieldHelper.java index 38869441db24..1cbda69b6c02 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/encapsulateFields/GroovyEncapsulateFieldHelper.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/encapsulateFields/GroovyEncapsulateFieldHelper.java @@ -20,6 +20,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.encapsulateFields.*; import com.intellij.util.IncorrectOperationException; @@ -60,13 +61,13 @@ public class GroovyEncapsulateFieldHelper extends EncapsulateFieldHelper { @Override @NotNull public String suggestSetterName(@NotNull PsiField field) { - return PropertyUtil.suggestSetterName(field); + return PropertyUtilBase.suggestSetterName(field); } @Override @NotNull public String suggestGetterName(@NotNull PsiField field) { - return PropertyUtil.suggestGetterName(field); + return PropertyUtilBase.suggestGetterName(field); } @Override diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGrFieldProcessor.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGrFieldProcessor.java index e26e37961fd6..8c36d0799d29 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGrFieldProcessor.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/rename/RenameGrFieldProcessor.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,10 +20,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.searches.MethodReferencesSearch; import com.intellij.psi.search.searches.ReferencesSearch; -import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiFormatUtil; -import com.intellij.psi.util.PsiFormatUtilBase; -import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.util.*; import com.intellij.refactoring.listeners.RefactoringElementListener; import com.intellij.refactoring.rename.RenameJavaVariableProcessor; import com.intellij.refactoring.rename.UnresolvableCollisionUsageInfo; @@ -231,7 +228,7 @@ public class RenameGrFieldProcessor extends RenameJavaVariableProcessor { final PsiMethod getter = GroovyPropertyUtils.findGetterForField(field); if (getter instanceof GrAccessorMethod) { final PsiMethod newGetter = - PropertyUtil.findPropertyGetter(containingClass, newName, field.hasModifierProperty(PsiModifier.STATIC), true); + PropertyUtilBase.findPropertyGetter(containingClass, newName, field.hasModifierProperty(PsiModifier.STATIC), true); if (newGetter != null && !(newGetter instanceof GrAccessorMethod)) { conflicts.putValue(newGetter, GroovyRefactoringBundle .message("implicit.getter.will.by.overriden.by.method", field.getName(), newGetter.getName())); @@ -240,7 +237,7 @@ public class RenameGrFieldProcessor extends RenameJavaVariableProcessor { final PsiMethod setter = GroovyPropertyUtils.findSetterForField(field); if (setter instanceof GrAccessorMethod) { final PsiMethod newSetter = - PropertyUtil.findPropertySetter(containingClass, newName, field.hasModifierProperty(PsiModifier.STATIC), true); + PropertyUtilBase.findPropertySetter(containingClass, newName, field.hasModifierProperty(PsiModifier.STATIC), true); if (newSetter != null && !(newSetter instanceof GrAccessorMethod)) { conflicts.putValue(newSetter, GroovyRefactoringBundle .message("implicit.setter.will.by.overriden.by.method", field.getName(), newSetter.getName())); diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/capitalization/TitleCapitalizationInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/capitalization/TitleCapitalizationInspection.java index a86954d7bce8..5a593b96feb4 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/capitalization/TitleCapitalizationInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/capitalization/TitleCapitalizationInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.HashSet; @@ -114,7 +115,7 @@ public class TitleCapitalizationInspection extends BaseJavaLocalInspectionTool { } if (arg instanceof PsiMethodCallExpression) { PsiMethod psiMethod = ((PsiMethodCallExpression)arg).resolveMethod(); - PsiExpression returnValue = PropertyUtil.getGetterReturnExpression(psiMethod); + PsiExpression returnValue = PropertyUtilBase.getGetterReturnExpression(psiMethod); if (arg == returnValue) { return null; } @@ -240,7 +241,7 @@ public class TitleCapitalizationInspection extends BaseJavaLocalInspectionTool { else if (element instanceof PsiMethodCallExpression) { final PsiMethodCallExpression methodCallExpression = (PsiMethodCallExpression)element; final PsiMethod method = methodCallExpression.resolveMethod(); - final PsiExpression returnValue = PropertyUtil.getGetterReturnExpression(method); + final PsiExpression returnValue = PropertyUtilBase.getGetterReturnExpression(method); if (returnValue != null) { doFix(project, returnValue); } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxGetterSetterPrototypeProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxGetterSetterPrototypeProvider.java index b3fee04416bd..5c16c1f3916b 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxGetterSetterPrototypeProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/codeInsight/JavaFxGetterSetterPrototypeProvider.java @@ -24,6 +24,7 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import org.jetbrains.plugins.javaFX.fxml.JavaFxCommonNames; import org.jetbrains.plugins.javaFX.fxml.JavaFxPsiUtil; @@ -44,7 +45,7 @@ public class JavaFxGetterSetterPrototypeProvider extends GetterSetterPrototypePr final PsiType wrappedType = JavaFxPsiUtil.getWrappedPropertyType(field, project, JavaFxCommonNames.ourReadOnlyMap); LOG.assertTrue(wrappedType != null, field.getType()); - getter.setName(PropertyUtil.suggestGetterName(PropertyUtil.suggestPropertyName(field), wrappedType)); + getter.setName(PropertyUtilBase.suggestGetterName(PropertyUtilBase.suggestPropertyName(field), wrappedType)); final PsiTypeElement returnTypeElement = getter.getReturnTypeElement(); LOG.assertTrue(returnTypeElement != null); @@ -55,7 +56,7 @@ public class JavaFxGetterSetterPrototypeProvider extends GetterSetterPrototypePr final String fieldName = field.getName(); getterBody.getStatements()[0].replace(factory.createStatementFromText("return " + fieldName + ".get();", field)); - final PsiMethod propertyGetter = PropertyUtil.generateGetterPrototype(field); + final PsiMethod propertyGetter = PropertyUtilBase.generateGetterPrototype(field); if (propertyGetter != null && fieldName != null) { propertyGetter.setName(JavaCodeStyleManager.getInstance(project).variableNameToPropertyName(fieldName, VariableKind.FIELD) + JavaFxCommonNames.PROPERTY_METHOD_SUFFIX); } @@ -90,7 +91,7 @@ public class JavaFxGetterSetterPrototypeProvider extends GetterSetterPrototypePr final PsiMethod specificGetter = psiClass .findMethodBySignature(JavaPsiFacade.getElementFactory(psiClass.getProject()).createMethod(getterName, PsiType.VOID), false); if (specificGetter != null) { - final PsiMethod getter = PropertyUtil.findPropertyGetter(psiClass, propertyName, false, false); + final PsiMethod getter = PropertyUtilBase.findPropertyGetter(psiClass, propertyName, false, false); return getter == null ? new PsiMethod[] {specificGetter} : new PsiMethod[] {getter, specificGetter}; } return super.findGetters(psiClass, propertyName); diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java index 7c09830ab8a0..07a644e11aad 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java @@ -185,7 +185,7 @@ public class JavaFxPsiUtil { public static PsiClassType getPropertyClassType(PsiElement member, final String superTypeFQN) { if (member instanceof PsiMember) { - final PsiType type = PropertyUtil.getPropertyType((PsiMember)member); + final PsiType type = PropertyUtilBase.getPropertyType((PsiMember)member); if (type instanceof PsiClassType) { final PsiClassType.ClassResolveResult resolveResult = ((PsiClassType)type).resolveGenerics(); final PsiClass attributeClass = resolveResult.getElement(); @@ -225,7 +225,7 @@ public class JavaFxPsiUtil { @Nullable public static PsiMethod findStaticPropertySetter(@NotNull String attributeName, @Nullable PsiClass classWithStaticProperty) { if (classWithStaticProperty == null) return null; - final String setterName = PropertyUtil.suggestSetterName(StringUtil.getShortName(attributeName)); + final String setterName = PropertyUtilBase.suggestSetterName(StringUtil.getShortName(attributeName)); final PsiMethod[] setters = classWithStaticProperty.findMethodsByName(setterName, true); for (PsiMethod setter : setters) { if (setter.hasModifierProperty(PsiModifier.PUBLIC) && @@ -247,12 +247,12 @@ public class JavaFxPsiUtil { } private static PsiMethod findPropertyGetter(final PsiClass psiClass, final String propertyName, final PsiType propertyType) { - final String getterName = PropertyUtil.suggestGetterName(propertyName, propertyType); + final String getterName = PropertyUtilBase.suggestGetterName(propertyName, propertyType); final PsiMethod[] getters = psiClass.findMethodsByName(getterName, true); for (PsiMethod getter : getters) { if (getter.hasModifierProperty(PsiModifier.PUBLIC) && !getter.hasModifierProperty(PsiModifier.STATIC) && - PropertyUtil.isSimplePropertyGetter(getter)) { + PropertyUtilBase.isSimplePropertyGetter(getter)) { return getter; } } @@ -710,7 +710,7 @@ public class JavaFxPsiUtil { if (method.getParameterList().getParametersCount() != 0) { return getSetterArgumentType(method); } - final String propertyName = PropertyUtil.getPropertyName(method); + final String propertyName = PropertyUtilBase.getPropertyName(method); final PsiClass psiClass = containingClass != null ? containingClass : method.getContainingClass(); if (propertyName != null && containingClass != null) { final PsiMethod setter = findInstancePropertySetter(psiClass, propertyName); @@ -873,8 +873,8 @@ public class JavaFxPsiUtil { final Map acceptableMembers = new THashMap<>(); for (PsiMethod method : psiClass.getAllMethods()) { if (method.hasModifierProperty(PsiModifier.STATIC) || !method.hasModifierProperty(PsiModifier.PUBLIC)) continue; - if (PropertyUtil.isSimplePropertyGetter(method)) { - final String propertyName = PropertyUtil.getPropertyName(method); + if (PropertyUtilBase.isSimplePropertyGetter(method)) { + final String propertyName = PropertyUtilBase.getPropertyName(method); assert propertyName != null; acceptableMembers.put(propertyName, method); } @@ -905,9 +905,9 @@ public class JavaFxPsiUtil { } for (PsiMethod method : psiClass.getAllMethods()) { if (method.hasModifierProperty(PsiModifier.STATIC) || !method.hasModifierProperty(PsiModifier.PUBLIC)) continue; - if (PropertyUtil.isSimplePropertyGetter(method)) { + if (PropertyUtilBase.isSimplePropertyGetter(method)) { PsiMember acceptableMember = method; - final String propertyName = PropertyUtil.getPropertyName(method); + final String propertyName = PropertyUtilBase.getPropertyName(method); assert propertyName != null; PsiMethod setter = findInstancePropertySetter(psiClass, propertyName); @@ -989,12 +989,12 @@ public class JavaFxPsiUtil { @Nullable public static PsiMethod findInstancePropertySetter(@NotNull PsiClass psiClass, @Nullable String propertyName) { if (StringUtil.isEmpty(propertyName)) return null; - final String suggestedSetterName = PropertyUtil.suggestSetterName(propertyName); + final String suggestedSetterName = PropertyUtilBase.suggestSetterName(propertyName); final PsiMethod[] setters = psiClass.findMethodsByName(suggestedSetterName, true); for (PsiMethod setter : setters) { if (setter.hasModifierProperty(PsiModifier.PUBLIC) && !setter.hasModifierProperty(PsiModifier.STATIC) && - PropertyUtil.isSimplePropertySetter(setter)) { + PropertyUtilBase.isSimplePropertySetter(setter)) { return setter; } } @@ -1057,11 +1057,11 @@ public class JavaFxPsiUtil { @Nullable private static PsiType getEventHandlerPropertyType(@NotNull PsiClass tagClass, @NotNull String eventName) { - final PsiMethod[] handlerSetterCandidates = tagClass.findMethodsByName(PropertyUtil.suggestSetterName(eventName), true); + final PsiMethod[] handlerSetterCandidates = tagClass.findMethodsByName(PropertyUtilBase.suggestSetterName(eventName), true); for (PsiMethod handlerSetter : handlerSetterCandidates) { if (!handlerSetter.hasModifierProperty(PsiModifier.STATIC) && handlerSetter.hasModifierProperty(PsiModifier.PUBLIC)) { - final PsiType propertyType = PropertyUtil.getPropertyType(handlerSetter); + final PsiType propertyType = PropertyUtilBase.getPropertyType(handlerSetter); if (InheritanceUtil.isInheritor(propertyType, JavaFxCommonNames.JAVAFX_EVENT_EVENT_HANDLER)) { return propertyType; } @@ -1137,7 +1137,7 @@ public class JavaFxPsiUtil { @NotNull public static String getPropertyName(@NotNull String memberName, boolean isMethod) { if (!isMethod) return memberName; - final String propertyName = PropertyUtil.getPropertyName(memberName); + final String propertyName = PropertyUtilBase.getPropertyName(memberName); return propertyName != null ? propertyName : memberName; } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxExpandAttributeIntention.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxExpandAttributeIntention.java index 67ce9accf198..c0933bfd280e 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxExpandAttributeIntention.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/intentions/JavaFxExpandAttributeIntention.java @@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiUtil; import com.intellij.psi.xml.*; import com.intellij.util.ArrayUtil; @@ -47,7 +48,7 @@ public class JavaFxExpandAttributeIntention extends PsiElementBaseIntentionActio String value = attr.getValue(); final PsiElement declaration = descriptor.getDeclaration(); if (declaration instanceof PsiMember) { - final PsiType propertyType = PropertyUtil.getPropertyType((PsiMember)declaration); + final PsiType propertyType = PropertyUtilBase.getPropertyType((PsiMember)declaration); final PsiType itemType = JavaGenericsUtil.getCollectionItemType(propertyType, declaration.getResolveScope()); if (itemType != null) { final String typeNode = itemType.getPresentableText(); @@ -72,7 +73,7 @@ public class JavaFxExpandAttributeIntention extends PsiElementBaseIntentionActio PsiType tagType = null; final PsiElement declaration = descriptor.getDeclaration(); if (declaration instanceof PsiMember) { - tagType = PropertyUtil.getPropertyType((PsiMember)declaration); + tagType = PropertyUtilBase.getPropertyType((PsiMember)declaration); } PsiClass tagClass = PsiUtil.resolveClassInType(tagType instanceof PsiPrimitiveType ? ((PsiPrimitiveType)tagType).getBoxedType(parent) : tagType); if ((tagClass != null && JavaFxPsiUtil.isAbleToInstantiate(tagClass)) || descriptor instanceof JavaFxStaticSetterAttributeDescriptor) { diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassTagDescriptorBase.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassTagDescriptorBase.java index 815ea417d947..6ac99513e7fc 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassTagDescriptorBase.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/descriptors/JavaFxClassTagDescriptorBase.java @@ -53,7 +53,7 @@ public abstract class JavaFxClassTagDescriptorBase implements XmlElementDescript if (psiClass != null) { final List children = new ArrayList<>(); collectWritableProperties(children, - member -> new JavaFxPropertyTagDescriptor(psiClass, PropertyUtil.getPropertyName(member), false)); + member -> new JavaFxPropertyTagDescriptor(psiClass, PropertyUtilBase.getPropertyName(member), false)); final JavaFxPropertyTagDescriptor defaultPropertyDescriptor = getDefaultPropertyDescriptor(); if (defaultPropertyDescriptor != null) { @@ -100,7 +100,7 @@ public abstract class JavaFxClassTagDescriptorBase implements XmlElementDescript protected static void collectStaticElementDescriptors(XmlTag context, List children) { collectParentStaticProperties(context, children, method -> { final PsiClass aClass = method.getContainingClass(); - return new JavaFxPropertyTagDescriptor(aClass, PropertyUtil.getPropertyName(method.getName()), true); + return new JavaFxPropertyTagDescriptor(aClass, PropertyUtilBase.getPropertyName(method.getName()), true); }); } @@ -212,7 +212,7 @@ public abstract class JavaFxClassTagDescriptorBase implements XmlElementDescript protected void collectInstanceProperties(List simpleAttrs) { final PsiClass psiClass = getPsiClass(); final Set propertyNames = collectWritableProperties( - simpleAttrs, member -> new JavaFxPropertyAttributeDescriptor(PropertyUtil.getPropertyName(member), psiClass)); + simpleAttrs, member -> new JavaFxPropertyAttributeDescriptor(PropertyUtilBase.getPropertyName(member), psiClass)); for (String name : JavaFxPsiUtil.getConstructorNamedArgProperties(psiClass)) { if (!propertyNames.contains(name)) { diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxComponentIdReferenceProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxComponentIdReferenceProvider.java index b9f6c2af909e..d2bad8ccec9b 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxComponentIdReferenceProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxComponentIdReferenceProvider.java @@ -22,10 +22,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; -import com.intellij.psi.util.InheritanceUtil; -import com.intellij.psi.util.PropertyUtil; -import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.psi.util.TypeConversionUtil; +import com.intellij.psi.util.*; import com.intellij.psi.xml.XmlAttributeValue; import com.intellij.psi.xml.XmlTag; import com.intellij.util.ArrayUtil; @@ -271,7 +268,7 @@ public class JavaFxComponentIdReferenceProvider extends PsiReferenceProvider { if (readableType == null) continue; if (TypeConversionUtil.isAssignable(propertyType, readableType) || resolvedType != null && TypeConversionUtil.isAssignable(resolvedType, readableType)) { - final String propertyName = PropertyUtil.getPropertyName(readableMember); + final String propertyName = PropertyUtilBase.getPropertyName(readableMember); if (propertyName != null) { objs.add(LookupElementBuilder.create(readableMember, propertyName)); } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxMethodSearcher.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxMethodSearcher.java index f8737934e6c8..19f35863bbb8 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxMethodSearcher.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxMethodSearcher.java @@ -28,6 +28,7 @@ import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.UsageSearchContext; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiUtilCore; import com.intellij.psi.xml.XmlAttribute; import com.intellij.psi.xml.XmlElement; @@ -79,7 +80,7 @@ public class JavaFxMethodSearcher implements QueryExecutor PropertyUtil.getPropertyName(psiMethod.getName())); + final String propertyName = ReadAction.compute(() -> PropertyUtilBase.getPropertyName(psiMethod.getName())); if (propertyName == null) return; final String className = ReadAction.compute(() -> { diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxScopeEnlarger.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxScopeEnlarger.java index 1cc1106eaf62..a234eba3eefa 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxScopeEnlarger.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxScopeEnlarger.java @@ -24,6 +24,7 @@ import com.intellij.psi.search.SearchScope; import com.intellij.psi.search.UseScopeEnlarger; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.plugins.javaFX.fxml.JavaFxCommonNames; @@ -43,7 +44,7 @@ public class JavaFxScopeEnlarger extends UseScopeEnlarger { } else if (element instanceof PsiParameter) { final PsiElement declarationScope = ((PsiParameter)element).getDeclarationScope(); - if (declarationScope instanceof PsiMethod && PropertyUtil.isSimplePropertySetter((PsiMethod)declarationScope)) { + if (declarationScope instanceof PsiMethod && PropertyUtilBase.isSimplePropertySetter((PsiMethod)declarationScope)) { containingClass = ((PsiMethod)declarationScope).getContainingClass(); } } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java index ade73e296eab..4ea0869f0919 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/refactoring/JavaFxPropertyRenameHandler.java @@ -10,6 +10,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.impl.source.resolve.reference.impl.PsiMultiReference; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.xml.XmlAttributeValue; import com.intellij.psi.xml.XmlFile; @@ -172,11 +173,11 @@ public class JavaFxPropertyRenameHandler implements RenameHandler { @NotNull private static Map getElementsToRename(@NotNull JavaFxPropertyReference reference, @NotNull String newPropertyName) { final Map rename = new THashMap<>(); - putIfKeyNotNull(rename, reference.getGetter(), PropertyUtil.suggestGetterName(newPropertyName, reference.getType())); + putIfKeyNotNull(rename, reference.getGetter(), PropertyUtilBase.suggestGetterName(newPropertyName, reference.getType())); putIfKeyNotNull(rename, reference.getField(), newPropertyName); - putIfKeyNotNull(rename, reference.getSetter(), PropertyUtil.suggestSetterName(newPropertyName)); + putIfKeyNotNull(rename, reference.getSetter(), PropertyUtilBase.suggestSetterName(newPropertyName)); putIfKeyNotNull(rename, reference.getObservableGetter(), newPropertyName + JavaFxCommonNames.PROPERTY_METHOD_SUFFIX); - putIfKeyNotNull(rename, reference.getStaticSetter(), PropertyUtil.suggestSetterName(newPropertyName)); + putIfKeyNotNull(rename, reference.getStaticSetter(), PropertyUtilBase.suggestSetterName(newPropertyName)); //TODO add "name" parameter of the observable property constructor (like new SimpleObjectProperty(this, "name", null); return rename; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/Properties.java b/plugins/ui-designer/src/com/intellij/uiDesigner/Properties.java index c852bc5f02e0..3a78b7050ce9 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/Properties.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/Properties.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2015 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMethod; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.uiDesigner.lw.LwXmlReader; import com.intellij.uiDesigner.propertyInspector.editors.IntEnumEditor; import org.jdom.Element; @@ -76,8 +77,8 @@ public final class Properties implements PersistentStateComponent { if (componentClass != null) { PsiMethod[] methods = componentClass.getAllMethods(); for(PsiMethod method: methods) { - if (method.isDeprecated() && PropertyUtil.isSimplePropertySetter(method)) { - deprecated.add(PropertyUtil.getPropertyNameBySetter(method)); + if (method.isDeprecated() && PropertyUtilBase.isSimplePropertySetter(method)) { + deprecated.add(PropertyUtilBase.getPropertyNameBySetter(method)); } } } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/PsiPropertiesProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/PsiPropertiesProvider.java index 605f459047ab..eaa95bf51718 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/PsiPropertiesProvider.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/PsiPropertiesProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.ClassUtil; import com.intellij.psi.util.InheritanceUtil; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.uiDesigner.lw.*; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -62,14 +63,14 @@ public final class PsiPropertiesProvider implements PropertiesProvider { for (final PsiMethod method : methods) { // it's a setter candidate.. try to find getter - if (!PropertyUtil.isSimplePropertySetter(method)) { + if (!PropertyUtilBase.isSimplePropertySetter(method)) { continue; } - final String name = PropertyUtil.getPropertyName(method); + final String name = PropertyUtilBase.getPropertyName(method); if (name == null) { throw new IllegalStateException(); } - final PsiMethod getter = PropertyUtil.findPropertyGetter(aClass, name, false, true); + final PsiMethod getter = PropertyUtilBase.findPropertyGetter(aClass, name, false, true); if (getter == null) { continue; } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ShowJavadocAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ShowJavadocAction.java index 50be2a7f1a00..07325bcc70e2 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ShowJavadocAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/ShowJavadocAction.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -27,6 +27,7 @@ import com.intellij.openapi.util.Disposer; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMethod; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.ui.TabbedPaneWrapper; import com.intellij.ui.awt.RelativePoint; import com.intellij.uiDesigner.UIDesignerBundle; @@ -47,10 +48,10 @@ public final class ShowJavadocAction extends AnAction { final IntrospectedProperty introspectedProperty = inspector.getSelectedIntrospectedProperty(); final PsiClass aClass = inspector.getComponentClass(); - final PsiMethod getter = PropertyUtil.findPropertyGetter(aClass, introspectedProperty.getName(), false, true); + final PsiMethod getter = PropertyUtilBase.findPropertyGetter(aClass, introspectedProperty.getName(), false, true); LOG.assertTrue(getter != null); - final PsiMethod setter = PropertyUtil.findPropertySetter(aClass, introspectedProperty.getName(), false, true); + final PsiMethod setter = PropertyUtilBase.findPropertySetter(aClass, introspectedProperty.getName(), false, true); LOG.assertTrue(setter != null); final DocumentationManager documentationManager = DocumentationManager.getInstance(aClass.getProject()); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java index fcb8ef35889a..820a31bba0f3 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/FormReferenceProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2014 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import com.intellij.openapi.application.ReadAction; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtil; +import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.Pair; @@ -278,12 +279,12 @@ public class FormReferenceProvider extends PsiReferenceProvider { if (valueAttribute != null) { PsiReference reference = ReadAction.compute(() -> { final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(file.getProject()); - final Module module = ModuleUtil.findModuleForPsiElement(file); + final Module module = ModuleUtilCore.findModuleForPsiElement(file); if (module == null) return null; final GlobalSearchScope scope = module.getModuleWithDependenciesAndLibrariesScope(false); PsiClass psiClass = psiFacade.findClass(className, scope); if (psiClass != null) { - PsiMethod getter = PropertyUtil.findPropertyGetter(psiClass, tag.getName(), false, true); + PsiMethod getter = PropertyUtilBase.findPropertyGetter(psiClass, tag.getName(), false, true); if (getter != null) { final PsiType returnType = getter.getReturnType(); if (returnType instanceof PsiClassType) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/i18n/I18nFormInspection.java b/plugins/ui-designer/src/com/intellij/uiDesigner/i18n/I18nFormInspection.java index acb105482cf3..a895de143da9 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/i18n/I18nFormInspection.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/i18n/I18nFormInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.uiDesigner.inspections.EditorQuickFixProvider; import com.intellij.uiDesigner.inspections.FormErrorCollector; @@ -109,7 +110,7 @@ public class I18nFormInspection extends StringDescriptorInspection { if (componentClass == null) { return false; } - PsiMethod setter = PropertyUtil.findPropertySetter(componentClass, propertyName, false, true); + PsiMethod setter = PropertyUtilBase.findPropertySetter(componentClass, propertyName, false, true); if (setter != null) { PsiParameter[] parameters = setter.getParameterList().getParameters(); if (parameters.length == 1 && diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/Java15FormInspection.java b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/Java15FormInspection.java index 39a74d5e85d5..3a7bc323c2fc 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/Java15FormInspection.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/inspections/Java15FormInspection.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.PsiMethod; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.uiDesigner.actions.ResetValueAction; import com.intellij.uiDesigner.designSurface.GuiEditor; @@ -57,7 +58,7 @@ public class Java15FormInspection extends BaseFormInspection { } for(final IProperty prop: component.getModifiedProperties()) { - final PsiMethod getter = PropertyUtil.findPropertyGetter(aClass, prop.getName(), false, true); + final PsiMethod getter = PropertyUtilBase.findPropertyGetter(aClass, prop.getName(), false, true); if (getter == null) continue; final LanguageLevel languageLevel = EffectiveLanguageLevelUtil.getEffectiveLanguageLevel(module); if (Java15APIUsageInspectionBase.getLastIncompatibleLanguageLevel(getter, languageLevel) != null) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java index 2a91bab7643a..c8b1f23867aa 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/PropertyInspectorTable.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2016 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,6 +38,7 @@ import com.intellij.psi.PsiManager; import com.intellij.psi.PsiMethod; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.ui.*; import com.intellij.uiDesigner.ErrorAnalyzer; import com.intellij.uiDesigner.ErrorInfo; @@ -273,12 +274,12 @@ public final class PropertyInspectorTable extends Table implements DataProvider{ return null; } - final PsiMethod getter = PropertyUtil.findPropertyGetter(aClass, introspectedProperty.getName(), false, true); + final PsiMethod getter = PropertyUtilBase.findPropertyGetter(aClass, introspectedProperty.getName(), false, true); if(getter != null){ return getter; } - return PropertyUtil.findPropertySetter(aClass, introspectedProperty.getName(), false, true); + return PropertyUtilBase.findPropertySetter(aClass, introspectedProperty.getName(), false, true); } else if (CommonDataKeys.PSI_FILE.is(dataId) && myEditor != null) { return PsiManager.getInstance(myEditor.getProject()).findFile(myEditor.getFile()); diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java index d840dc9e8447..62a3093d6a0b 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/BindToExistingBeanStep.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,6 +21,7 @@ import com.intellij.openapi.ui.ComboBox; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiType; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.uiDesigner.UIDesignerBundle; import com.intellij.util.ArrayUtil; import org.jetbrains.annotations.NonNls; @@ -195,15 +196,15 @@ final class BindToExistingBeanStep extends StepAdapter{ model.addElement(null/**/); // Fill combobox with available bean's properties - final String[] rProps = PropertyUtil.getReadableProperties(myData.myBeanClass, true); - final String[] wProps = PropertyUtil.getWritableProperties(myData.myBeanClass, true); + final String[] rProps = PropertyUtilBase.getReadableProperties(myData.myBeanClass, true); + final String[] wProps = PropertyUtilBase.getWritableProperties(myData.myBeanClass, true); final ArrayList rwProps = new ArrayList<>(); outer: for(int i = rProps.length - 1; i >= 0; i--){ final String propName = rProps[i]; if(ArrayUtil.find(wProps, propName) != -1){ LOG.assertTrue(!rwProps.contains(propName)); - final PsiMethod getter = PropertyUtil.findPropertyGetter(myData.myBeanClass, propName, false, true); + final PsiMethod getter = PropertyUtilBase.findPropertyGetter(myData.myBeanClass, propName, false, true); if (getter == null) { // possible if the getter is static: getReadableProperties() does not filter out static methods, and // findPropertyGetter() checks for static/non-static diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/Generator.java b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/Generator.java index adb4b690d6d2..a69ab4664422 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/Generator.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/wizard/Generator.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2017 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,6 +22,7 @@ import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleUtil; +import com.intellij.openapi.module.ModuleUtilCore; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectFileIndex; import com.intellij.openapi.roots.ProjectRootManager; @@ -31,6 +32,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.codeStyle.VariableKind; import com.intellij.psi.util.PropertyUtil; +import com.intellij.psi.util.PropertyUtilBase; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.util.CommonRefactoringUtil; import com.intellij.uiDesigner.FormEditingUtil; @@ -64,7 +66,7 @@ public final class Generator { * @param rootContainer output parameter; should be LwRootContainer[1] */ public static FormProperty[] exposeForm(final Project project, final VirtualFile formFile, final LwRootContainer[] rootContainer) throws MyException{ - final Module module = ModuleUtil.findModuleForFile(formFile, project); + final Module module = ModuleUtilCore.findModuleForFile(formFile, project); LOG.assertTrue(module != null); final PsiPropertiesProvider propertiesProvider = new PsiPropertiesProvider(module); @@ -184,7 +186,7 @@ public final class Generator { // check that bean contains the property, and if not, try to add the property to the bean { - final String setterName = PropertyUtil.suggestSetterName(form2bean.myBeanProperty.myName); + final String setterName = PropertyUtilBase.suggestSetterName(form2bean.myBeanProperty.myName); final PsiMethod[] methodsByName = data.myBeanClass.findMethodsByName(setterName, true); if (methodsByName.length < 1) { // bean does not contain this property @@ -236,8 +238,8 @@ public final class Generator { } } - final PsiMethod propertySetter = PropertyUtil.findPropertySetter(data.myBeanClass, form2bean.myBeanProperty.myName, false, true); - final PsiMethod propertyGetter = PropertyUtil.findPropertyGetter(data.myBeanClass, form2bean.myBeanProperty.myName, false, true); + final PsiMethod propertySetter = PropertyUtilBase.findPropertySetter(data.myBeanClass, form2bean.myBeanProperty.myName, false, true); + final PsiMethod propertyGetter = PropertyUtilBase.findPropertyGetter(data.myBeanClass, form2bean.myBeanProperty.myName, false, true); if (propertyGetter == null) { // todo @@ -351,7 +353,7 @@ public final class Generator { // put them to the bound class - final Module module = ModuleUtil.findModuleForFile(data.myFormFile, data.myProject); + final Module module = ModuleUtilCore.findModuleForFile(data.myFormFile, data.myProject); LOG.assertTrue(module != null); final PsiClass boundClass = FormEditingUtil.findClassToBind(module, rootContainer[0].getClassToBind()); LOG.assertTrue(boundClass != null); @@ -554,7 +556,7 @@ public final class Generator { // setter final String parameterName = codeStyleManager.suggestVariableName(VariableKind.PARAMETER, property, null, null).names[0]; methodsBuffer.append("public void "); - methodsBuffer.append(PropertyUtil.suggestSetterName(property)); + methodsBuffer.append(PropertyUtilBase.suggestSetterName(property)); methodsBuffer.append("(final "); methodsBuffer.append(type); methodsBuffer.append(" "); @@ -571,7 +573,7 @@ public final class Generator { @SuppressWarnings({"HardCodedStringLiteral"}) private static String suggestGetterName(final String propertyName, final String propertyType) { - return PropertyUtil.suggestGetterName(propertyName, "boolean".equals(propertyType) ? PsiType.BOOLEAN : null); + return PropertyUtilBase.suggestGetterName(propertyName, "boolean".equals(propertyType) ? PsiType.BOOLEAN : null); } public static void prepareWizardData(final WizardData data, PsiClass boundClass) throws MyException { @@ -717,11 +719,11 @@ public final class Generator { continue; } - if (!PropertyUtil.isSimplePropertyGetter(barMethod)) { + if (!PropertyUtilBase.isSimplePropertyGetter(barMethod)) { continue; } - final String propertyName = PropertyUtil.getPropertyName(barMethod); + final String propertyName = PropertyUtilBase.getPropertyName(barMethod); // There are two possible types: boolean and java.lang.String String typeName = barMethod.getReturnType().getCanonicalText();