From 89d7f7290e455332acd2035b3d8f5975948aec23 Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Fri, 26 Jan 2018 16:39:23 +0700 Subject: [PATCH] PsiParameterList#isEmpty; isEmpty and getParametersCount used where possible --- .../src/com/intellij/execution/junit/JUnitUtil.java | 4 ++-- .../daemon/impl/analysis/HighlightUtil.java | 2 +- .../daemon/impl/analysis/JavaHighlightUtil.java | 2 +- .../daemon/impl/analysis/ModuleHighlightUtil.java | 2 +- .../codeInspection/AnonymousCanBeLambdaInspection.java | 2 +- .../bytecodeAnalysis/ProjectBytecodeAnalysis.java | 2 +- .../dataFlow/InferenceFromSourceUtil.java | 2 +- .../dataFlow/value/DfaExpressionFactory.java | 2 +- .../deadCode/UnusedDeclarationInspectionBase.java | 3 +-- .../deprecation/DeprecationInspectionBase.java | 4 ++-- .../java19modules/Java9ModuleEntryPoint.java | 4 ++-- .../codeInspection/reference/RefJavaModuleImpl.java | 2 +- .../inspection/ClassHasNoToStringMethodInspection.java | 4 ++-- .../inspection/FieldNotUsedInToStringInspection.java | 2 +- .../org/jetbrains/java/generate/psi/PsiAdapter.java | 4 ++-- .../codeInsight/JavaTargetElementEvaluator.java | 2 +- .../codeInsight/completion/ChainedCallCompletion.java | 2 +- .../codeInsight/completion/CollectConversion.java | 2 +- .../completion/ConstructorInsertHandler.java | 4 ++-- .../codeInsight/completion/JavaKeywordCompletion.java | 2 +- .../codeInsight/completion/JavaMethodCallElement.java | 2 +- .../completion/JavaMethodMergingContributor.java | 2 +- .../codeInsight/completion/SlowerTypeConversions.java | 2 +- .../codeInsight/completion/StaticMemberProcessor.java | 7 +++++-- .../daemon/impl/JavaLineMarkerProvider.java | 2 +- .../daemon/impl/quickfix/CreateClassFromNewFix.java | 2 +- .../impl/quickfix/DefineParamsDefaultValueAction.java | 2 +- .../hint/api/impls/MethodParameterInfoHandler.java | 2 +- .../intention/impl/CreateSubclassAction.java | 2 +- .../codeInsight/javadoc/JavaDocInfoGenerator.java | 2 +- .../codeInspection/CapturingCleanerInspection.java | 2 +- .../RedundantStreamOptionalCallInspection.java | 2 +- .../ReplaceInefficientStreamCountInspection.java | 2 +- .../SimplifyOptionalCallChainsInspection.java | 4 ++-- .../SimplifyStreamApiCallChainsInspection.java | 2 +- .../ide/actions/JavaQualifiedNameProvider.java | 2 +- .../ConvertToInstanceMethodHandler.java | 2 +- .../ExtractMethodObjectProcessor.java | 2 +- .../inline/InlineToAnonymousClassProcessor.java | 2 +- .../InlineSuperClassRefactoringProcessor.java | 5 ++--- .../usageInfo/ReplaceConstructorUsageInfo.java | 3 +-- .../refactoring/memberPullUp/JavaPullUpHelper.java | 3 +-- .../ReplaceConstructorWithBuilderProcessor.java | 8 +++++--- .../safeDelete/JavaSafeDeleteProcessor.java | 3 +-- .../com/intellij/refactoring/util/RefactoringUtil.java | 4 +--- .../intellij/psi/impl/search/MethodUsagesSearcher.java | 2 +- .../search/PsiAnnotationMethodReferencesSearcher.java | 2 +- .../src/com/intellij/psi/PsiParameterList.java | 8 ++++++++ .../src/com/intellij/psi/util/PropertyUtilBase.java | 2 +- .../src/com/intellij/psi/util/PsiUtil.java | 3 +-- .../src/com/intellij/codeInsight/ExceptionUtil.java | 2 +- .../src/com/intellij/psi/PsiDiamondTypeImpl.java | 2 +- .../intellij/psi/impl/source/PsiParameterListImpl.java | 10 ++++++++++ .../completion/util/MethodParenthesesHandler.java | 2 +- .../impl/matcher/JavaMatchingVisitor.java | 2 +- .../typeMigration/rules/ListArrayConversionRule.java | 2 +- .../typeMigration/rules/guava/GuavaPredicatesUtil.java | 2 +- .../InterfaceMethodClashesWithObjectInspection.java | 5 +++-- .../com/siyeh/ig/bugs/ObjectToStringInspection.java | 2 +- .../PublicConstructorInNonPublicClassInspection.java | 2 +- .../classlayout/PublicConstructorInspectionBase.java | 2 +- ...tyClassWithoutPrivateConstructorInspectionBase.java | 2 +- .../com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java | 2 +- .../ig/inheritance/RefusedBequestInspectionBase.java | 2 +- .../InstanceVariableInitializationInspection.java | 2 +- .../NumericToStringInspection.java | 2 +- .../internationalization/TimeToStringInspection.java | 2 +- .../ClassWithoutNoArgConstructorInspection.java | 2 +- ...fterClassIsPublicStaticVoidNoArgInspectionBase.java | 2 +- .../BeforeOrAfterIsPublicVoidNoArgInspectionBase.java | 2 +- .../com/siyeh/ig/junit/JUnit5PlatformInspection.java | 2 +- .../ig/junit/MalformedSetUpTearDownInspection.java | 7 +++++-- .../src/com/siyeh/ig/junit/StaticSuiteInspection.java | 2 +- .../TestMethodIsPublicVoidNoArgInspectionBase.java | 6 ++++-- .../ig/junit/UnconstructableTestCaseInspection.java | 2 +- .../src/com/siyeh/ig/memory/SystemGCInspection.java | 2 +- ...meDiffersFromOverriddenParameterInspectionBase.java | 2 +- .../StringBufferToStringInConcatenationInspection.java | 2 +- .../src/com/siyeh/ig/psiutils/ConstructionUtils.java | 4 ++-- .../src/com/siyeh/ig/psiutils/TestUtils.java | 4 ++-- .../src/com/siyeh/ig/psiutils/WeakestTypeFinder.java | 6 ++++-- ...bleWithoutPublicNoArgConstructorInspectionBase.java | 2 +- ...ializableWithUnconstructableAncestorInspection.java | 7 +++++-- .../style/SizeReplaceableByIsEmptyInspectionBase.java | 2 +- .../ig/style/UnnecessaryConstructorInspection.java | 2 +- .../com/siyeh/ig/threading/ThreadRunInspection.java | 2 +- .../threading/ThreadStartInConstructionInspection.java | 2 +- .../ThreadWithDefaultRunMethodInspection.java | 2 +- ...tilityClassWithoutPrivateConstructorInspection.java | 2 +- .../CatchMayIgnoreExceptionInspection.java | 2 +- ...Unit4AnnotatedMethodInJUnit3TestCaseInspection.java | 2 +- .../ig/junit/JUnit5AssertionsConverterInspection.java | 2 +- .../ipp/junit/DataPointHolderConversionIntention.java | 2 +- plugins/devkit/src/dom/impl/LanguageResolvingUtil.java | 2 +- .../QuickFixGetFamilyNameViolationInspection.java | 2 +- .../inspections/RegistrationProblemsInspection.java | 2 +- plugins/devkit/src/util/PsiUtil.java | 4 ++-- .../plugins/groovy/annotator/GroovyAnnotator.java | 3 +-- .../control/GroovyConditionalCanBeElvisInspection.java | 4 ++-- .../groovy/findUsages/GDKSuperMethodSearcher.java | 2 +- .../findUsages/GroovyConstructorUsagesSearcher.java | 2 +- .../psi/expectedTypes/GroovyExpectedTypesProvider.java | 2 +- .../lang/psi/impl/GroovyTargetElementEvaluator.java | 2 +- .../plugins/groovy/lang/psi/util/GdkMethodUtil.java | 2 +- .../groovy/lang/psi/util/GroovyPropertyUtils.java | 2 +- .../plugins/groovy/lang/psi/util/PsiUtil.java | 3 +-- .../groovy/lang/resolve/GrDefaultMethodComparator.java | 4 ++-- .../impl/DelegateTransformationSupport.java | 2 +- .../plugins/groovy/ext/spock/SpockTestFramework.java | 2 +- .../groovy/lang/completion/GroovyCompletionUtil.java | 2 +- .../refactoring/convertToJava/ExpressionGenerator.java | 2 +- .../refactoring/convertToJava/StubGenerator.java | 2 +- .../intellij/codeInspection/i18n/I18nInspection.java | 2 +- .../com/intellij/codeInspection/i18n/JavaI18nUtil.java | 3 +-- .../org/jetbrains/plugins/javaFX/JavaFxEntryPoint.java | 2 +- .../jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java | 10 +++++----- .../JavaFxRelatedItemLineMarkerProvider.java | 2 +- .../inspections/JavaFxImplicitUsageProvider.java | 2 +- .../fxml/refs/JavaFxFactoryReferenceProvider.java | 2 +- .../fxml/refs/JavaFxFieldIdReferenceProvider.java | 2 +- .../intellij/execution/junit/JUnitConfiguration.java | 2 +- .../codeInsight/references/MethodSourceReference.java | 2 +- .../execution/junit2/inspection/JUnitEntryPoint.java | 2 +- .../testng/inspection/JUnitConvertTool.java | 8 ++++---- .../uiDesigner/actions/CreateListenerAction.java | 2 +- .../binding/UIDesignerImplicitUsageProvider.java | 2 +- .../propertyInspector/IntrospectedProperty.java | 2 +- 127 files changed, 187 insertions(+), 164 deletions(-) diff --git a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java index 9b65c38e8249..22901597d974 100644 --- a/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java +++ b/java/execution/impl/src/com/intellij/execution/junit/JUnitUtil.java @@ -101,7 +101,7 @@ public class JUnitUtil { if (!psiMethod.hasModifierProperty(PsiModifier.PUBLIC)) return false; if (!psiMethod.hasModifierProperty(PsiModifier.STATIC)) return false; if (psiMethod.isConstructor()) return false; - if (psiMethod.getParameterList().getParametersCount() > 0) return false; + if (!psiMethod.getParameterList().isEmpty()) return false; final PsiType returnType = psiMethod.getReturnType(); if (returnType == null || returnType instanceof PsiPrimitiveType) return false; return returnType.equalsToText(TEST_INTERFACE) || @@ -137,7 +137,7 @@ public class JUnitUtil { return !isInheritorOrSelfRunner(annotation, RUNNERS_REQUIRE_ANNOTATION_ON_TEST_METHOD); } } - if (psiMethod.getParameterList().getParametersCount() > 0) return false; + if (!psiMethod.getParameterList().isEmpty()) return false; if (psiMethod.hasModifierProperty(PsiModifier.STATIC)) return false; if (!psiMethod.getName().startsWith("test")) return false; if (checkClass) { 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 fe136ed9ddb9..aa0b485e96fc 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 @@ -2843,7 +2843,7 @@ public class HighlightUtil extends HighlightUtilBase { @Nullable static HighlightInfo checkAnnotationMethodParameters(@NotNull PsiParameterList list) { final PsiElement parent = list.getParent(); - if (PsiUtil.isAnnotationMethod(parent) && list.getParametersCount() > 0) { + if (PsiUtil.isAnnotationMethod(parent) && !list.isEmpty()) { final String message = JavaErrorMessages.message("annotation.interface.members.may.not.have.parameters"); final HighlightInfo highlightInfo = HighlightInfo.newHighlightInfo(HighlightInfoType.ERROR).range(list).descriptionAndTooltip(message).create(); diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java index 4ac7d8a69183..31799bc41b8f 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/JavaHighlightUtil.java @@ -44,7 +44,7 @@ public class JavaHighlightUtil { if (containingClass == null) return false; if (method.isConstructor()) { if (isSerializable(containingClass, "java.io.Externalizable") && - method.getParameterList().getParametersCount() == 0 && + method.getParameterList().isEmpty() && method.hasModifierProperty(PsiModifier.PUBLIC)) { return true; } diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ModuleHighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ModuleHighlightUtil.java index 30573d89d0ef..aff924559eba 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ModuleHighlightUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/ModuleHighlightUtil.java @@ -399,7 +399,7 @@ public class ModuleHighlightUtil { PsiMethod provider = ContainerUtil.find( implClass.findMethodsByName("provider", false), - m -> m.hasModifierProperty(PsiModifier.PUBLIC) && m.hasModifierProperty(PsiModifier.STATIC) && m.getParameterList().getParametersCount() == 0); + m -> m.hasModifierProperty(PsiModifier.PUBLIC) && m.hasModifierProperty(PsiModifier.STATIC) && m.getParameterList().isEmpty()); if (provider != null) { PsiType type = provider.getReturnType(); PsiClass typeClass = type instanceof PsiClassType ? ((PsiClassType)type).resolve() : null; diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java index ae403c35ecda..649b924fd194 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/AnonymousCanBeLambdaInspection.java @@ -506,7 +506,7 @@ public class AnonymousCanBeLambdaInspection extends AbstractBaseJavaLocalInspect psiMethod != null && !methodCallExpression.getMethodExpression().isQualified() && "getClass".equals(psiMethod.getName()) && - psiMethod.getParameterList().getParametersCount() == 0) { + psiMethod.getParameterList().isEmpty()) { myBodyContainsForbiddenRefs = true; } } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ProjectBytecodeAnalysis.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ProjectBytecodeAnalysis.java index aa5a42ebb15e..15f1f1c797a6 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ProjectBytecodeAnalysis.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/ProjectBytecodeAnalysis.java @@ -290,7 +290,7 @@ public class ProjectBytecodeAnalysis { Map puritySolutions = puritySolver.solve(); - int arity = owner.getParameterList().getParameters().length; + int arity = owner.getParameterList().getParametersCount(); BytecodeAnalysisConverter.addEffectAnnotations(puritySolutions, result, key, owner.isConstructor()); EKey failureKey = key.withDirection(Throw); diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/InferenceFromSourceUtil.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/InferenceFromSourceUtil.java index d479c902af6c..4e69b731ae03 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/InferenceFromSourceUtil.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/InferenceFromSourceUtil.java @@ -88,7 +88,7 @@ public class InferenceFromSourceUtil { } static boolean suppressNullable(PsiMethod method) { - if (method.getParameterList().getParametersCount() == 0) return false; + if (method.getParameterList().isEmpty()) return false; for (StandardMethodContract contract : ControlFlowAnalyzer.getMethodContracts(method)) { if (contract.returnValue == MethodContract.ValueConstraint.NULL_VALUE) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaExpressionFactory.java b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaExpressionFactory.java index e968c35ebd1b..836d9c4d22e9 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaExpressionFactory.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/value/DfaExpressionFactory.java @@ -220,7 +220,7 @@ public class DfaExpressionFactory { return method; } } - if (method.getParameterList().getParametersCount() == 0) { + if (method.getParameterList().isEmpty()) { if ((ControlFlowAnalyzer.isPure(method) || AnnotationUtil.findAnnotation(method.getContainingClass(), "javax.annotation.concurrent.Immutable") != null) && ControlFlowAnalyzer.getMethodCallContracts(method, null).isEmpty()) { diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionBase.java index d23e04a36818..df76781a00b1 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionBase.java @@ -46,7 +46,6 @@ import com.intellij.psi.search.PsiNonJavaFileReferenceProcessor; import com.intellij.psi.search.PsiSearchHelper; import com.intellij.psi.util.PsiMethodUtil; import com.intellij.util.containers.ContainerUtil; -import java.util.HashMap; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -186,7 +185,7 @@ public class UnusedDeclarationInspectionBase extends GlobalInspectionTool { if (!method.isConstructor()) return false; if (!method.hasModifierProperty(PsiModifier.PUBLIC)) return false; final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) return false; + if (!parameterList.isEmpty()) return false; final PsiClass aClass = method.getContainingClass(); return aClass == null || isExternalizable(aClass, refClass); } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspectionBase.java b/java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspectionBase.java index 69f6fb59e026..38ea7c7ae5fe 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspectionBase.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspectionBase.java @@ -118,7 +118,7 @@ abstract class DeprecationInspectionBase extends AbstractBaseJavaLocalInspection PsiMethod constructor = result == null ? null : result.getElement(); if (constructor != null && expression.getClassOrAnonymousClassReference() != null) { - if (expression.getClassReference() == null && constructor.getParameterList().getParametersCount() == 0) return; + if (expression.getClassReference() == null && constructor.getParameterList().isEmpty()) return; checkDeprecated(constructor, expression.getClassOrAnonymousClassReference(), null, myIgnoreInsideDeprecated, myIgnoreImportStatements, true, myIgnoreInSameOutermostClass, myHolder, myForRemoval, myHighlightType); } @@ -203,7 +203,7 @@ abstract class DeprecationInspectionBase extends AbstractBaseJavaLocalInspection private static boolean hasDefaultDeprecatedConstructor(PsiClass superClass, boolean forRemoval) { return superClass != null && Arrays.stream(superClass.getConstructors()) - .anyMatch(constructor -> constructor.getParameterList().getParametersCount() == 0 && + .anyMatch(constructor -> constructor.getParameterList().isEmpty() && constructor.isDeprecated() && isMarkedForRemoval(constructor, forRemoval)); } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/java19modules/Java9ModuleEntryPoint.java b/java/java-analysis-impl/src/com/intellij/codeInspection/java19modules/Java9ModuleEntryPoint.java index 3329d6334d5f..e3b6367254a3 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/java19modules/Java9ModuleEntryPoint.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/java19modules/Java9ModuleEntryPoint.java @@ -134,13 +134,13 @@ public class Java9ModuleEntryPoint extends EntryPointWithVisibilityLevel { private static boolean isDefaultConstructor(@NotNull PsiMethod method) { return method.isConstructor() && - method.getParameterList().getParametersCount() == 0 && + method.getParameterList().isEmpty() && method.hasModifierProperty(PsiModifier.PUBLIC); } private static boolean isProviderMethod(@NotNull PsiMethod method) { return "provider".equals(method.getName()) && - method.getParameterList().getParametersCount() == 0 && + method.getParameterList().isEmpty() && method.hasModifierProperty(PsiModifier.PUBLIC) && method.hasModifierProperty(PsiModifier.STATIC); } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaModuleImpl.java b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaModuleImpl.java index f178b6b45e0a..114d4eb5c5f3 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaModuleImpl.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/reference/RefJavaModuleImpl.java @@ -278,6 +278,6 @@ public class RefJavaModuleImpl extends RefElementImpl implements RefJavaModule { final PsiMethod[] methods = psiClass.findMethodsByName("provider", false); return ContainerUtil.find(methods, m -> m.hasModifierProperty(PsiModifier.PUBLIC) && m.hasModifierProperty(PsiModifier.STATIC) && - m.getParameterList().getParametersCount() == 0); + m.getParameterList().isEmpty()); } } diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java index d5b8b38b1eb7..129fd97f1d53 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java @@ -146,7 +146,7 @@ public class ClassHasNoToStringMethodInspection extends AbstractToStringInspecti final PsiMethod[] toStringMethods = clazz.findMethodsByName("toString", false); for (PsiMethod method : toStringMethods) { final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { // toString() method found return; } @@ -154,7 +154,7 @@ public class ClassHasNoToStringMethodInspection extends AbstractToStringInspecti final PsiMethod[] superMethods = clazz.findMethodsByName("toString", true); for (PsiMethod method : superMethods) { final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { continue; } if (method.hasModifierProperty(PsiModifier.FINAL)) { 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 4625b98f3d20..aa3a1c411242 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 @@ -74,7 +74,7 @@ public class FieldNotUsedInToStringInspection extends AbstractToStringInspection return; } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { return; } final PsiType returnType = method.getReturnType(); 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 6069c93e4458..34d138068630 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 @@ -464,7 +464,7 @@ public class PsiAdapter { return false; } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { return false; } return true; @@ -598,7 +598,7 @@ public class PsiAdapter { // must not have a parameter PsiParameterList parameters = method.getParameterList(); - if (parameters.getParametersCount() != 0) { + if (!parameters.isEmpty()) { continue; } diff --git a/java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java b/java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java index e8a6384ae034..5b107321e5a2 100644 --- a/java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java +++ b/java/java-impl/src/com/intellij/codeInsight/JavaTargetElementEvaluator.java @@ -270,7 +270,7 @@ public class JavaTargetElementEvaluator extends TargetElementEvaluatorEx2 implem public PsiElement getGotoDeclarationTarget(@NotNull final PsiElement element, @Nullable final PsiElement navElement) { if (navElement == element && element instanceof PsiCompiledElement && element instanceof PsiMethod) { PsiMethod method = (PsiMethod)element; - if (method.isConstructor() && method.getParameterList().getParametersCount() == 0) { + if (method.isConstructor() && method.getParameterList().isEmpty()) { PsiClass aClass = method.getContainingClass(); PsiElement navClass = aClass == null ? null : aClass.getNavigationElement(); if (aClass != navClass) return navClass; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ChainedCallCompletion.java b/java/java-impl/src/com/intellij/codeInsight/completion/ChainedCallCompletion.java index b497d44797da..e03c26085f6d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/ChainedCallCompletion.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/ChainedCallCompletion.java @@ -52,7 +52,7 @@ class ChainedCallCompletion { return; } - if (object instanceof PsiMethod && ((PsiMethod)object).getParameterList().getParametersCount() > 0) { + if (object instanceof PsiMethod && !((PsiMethod)object).getParameterList().isEmpty()) { return; } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/CollectConversion.java b/java/java-impl/src/com/intellij/codeInsight/completion/CollectConversion.java index d3c18c80173d..561b1e3374ff 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/CollectConversion.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/CollectConversion.java @@ -192,7 +192,7 @@ class CollectConversion { PsiMethodCallExpression innerCall = (PsiMethodCallExpression)args[0]; PsiMethod collectorMethod = innerCall.resolveMethod(); - if (collectorMethod != null && collectorMethod.getParameterList().getParametersCount() > 0) { + if (collectorMethod != null && !collectorMethod.getParameterList().isEmpty()) { context.getEditor().getCaretModel().moveToOffset(innerCall.getArgumentList().getFirstChild().getTextRange().getEndOffset()); } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java index bba321e6247f..d734d484f56a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/ConstructorInsertHandler.java @@ -243,7 +243,7 @@ public class ConstructorInsertHandler implements InsertHandler 0 : hasConstructorParameters(psiClass, place); + boolean hasParams = constructor != null ? !constructor.getParameterList().isEmpty() : hasConstructorParameters(psiClass, place); RangeMarker refEnd = context.getDocument().createRangeMarker(context.getTailOffset(), context.getTailOffset()); @@ -264,7 +264,7 @@ public class ConstructorInsertHandler implements InsertHandler 0) { + if (!constructor.getParameterList().isEmpty()) { hasParams = true; break; } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java index 9f0968be3427..a052a14ce447 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaKeywordCompletion.java @@ -795,7 +795,7 @@ public class JavaKeywordCompletion { if (superClass != null) { for (final PsiMethod psiMethod : superClass.getConstructors()) { final PsiResolveHelper resolveHelper = JavaPsiFacade.getInstance(method.getProject()).getResolveHelper(); - if (resolveHelper.isAccessible(psiMethod, method, null) && psiMethod.getParameterList().getParameters().length > 0) { + if (resolveHelper.isAccessible(psiMethod, method, null) && !psiMethod.getParameterList().isEmpty()) { return true; } } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodCallElement.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodCallElement.java index 463768c1fa42..942005696a8f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodCallElement.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodCallElement.java @@ -248,7 +248,7 @@ public class JavaMethodCallElement extends LookupItem implements Type } public static boolean startArgumentLiveTemplate(InsertionContext context, PsiMethod method) { - if (method.getParameterList().getParametersCount() == 0 || + if (method.getParameterList().isEmpty() || context.getCompletionChar() == Lookup.COMPLETE_STATEMENT_SELECT_CHAR || !ParameterInfoController.areParameterTemplatesEnabledOnCompletion()) { return false; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java index d4ded5ed4654..9e50b6c8d35c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaMethodMergingContributor.java @@ -90,7 +90,7 @@ public class JavaMethodMergingContributor extends CompletionContributor { private static int getPriority(LookupElement element) { PsiMethod method = assertNotNull(getItemMethod(element)); return (PsiType.VOID.equals(method.getReturnType()) ? 0 : 1) + - (method.getParameterList().getParametersCount() > 0 ? 2 : 0); + (method.getParameterList().isEmpty() ? 0 : 2); } @Nullable diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/SlowerTypeConversions.java b/java/java-impl/src/com/intellij/codeInsight/completion/SlowerTypeConversions.java index a6856cd68f09..4b24b3f55655 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/SlowerTypeConversions.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/SlowerTypeConversions.java @@ -120,7 +120,7 @@ class SlowerTypeConversions implements Runnable { final PsiMethod method = (PsiMethod)o; final PsiType type = method.getReturnType(); if (PsiType.VOID.equals(type) || PsiType.NULL.equals(type)) return null; - if (method.getParameterList().getParametersCount() > 0) return null; + if (!method.getParameterList().isEmpty()) return null; return method.getName() + "(" + getSpace(CodeStyleSettingsManager.getSettings(method.getProject()) .getCommonSettings(JavaLanguage.INSTANCE).SPACE_WITHIN_METHOD_CALL_PARENTHESES) + ")"; diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java b/java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java index de4830b1be52..2d5043519608 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java @@ -30,7 +30,10 @@ import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; +import java.util.Set; /** * @author peter @@ -90,7 +93,7 @@ public abstract class StaticMemberProcessor { return createLookupElement(method, containingClass, shouldImport); } - if (overloads.get(0).getParameterList().getParametersCount() == 0) { + if (overloads.get(0).getParameterList().isEmpty()) { overloads.add(0, overloads.remove(1)); } return createLookupElement(overloads, containingClass, shouldImport); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java index 3b0719666f75..189ef5ab8a45 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java @@ -360,7 +360,7 @@ public class JavaLineMarkerProvider extends LineMarkerProviderDescriptor { private static boolean isServiceProviderMethod(@NotNull PsiMethod method) { return "provider".equals(method.getName()) && - method.getParameterList().getParametersCount() == 0 && + method.getParameterList().isEmpty() && method.hasModifierProperty(PsiModifier.PUBLIC) && method.hasModifierProperty(PsiModifier.STATIC); } diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java index 097ece18a2bd..8d2822e8a481 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateClassFromNewFix.java @@ -147,7 +147,7 @@ public class CreateClassFromNewFix extends CreateFromUsageBaseFix { boolean hasDefaultConstructor = false; for (PsiMethod superConstructor : constructors) { - if (superConstructor.getParameterList().getParametersCount() == 0) { + if (superConstructor.getParameterList().isEmpty()) { hasDefaultConstructor = true; supConstructor = null; break; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefineParamsDefaultValueAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefineParamsDefaultValueAction.java index 04d941ce97f1..30b2a42f7c35 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefineParamsDefaultValueAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DefineParamsDefaultValueAction.java @@ -80,7 +80,7 @@ public class DefineParamsDefaultValueAction extends PsiElementBaseIntentionActio } final PsiMethod method = (PsiMethod)parent; final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { return false; } final PsiClass containingClass = method.getContainingClass(); diff --git a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java index ef25e38aac4c..edf78ed8fb9a 100644 --- a/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java +++ b/java/java-impl/src/com/intellij/codeInsight/hint/api/impls/MethodParameterInfoHandler.java @@ -226,7 +226,7 @@ public class MethodParameterInfoHandler implements ParameterInfoHandlerWithTabAc PsiElement e = ((CandidateInfo)c).getElement(); if (!(e instanceof PsiMethod)) return false; PsiMethod m = (PsiMethod)e; - return m.getParameterList().getParametersCount() == 0 && m.getName().equals(methodName); + return m.getParameterList().isEmpty() && m.getName().equals(methodName); }) != null; } diff --git a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java index 8b8bf484f653..82317aa2c850 100644 --- a/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/intention/impl/CreateSubclassAction.java @@ -347,7 +347,7 @@ public class CreateSubclassAction extends BaseIntentionAction { boolean hasNonTrivialConstructor = false; final PsiMethod[] constructors = psiClass.getConstructors(); for (PsiMethod constructor : constructors) { - if (constructor.getParameterList().getParametersCount() > 0) { + if (!constructor.getParameterList().isEmpty()) { hasNonTrivialConstructor = true; break; } diff --git a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java index ea94587775d0..ed4d97cff63c 100644 --- a/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java +++ b/java/java-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java @@ -1078,7 +1078,7 @@ public class JavaDocInfoGenerator { PsiClass parentClass = method.getContainingClass(); if (parentClass != null && parentClass.isEnum()) { PsiParameterList parameterList = method.getParameterList(); - if (method.getName().equals("values") && parameterList.getParametersCount() == 0) { + if (method.getName().equals("values") && parameterList.isEmpty()) { return loadSyntheticDocComment(method, "/javadoc/EnumValues.java.template"); } if (method.getName().equals("valueOf") && diff --git a/java/java-impl/src/com/intellij/codeInspection/CapturingCleanerInspection.java b/java/java-impl/src/com/intellij/codeInspection/CapturingCleanerInspection.java index 64c0ccb89424..f24574e58195 100644 --- a/java/java-impl/src/com/intellij/codeInspection/CapturingCleanerInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/CapturingCleanerInspection.java @@ -88,7 +88,7 @@ public class CapturingCleanerInspection extends AbstractBaseJavaLocalInspectionT } if (runnableExpr instanceof PsiLambdaExpression) { PsiLambdaExpression lambda = (PsiLambdaExpression)runnableExpr; - if (lambda.getParameterList().getParametersCount() != 0) return null; + if (!lambda.getParameterList().isEmpty()) return null; PsiElement lambdaBody = lambda.getBody(); if (lambdaBody == null) return null; return getLambdaElementCapturingThis(lambdaBody, trackedClass).orElse(null); diff --git a/java/java-impl/src/com/intellij/codeInspection/RedundantStreamOptionalCallInspection.java b/java/java-impl/src/com/intellij/codeInspection/RedundantStreamOptionalCallInspection.java index 6ce0a2f91132..5645bf6d66d9 100644 --- a/java/java-impl/src/com/intellij/codeInspection/RedundantStreamOptionalCallInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/RedundantStreamOptionalCallInspection.java @@ -198,7 +198,7 @@ public class RedundantStreamOptionalCallInspection extends AbstractBaseJavaLocal if (aClass == null) return false; PsiType primitiveCandidate = null; PsiParameterList list = method.getParameterList(); - if (list.getParametersCount() == 0) { + if (list.isEmpty()) { primitiveCandidate = method.getReturnType(); } else if (list.getParametersCount() == 1) { diff --git a/java/java-impl/src/com/intellij/codeInspection/ReplaceInefficientStreamCountInspection.java b/java/java-impl/src/com/intellij/codeInspection/ReplaceInefficientStreamCountInspection.java index fd3e8424f023..712c7e0f47c6 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ReplaceInefficientStreamCountInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/ReplaceInefficientStreamCountInspection.java @@ -110,7 +110,7 @@ public class ReplaceInefficientStreamCountInspection extends AbstractBaseJavaLoc PsiMethodReferenceExpression methodRef = (PsiMethodReferenceExpression)function; if (!STREAM_METHOD.equals(methodRef.getReferenceName())) return false; PsiMethod method = ObjectUtils.tryCast(methodRef.resolve(), PsiMethod.class); - if (method != null && STREAM_METHOD.equals(method.getName()) && method.getParameterList().getParametersCount() == 0) { + if (method != null && STREAM_METHOD.equals(method.getName()) && method.getParameterList().isEmpty()) { final PsiClass containingClass = method.getContainingClass(); if (containingClass != null && CommonClassNames.JAVA_UTIL_COLLECTION.equals(containingClass.getQualifiedName())) { return true; diff --git a/java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java b/java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java index 7f38caf61325..7eadc3286564 100644 --- a/java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/SimplifyOptionalCallChainsInspection.java @@ -74,7 +74,7 @@ public class SimplifyOptionalCallChainsInspection extends AbstractBaseJavaLocalI else if (OPTIONAL_OR_ELSE_GET.test(call)) { useOrElseGet = true; PsiLambdaExpression lambda = getLambda(call.getArgumentList().getExpressions()[0]); - if (lambda == null || lambda.getParameterList().getParametersCount() != 0) return; + if (lambda == null || !lambda.getParameterList().isEmpty()) return; falseArg = LambdaUtil.extractSingleExpressionFromBody(lambda.getBody()); } if (falseArg == null) return; @@ -184,7 +184,7 @@ public class SimplifyOptionalCallChainsInspection extends AbstractBaseJavaLocalI } if (OPTIONAL_OR_ELSE_GET.test(call)) { PsiLambdaExpression lambda = getLambda(call.getArgumentList().getExpressions()[0]); - if (lambda == null || lambda.getParameterList().getParametersCount() != 0) return null; + if (lambda == null || !lambda.getParameterList().isEmpty()) return null; return LambdaUtil.extractSingleExpressionFromBody(lambda.getBody()); } return null; diff --git a/java/java-impl/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java b/java/java-impl/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java index db6dddc4de44..7642c7244506 100644 --- a/java/java-impl/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/SimplifyStreamApiCallChainsInspection.java @@ -753,7 +753,7 @@ public class SimplifyStreamApiCallChainsInspection extends AbstractBaseJavaLocal PsiMethodReferenceExpression methodRef = tryCast(call.getArgumentList().getExpressions()[0], PsiMethodReferenceExpression.class); if (methodRef == null || !methodRef.isConstructor()) return null; PsiMethod ctor = tryCast(methodRef.resolve(), PsiMethod.class); - if (ctor == null || ctor.getParameterList().getParametersCount() != 0) return null; + if (ctor == null || !ctor.getParameterList().isEmpty()) return null; PsiClass aClass = ctor.getContainingClass(); if (aClass == null) return null; String name = aClass.getQualifiedName(); diff --git a/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java b/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java index 6bfdf5deca70..b8fff9d163c3 100644 --- a/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java +++ b/java/java-impl/src/com/intellij/ide/actions/JavaQualifiedNameProvider.java @@ -270,7 +270,7 @@ public class JavaQualifiedNameProvider implements QualifiedNameProvider { } int caretOffset = rangeMarker.getEndOffset(); - if (element instanceof PsiMethod && ((PsiMethod)element).getParameterList().getParametersCount() != 0 && StringUtil.endsWithChar(suffix,')')) { + if (element instanceof PsiMethod && !((PsiMethod)element).getParameterList().isEmpty() && StringUtil.endsWithChar(suffix,')')) { caretOffset --; } editor.getCaretModel().moveToOffset(caretOffset); diff --git a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java index 192cd6dee56c..f0d9478bebc6 100644 --- a/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java +++ b/java/java-impl/src/com/intellij/refactoring/convertToInstanceMethod/ConvertToInstanceMethodHandler.java @@ -92,7 +92,7 @@ public class ConvertToInstanceMethodHandler implements RefactoringActionHandler String className = containingClass.getName(); PsiMethod[] constructors = containingClass.getConstructors(); boolean noArgConstructor = - constructors.length == 0 || Arrays.stream(constructors).anyMatch(constructor -> constructor.getParameterList().getParametersCount() == 0); + constructors.length == 0 || Arrays.stream(constructors).anyMatch(constructor -> constructor.getParameterList().isEmpty()); if (noArgConstructor) { targetQualifiers.add("this / new " + className + "()"); } 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 93f87f838f6a..f9402ac73443 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java @@ -598,7 +598,7 @@ public class ExtractMethodObjectProcessor extends BaseRefactoringProcessor { } private boolean notHasGeneratedFields() { - return !myMultipleExitPoints && getMethod().getParameterList().getParametersCount() == 0; + return !myMultipleExitPoints && getMethod().getParameterList().isEmpty(); } private void createInnerClassConstructor(final PsiParameter[] parameters) throws IncorrectOperationException { diff --git a/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java index 530235bd90fe..60ebc3508161 100644 --- a/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inline/InlineToAnonymousClassProcessor.java @@ -204,7 +204,7 @@ public class InlineToAnonymousClassProcessor extends BaseRefactoringProcessor { final PsiElement resolved = methodExpression.resolve(); if (resolved instanceof PsiMethod) { final PsiMethod method = (PsiMethod)resolved; - if ("getClass".equals(method.getName()) && method.getParameterList().getParametersCount() == 0) { + if ("getClass".equals(method.getName()) && method.getParameterList().isEmpty()) { result.putValue(methodExpression, "Result of getClass() invocation would be changed"); } } diff --git a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java index cea7abfa6c0c..1491dd78ad22 100644 --- a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/InlineSuperClassRefactoringProcessor.java @@ -41,7 +41,6 @@ import com.intellij.usageView.UsageViewDescriptor; import com.intellij.util.ArrayUtilRt; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; -import java.util.HashMap; import com.intellij.util.containers.MultiMap; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -193,7 +192,7 @@ public class InlineSuperClassRefactoringProcessor extends FixableUsagesRefactori //insert implicit call to super for (PsiMethod superConstructor : superConstructors) { - if (superConstructor.getParameterList().getParametersCount() == 0) { + if (superConstructor.getParameterList().isEmpty()) { final PsiExpression expression = JavaPsiFacade.getElementFactory(myProject).createExpressionFromText("super()", constructor); usages.add(new InlineSuperCallUsageInfo((PsiMethodCallExpression)expression, constrBody)); } @@ -203,7 +202,7 @@ public class InlineSuperClassRefactoringProcessor extends FixableUsagesRefactori if (targetClass.getConstructors().length == 0) { //copy default constructor for (PsiMethod superConstructor : superConstructors) { - if (superConstructor.getParameterList().getParametersCount() == 0) { + if (superConstructor.getParameterList().isEmpty()) { usages.add(new CopyDefaultConstructorUsageInfo(targetClass, superConstructor)); break; } diff --git a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceConstructorUsageInfo.java b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceConstructorUsageInfo.java index 897abca9d9e3..a3835892ff02 100644 --- a/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceConstructorUsageInfo.java +++ b/java/java-impl/src/com/intellij/refactoring/inlineSuperClass/usageInfo/ReplaceConstructorUsageInfo.java @@ -20,7 +20,6 @@ import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.*; import com.intellij.psi.util.TypeConversionUtil; import com.intellij.refactoring.util.FixableUsageInfo; -import com.intellij.util.Function; import com.intellij.util.IncorrectOperationException; public class ReplaceConstructorUsageInfo extends FixableUsageInfo{ @@ -35,7 +34,7 @@ public class ReplaceConstructorUsageInfo extends FixableUsageInfo{ final PsiMethod constructor = element.resolveConstructor(); if (constructor == null) { if (element.getArgumentList() != null) { - if (constructors.length == 1 && constructors[0].getParameterList().getParametersCount() > 0 || constructors.length > 1) { + if (constructors.length == 1 && !constructors[0].getParameterList().isEmpty() || constructors.length > 1) { myConflict = CONSTRUCTOR_MATCHING_SUPER_NOT_FOUND; } } diff --git a/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java b/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java index 70d25b51b54b..e42d5e0665a5 100644 --- a/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java +++ b/java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java @@ -39,7 +39,6 @@ import com.intellij.refactoring.util.classMembers.ClassMemberReferencesVisitor; import com.intellij.refactoring.util.classMembers.MemberInfo; import com.intellij.util.IncorrectOperationException; import com.intellij.util.VisibilityUtil; -import java.util.HashMap; import org.jetbrains.annotations.Nullable; import java.util.*; @@ -655,7 +654,7 @@ public class JavaPullUpHelper implements PullUpHelper { } // check default constructor - if (constructor == null || constructor.getParameterList().getParametersCount() == 0) { + if (constructor == null || constructor.getParameterList().isEmpty()) { RefactoringUtil.visitImplicitSuperConstructorUsages(mySourceClass, new RefactoringUtil.ImplicitConstructorUsageVisitor() { public void visitConstructor(PsiMethod constructor, PsiMethod baseConstructor) { referencingSubConstructors.add(constructor); 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 b669905144ec..64ceb289aa0e 100644 --- a/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/replaceConstructorWithBuilder/ReplaceConstructorWithBuilderProcessor.java @@ -18,7 +18,6 @@ package com.intellij.refactoring.replaceConstructorWithBuilder; 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; @@ -30,7 +29,10 @@ 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.*; +import com.intellij.psi.util.PropertyUtilBase; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.util.PsiUtil; +import com.intellij.psi.util.TypeConversionUtil; import com.intellij.refactoring.MoveDestination; import com.intellij.refactoring.replaceConstructorWithBuilder.usageInfo.ReplaceConstructorWithSettersChainInfo; import com.intellij.refactoring.util.FixableUsageInfo; @@ -250,7 +252,7 @@ public class ReplaceConstructorWithBuilderProcessor extends FixableUsagesRefacto PsiMethod constructor = getMostCommonConstructor(); if (constructor == null){ constructor = myConstructors[0]; - if (constructor.getParameterList().getParametersCount() == 0) { + if (constructor.getParameterList().isEmpty()) { constructor = myConstructors[1]; } } 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 4125481d5121..b0240c618a83 100644 --- a/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/JavaSafeDeleteProcessor.java @@ -53,7 +53,6 @@ import com.intellij.usages.*; import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; -import java.util.HashMap; import com.intellij.util.containers.MultiMap; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.annotations.NotNull; @@ -773,7 +772,7 @@ public class JavaSafeDeleteProcessor extends SafeDeleteProcessorDelegateBase { } private static boolean isTheOnlyEmptyDefaultConstructor(final PsiMethod constructor) { - if (constructor.getParameterList().getParameters().length > 0) return false; + if (!constructor.getParameterList().isEmpty()) return false; final PsiCodeBlock body = constructor.getBody(); if (body != null && body.getStatements().length > 0) return false; return constructor.getContainingClass().getConstructors().length == 1; diff --git a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java index df6ddb3864aa..ac940afcd199 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java +++ b/java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java @@ -50,8 +50,6 @@ import com.intellij.refactoring.introduceField.ElementToWorkOn; import com.intellij.refactoring.introduceVariable.IntroduceVariableBase; import com.intellij.util.IncorrectOperationException; import com.intellij.util.ObjectUtils; -import java.util.HashMap; -import java.util.HashSet; import com.intellij.util.text.UniqueNameGenerator; import gnu.trove.THashMap; import one.util.streamex.StreamEx; @@ -757,7 +755,7 @@ public class RefactoringUtil { private static PsiMethod findDefaultConstructor(final PsiClass aClass) { final PsiMethod[] constructors = aClass.getConstructors(); for (PsiMethod constructor : constructors) { - if (constructor.getParameterList().getParametersCount() == 0) return constructor; + if (constructor.getParameterList().isEmpty()) return constructor; } return null; diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java index 3a08325c0e23..0bfad2339218 100644 --- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java +++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/MethodUsagesSearcher.java @@ -51,7 +51,7 @@ public class MethodUsagesSearcher extends QueryExecutorBase { boolean isValueMethod = - PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME.equals(method.getName()) && method.getParameterList().getParametersCount() == 0; + PsiAnnotation.DEFAULT_REFERENCED_METHOD_NAME.equals(method.getName()) && method.getParameterList().isEmpty(); return isValueMethod ? method.getContainingClass() : null; }); if (containingClass != null) { diff --git a/java/java-psi-api/src/com/intellij/psi/PsiParameterList.java b/java/java-psi-api/src/com/intellij/psi/PsiParameterList.java index 957700bc352a..af0f5d9e1557 100644 --- a/java/java-psi-api/src/com/intellij/psi/PsiParameterList.java +++ b/java/java-psi-api/src/com/intellij/psi/PsiParameterList.java @@ -41,4 +41,12 @@ public interface PsiParameterList extends PsiElement { * Returns the number of parameters (excluding type annotation receiver). */ int getParametersCount(); + + /** + * @return true if this parameter list has no parameters (excluding type annotation receiver). + * @since 2018.1 + */ + default boolean isEmpty() { + return getParametersCount() == 0; + } } diff --git a/java/java-psi-api/src/com/intellij/psi/util/PropertyUtilBase.java b/java/java-psi-api/src/com/intellij/psi/util/PropertyUtilBase.java index d1956c6870b0..c3ced3bc34ca 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/PropertyUtilBase.java +++ b/java/java-psi-api/src/com/intellij/psi/util/PropertyUtilBase.java @@ -270,7 +270,7 @@ public class PropertyUtilBase { @Contract("null -> false") public static boolean isSimplePropertyGetter(@Nullable PsiMethod method) { - return hasGetterName(method) && method.getParameterList().getParametersCount() == 0; + return hasGetterName(method) && method.getParameterList().isEmpty(); } diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java index 8ac196d4b23a..38c0501e6269 100644 --- a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java +++ b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java @@ -28,7 +28,6 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.TimeoutUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.EmptyIterable; -import java.util.HashMap; import gnu.trove.THashSet; import org.intellij.lang.annotations.MagicConstant; import org.jetbrains.annotations.Contract; @@ -1029,7 +1028,7 @@ public final class PsiUtil extends PsiUtilCore { for (PsiMethod cls: constructors) { if ((!checkModifiers || cls.hasModifierProperty(PsiModifier.PUBLIC) || allowProtected && cls.hasModifierProperty(PsiModifier.PROTECTED)) && - cls.getParameterList().getParametersCount() == 0) { + cls.getParameterList().isEmpty()) { return true; } } diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java b/java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java index 8e7574a057f2..24e5a89dae99 100644 --- a/java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java +++ b/java/java-psi-impl/src/com/intellij/codeInsight/ExceptionUtil.java @@ -296,7 +296,7 @@ public class ExceptionUtil { final PsiMethod[] superConstructors = superClass == null ? PsiMethod.EMPTY_ARRAY : superClass.getConstructors(); Set unhandled = new HashSet<>(); for (PsiMethod superConstructor : superConstructors) { - if (!superConstructor.hasModifierProperty(PsiModifier.PRIVATE) && superConstructor.getParameterList().getParametersCount() == 0) { + if (!superConstructor.hasModifierProperty(PsiModifier.PRIVATE) && superConstructor.getParameterList().isEmpty()) { final PsiClassType[] exceptionTypes = superConstructor.getThrowsList().getReferencedTypes(); for (PsiClassType exceptionType : exceptionTypes) { if (!isUncheckedException(exceptionType) && !isHandled(element, exceptionType, topElement)) { diff --git a/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java index 9f199868febd..1af8d2f5ed12 100644 --- a/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java @@ -471,7 +471,7 @@ public class PsiDiamondTypeImpl extends PsiDiamondType { public static boolean hasDefaultConstructor(@NotNull final PsiClass psiClass) { final PsiMethod[] constructors = psiClass.getConstructors(); for (PsiMethod method : constructors) { - if (method.getParameterList().getParametersCount() == 0) return true; + if (method.getParameterList().isEmpty()) return true; } return constructors.length == 0; } diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterListImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterListImpl.java index f8aa2b10f7d0..200fc95498db 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterListImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiParameterListImpl.java @@ -67,6 +67,16 @@ public class PsiParameterListImpl extends JavaStubPsiElement child.getStubType() == JavaStubElementTypes.PARAMETER); + } + + return getNode().findChildByType(Constants.PARAMETER_BIT_SET) == null; + } + @Override public void accept(@NotNull PsiElementVisitor visitor){ if (visitor instanceof JavaElementVisitor) { diff --git a/java/openapi/src/com/intellij/codeInsight/completion/util/MethodParenthesesHandler.java b/java/openapi/src/com/intellij/codeInsight/completion/util/MethodParenthesesHandler.java index e1f83cb2707f..e9914a6d4bc2 100644 --- a/java/openapi/src/com/intellij/codeInsight/completion/util/MethodParenthesesHandler.java +++ b/java/openapi/src/com/intellij/codeInsight/completion/util/MethodParenthesesHandler.java @@ -38,7 +38,7 @@ public class MethodParenthesesHandler extends ParenthesesInsertHandler 0; + boolean hasParams = !method.getParameterList().isEmpty(); if (overloadsMatter){ hasParams |= hasOverloads(allItems, method); } diff --git a/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java index 71fdfcab2a4b..354239dbd1dc 100644 --- a/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java +++ b/java/structuralsearch-java/src/com/intellij/structuralsearch/impl/matcher/JavaMatchingVisitor.java @@ -369,7 +369,7 @@ public class JavaMatchingVisitor extends JavaElementVisitor { final PsiLambdaExpression expression2 = (PsiLambdaExpression)other; boolean result = true; final PsiParameterList parameterList1 = expression.getParameterList(); - if (parameterList1.getParametersCount() != 0) { + if (!parameterList1.isEmpty()) { result = myMatchingVisitor.matchSons(parameterList1, expression2.getParameterList()); } final PsiElement body1 = getElementToMatch(expression.getBody()); diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ListArrayConversionRule.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ListArrayConversionRule.java index 68ad5c8b67f1..09cd9e8b5592 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ListArrayConversionRule.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/ListArrayConversionRule.java @@ -147,7 +147,7 @@ public class ListArrayConversionRule extends TypeConversionRule { PsiArrayType arrayType) { @NonNls final String methodName = method.getName(); if (methodName.equals("toArray")) { - if (method.getParameterList().getParameters().length == 0) { + if (method.getParameterList().isEmpty()) { return new TypeConversionDescriptor("$qualifier$.toArray()", "$qualifier$"); } return new TypeConversionDescriptor("$qualifier$.toArray($expr$)", "$qualifier$"); diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaPredicatesUtil.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaPredicatesUtil.java index 7736dc623402..8eafcf3db8e7 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaPredicatesUtil.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/GuavaPredicatesUtil.java @@ -120,7 +120,7 @@ public class GuavaPredicatesUtil { if (method == null) return false; final PsiParameterList parameters = method.getParameterList(); if (parameters.getParametersCount() != 1) { - return parameters.getParametersCount() != 0; + return !parameters.isEmpty(); } final PsiParameter parameter = parameters.getParameters()[0]; final PsiType type = parameter.getType(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/InterfaceMethodClashesWithObjectInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/InterfaceMethodClashesWithObjectInspection.java index cd1f48473a35..b628471c5d7e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/InterfaceMethodClashesWithObjectInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/abstraction/InterfaceMethodClashesWithObjectInspection.java @@ -20,7 +20,8 @@ import com.intellij.psi.PsiClass; import com.intellij.psi.PsiClassType; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiType; -import com.siyeh.InspectionGadgetsBundle;import com.siyeh.ig.BaseInspection; +import com.siyeh.InspectionGadgetsBundle; +import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -57,7 +58,7 @@ public class InterfaceMethodClashesWithObjectInspection extends BaseInspection { @Override public void visitMethod(PsiMethod method) { super.visitMethod(method); - if (method.getParameterList().getParametersCount() != 0) { + if (!method.getParameterList().isEmpty()) { return; } final PsiClass aClass = method.getContainingClass(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectToStringInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectToStringInspection.java index b65f6ac0c98f..f740e24c27a5 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectToStringInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/bugs/ObjectToStringInspection.java @@ -187,7 +187,7 @@ public class ObjectToStringInspection extends BaseInspection { continue; } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { return true; } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/PublicConstructorInNonPublicClassInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/PublicConstructorInNonPublicClassInspection.java index fdab49760f92..f3c006ff7fac 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/PublicConstructorInNonPublicClassInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/PublicConstructorInNonPublicClassInspection.java @@ -116,7 +116,7 @@ public class PublicConstructorInNonPublicClassInspection extends BaseInspection } if (SerializationUtils.isExternalizable(containingClass)) { final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { return; } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/PublicConstructorInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/PublicConstructorInspectionBase.java index ef9c1fbcebea..1a72308d145d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/PublicConstructorInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/PublicConstructorInspectionBase.java @@ -72,7 +72,7 @@ public class PublicConstructorInspectionBase extends BaseInspection { } if (SerializationUtils.isExternalizable(aClass)) { final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { return; } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspectionBase.java index 8eac839fafff..10a9e7c809dd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspectionBase.java @@ -27,7 +27,7 @@ public class UtilityClassWithoutPrivateConstructorInspectionBase extends BaseIns final PsiMethod[] constructors = aClass.getConstructors(); for (final PsiMethod constructor : constructors) { final PsiParameterList params = constructor.getParameterList(); - if (params.getParametersCount() == 0) { + if (params.isEmpty()) { return constructor; } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java index bab82a795659..26f138955f7d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/ConvertToVarargsMethodFix.java @@ -60,7 +60,7 @@ public class ConvertToVarargsMethodFix extends InspectionGadgetsFix { private static void makeMethodVarargs(PsiMethod method) { final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { return; } final PsiParameter[] parameters = parameterList.getParameters(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RefusedBequestInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RefusedBequestInspectionBase.java index a378d8b82102..b7ded8df3a7e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RefusedBequestInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/inheritance/RefusedBequestInspectionBase.java @@ -148,7 +148,7 @@ public class RefusedBequestInspectionBase extends BaseInspection { if (!"setUp".equals(name) && !"tearDown".equals(name)) { return false; } - if (method.getParameterList().getParametersCount() != 0) { + if (!method.getParameterList().isEmpty()) { return false; } final PsiClass aClass = method.getContainingClass(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/InstanceVariableInitializationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/InstanceVariableInitializationInspection.java index b49f562ed545..dce52598a8d4 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/InstanceVariableInitializationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/initialization/InstanceVariableInitializationInspection.java @@ -162,7 +162,7 @@ public class InstanceVariableInitializationInspection extends BaseInspection { } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { continue; } if (PsiType.VOID.equals(method.getReturnType())) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/NumericToStringInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/NumericToStringInspection.java index 74238a56eee7..dfe41391d603 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/NumericToStringInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/NumericToStringInspection.java @@ -67,7 +67,7 @@ public class NumericToStringInspection extends BaseInspection { return; } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { return; } final PsiClass aClass = method.getContainingClass(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/TimeToStringInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/TimeToStringInspection.java index bbe79b138137..6bf1c686e3f0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/TimeToStringInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/internationalization/TimeToStringInspection.java @@ -69,7 +69,7 @@ public class TimeToStringInspection extends BaseInspection { return; } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { return; } final PsiClass aClass = method.getContainingClass(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutNoArgConstructorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutNoArgConstructorInspection.java index 15497b0909e5..abf046b5a0a0 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutNoArgConstructorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/javabeans/ClassWithoutNoArgConstructorInspection.java @@ -89,7 +89,7 @@ public class ClassWithoutNoArgConstructorInspection extends BaseInspection { for (final PsiMethod constructor : constructors) { final PsiParameterList parameterList = constructor.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { return true; } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspectionBase.java index 1c307008b892..c15248f60f07 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspectionBase.java @@ -72,7 +72,7 @@ public class BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspectionBase extend final PsiParameterList parameterList = method.getParameterList(); boolean junit4Annotation = isJunit4Annotation(annotation); - if (junit4Annotation && (parameterList.getParametersCount() != 0 || !method.hasModifierProperty(PsiModifier.PUBLIC)) || + if (junit4Annotation && (!parameterList.isEmpty() || !method.hasModifierProperty(PsiModifier.PUBLIC)) || !returnType.equals(PsiType.VOID) || !method.hasModifierProperty(PsiModifier.STATIC) && (junit4Annotation || !TestUtils.testInstancePerClass(targetClass))) { registerMethodError(method, method, annotation); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/BeforeOrAfterIsPublicVoidNoArgInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/BeforeOrAfterIsPublicVoidNoArgInspectionBase.java index 3573eee44385..349eb12f0301 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/BeforeOrAfterIsPublicVoidNoArgInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/BeforeOrAfterIsPublicVoidNoArgInspectionBase.java @@ -66,7 +66,7 @@ public class BeforeOrAfterIsPublicVoidNoArgInspectionBase extends BaseInspection return; } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0 || !returnType.equals(PsiType.VOID) || + if (!parameterList.isEmpty() || !returnType.equals(PsiType.VOID) || !method.hasModifierProperty(PsiModifier.PUBLIC) || method.hasModifierProperty(PsiModifier.STATIC)) { registerMethodError(method, method); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnit5PlatformInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnit5PlatformInspection.java index 3b898764f3ef..b46fc2ca9d3a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnit5PlatformInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/JUnit5PlatformInspection.java @@ -43,7 +43,7 @@ public class JUnit5PlatformInspection extends BaseInspection { final PsiClass runnerClass = PsiUtil.resolveClassInClassTypeOnly(operand.getType()); if (runnerClass != null && "org.junit.platform.runner.JUnitPlatform".equals(runnerClass.getQualifiedName()) && Arrays.stream(aClass.getMethods()).noneMatch(method -> method.hasModifierProperty(PsiModifier.PUBLIC) && - method.getParameterList().getParametersCount() == 0 && + method.getParameterList().isEmpty() && AnnotationUtil.isAnnotated(method, "org.junit.Test", 0))) { registerError(nameIdentifier, "Class #ref annotated @RunWith(JUnitPlatform.class) lacks test methods"); } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspection.java index be5f036e43b7..615edc3d9b64 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/MalformedSetUpTearDownInspection.java @@ -15,7 +15,10 @@ */ package com.siyeh.ig.junit; -import com.intellij.psi.*; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiMethod; +import com.intellij.psi.PsiModifier; +import com.intellij.psi.PsiType; import com.intellij.psi.util.InheritanceUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; @@ -59,7 +62,7 @@ public class MalformedSetUpTearDownInspection extends BaseInspection { if (!InheritanceUtil.isInheritor(targetClass, JUnitCommonClassNames.JUNIT_FRAMEWORK_TEST_CASE)) { return; } - if (method.getParameterList().getParametersCount() != 0 || + if (!method.getParameterList().isEmpty() || !PsiType.VOID.equals(method.getReturnType()) || !method.hasModifierProperty(PsiModifier.PUBLIC) && !method.hasModifierProperty(PsiModifier.PROTECTED)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/StaticSuiteInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/StaticSuiteInspection.java index 7bb52b0c38bb..13204bcd3003 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/StaticSuiteInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/StaticSuiteInspection.java @@ -70,7 +70,7 @@ public class StaticSuiteInspection extends BaseInspection { return; } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { return; } if (method.hasModifierProperty(PsiModifier.STATIC)) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestMethodIsPublicVoidNoArgInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestMethodIsPublicVoidNoArgInspectionBase.java index 111cb545276a..759c3a808a08 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestMethodIsPublicVoidNoArgInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/TestMethodIsPublicVoidNoArgInspectionBase.java @@ -23,7 +23,9 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.TestUtils; import org.jetbrains.annotations.NotNull; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; import static com.intellij.codeInsight.AnnotationUtil.CHECK_HIERARCHY; @@ -88,7 +90,7 @@ public class TestMethodIsPublicVoidNoArgInspectionBase extends BaseInspection { registerMethodError(method, Problem.STATIC, method); return; } - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { final PsiParameter[] parameters = parameterList.getParameters(); boolean annotated = true; for (PsiParameter parameter : parameters) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UnconstructableTestCaseInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UnconstructableTestCaseInspection.java index 49d61c38bb0f..9e345592d8e7 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UnconstructableTestCaseInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/junit/UnconstructableTestCaseInspection.java @@ -71,7 +71,7 @@ public class UnconstructableTestCaseInspection extends BaseInspection { if (constructors.length == 1) { final PsiMethod constructor = constructors[0]; final PsiParameterList parameterList = constructor.getParameterList(); - if (constructor.hasModifierProperty(PsiModifier.PUBLIC) && parameterList.getParametersCount() == 0) { + if (constructor.hasModifierProperty(PsiModifier.PUBLIC) && parameterList.isEmpty()) { return; } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/SystemGCInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/SystemGCInspection.java index 79b98e698516..c1fa4fe5dbdc 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/SystemGCInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/memory/SystemGCInspection.java @@ -64,7 +64,7 @@ public class SystemGCInspection extends BaseInspection { return; } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { return; } final PsiClass aClass = method.getContainingClass(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspectionBase.java index 41f4857e72ea..5a9bc6fdca00 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspectionBase.java @@ -62,7 +62,7 @@ public class ParameterNameDiffersFromOverriddenParameterInspectionBase extends B @Override public void visitMethod(@NotNull PsiMethod method) { final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { return; } final PsiMethod superMethod = MethodUtils.getSuper(method); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java index 0e3568e83365..c650d2cc3d12 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java @@ -95,7 +95,7 @@ public class StringBufferToStringInConcatenationInspection extends BaseInspectio return; } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { return; } final PsiClass aClass = method.getContainingClass(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ConstructionUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ConstructionUtils.java index d6b5b98ce16e..4031f3f692f3 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ConstructionUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/ConstructionUtils.java @@ -102,7 +102,7 @@ public class ConstructionUtils { PsiExpressionList argumentList = call.getArgumentList(); if(name != null && name.startsWith("new") && argumentList.isEmpty()) { PsiMethod method = call.resolveMethod(); - if(method != null && method.getParameterList().getParametersCount() == 0) { + if(method != null && method.getParameterList().isEmpty()) { PsiClass aClass = method.getContainingClass(); if(aClass != null) { String qualifiedName = aClass.getQualifiedName(); @@ -147,7 +147,7 @@ public class ConstructionUtils { PsiExpressionList argumentList = call.getArgumentList(); if (name != null && name.startsWith("new") && !argumentList.isEmpty()) { PsiMethod method = call.resolveMethod(); - if (method != null && method.getParameterList().getParametersCount() > 0) { + if (method != null && !method.getParameterList().isEmpty()) { PsiClass aClass = method.getContainingClass(); if (aClass != null) { String qualifiedName = aClass.getQualifiedName(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java index fe0585333b9a..cb1825ac7dae 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/TestUtils.java @@ -87,7 +87,7 @@ public class TestUtils { return false; } final PsiParameterList parameterList = method.getParameterList(); - return parameterList.getParametersCount() == 0; + return parameterList.isEmpty(); } public static boolean isJUnit3TestMethod(@Nullable PsiMethod method) { @@ -97,7 +97,7 @@ public class TestUtils { final String methodName = method.getName(); @NonNls final String test = "test"; if (!methodName.startsWith(test) || - !method.hasModifierProperty(PsiModifier.PUBLIC) && method.getParameterList().getParametersCount() > 0) { + !method.hasModifierProperty(PsiModifier.PUBLIC) && !method.getParameterList().isEmpty()) { return false; } final PsiClass containingClass = method.getContainingClass(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/WeakestTypeFinder.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/WeakestTypeFinder.java index 712e7ac51bfd..34db4a516e1e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/WeakestTypeFinder.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/WeakestTypeFinder.java @@ -24,8 +24,10 @@ import com.intellij.psi.search.searches.DirectClassInheritorsSearch; import com.intellij.psi.search.searches.ReferencesSearch; import com.intellij.psi.search.searches.SuperMethodsSearch; import com.intellij.psi.tree.IElementType; -import com.intellij.psi.util.*; import com.intellij.psi.util.InheritanceUtil; +import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.util.PsiTypesUtil; +import com.intellij.psi.util.PsiUtil; import com.intellij.util.ArrayUtil; import com.intellij.util.Query; import com.siyeh.HardcodedMethodConstants; @@ -267,7 +269,7 @@ public class WeakestTypeFinder { return false; } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { return false; } final PsiParameter[] parameters = parameterList.getParameters(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspectionBase.java index ede8b3abcdaa..47e97ea4d84e 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/ExternalizableWithoutPublicNoArgConstructorInspectionBase.java @@ -31,7 +31,7 @@ public class ExternalizableWithoutPublicNoArgConstructorInspectionBase extends B final PsiMethod[] constructors = aClass.getConstructors(); for (PsiMethod constructor : constructors) { final PsiParameterList parameterList = constructor.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { return constructor; } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableWithUnconstructableAncestorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableWithUnconstructableAncestorInspection.java index a389fb808189..1770f6795655 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableWithUnconstructableAncestorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/serialization/SerializableWithUnconstructableAncestorInspection.java @@ -15,7 +15,10 @@ */ package com.siyeh.ig.serialization; -import com.intellij.psi.*; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiMethod; +import com.intellij.psi.PsiModifier; +import com.intellij.psi.PsiParameterList; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -84,7 +87,7 @@ public class SerializableWithUnconstructableAncestorInspection extends BaseInspe for (final PsiMethod constructor : aClass.getConstructors()) { hasConstructor = true; final PsiParameterList parameterList = constructor.getParameterList(); - if (parameterList.getParametersCount() == 0 && + if (parameterList.isEmpty() && (constructor.hasModifierProperty(PsiModifier.PUBLIC) || constructor.hasModifierProperty(PsiModifier.PROTECTED))) { hasNoArgConstructor = true; } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspectionBase.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspectionBase.java index 8298a5278eca..2dfd2ee96c24 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspectionBase.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspectionBase.java @@ -176,7 +176,7 @@ public class SizeReplaceableByIsEmptyInspectionBase extends BaseInspection { final PsiMethod[] methods = aClass.findMethodsByName("isEmpty", true); for (PsiMethod method : methods) { final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { return qualifierExpression.getText() + ".isEmpty()"; } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java index 6ad9cc22ece1..6d5d915c85bd 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java @@ -108,7 +108,7 @@ public class UnnecessaryConstructorInspection extends BaseInspection { } } final PsiParameterList parameterList = constructor.getParameterList(); - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { return; } if (ignoreAnnotations) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadRunInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadRunInspection.java index 2a7560d4e2f4..fc20e7e0e118 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadRunInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadRunInspection.java @@ -87,7 +87,7 @@ public class ThreadRunInspection extends BaseInspection { return; } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { return; } final PsiClass methodClass = method.getContainingClass(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadStartInConstructionInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadStartInConstructionInspection.java index 7b3b30833afb..ab193bbe0f91 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadStartInConstructionInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadStartInConstructionInspection.java @@ -93,7 +93,7 @@ public class ThreadStartInConstructionInspection extends BaseInspection { } final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() != 0) { + if (!parameterList.isEmpty()) { return; } final PsiClass methodClass = method.getContainingClass(); diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadWithDefaultRunMethodInspection.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadWithDefaultRunMethodInspection.java index 249335f95f99..6fe2bd1e0a2b 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadWithDefaultRunMethodInspection.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/ThreadWithDefaultRunMethodInspection.java @@ -100,7 +100,7 @@ public class ThreadWithDefaultRunMethodInspection extends BaseInspection { final PsiMethod[] methods = aClass.findMethodsByName(HardcodedMethodConstants.RUN, false); for (final PsiMethod method : methods) { final PsiParameterList parameterList = method.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { return true; } } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java index 723b56c39ab4..adf8440739e8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java @@ -130,7 +130,7 @@ public class UtilityClassWithoutPrivateConstructorInspection extends UtilityClas final PsiMethod[] constructors = aClass.getConstructors(); for (final PsiMethod constructor : constructors) { final PsiParameterList parameterList = constructor.getParameterList(); - if (parameterList.getParametersCount() == 0) { + if (parameterList.isEmpty()) { final PsiModifierList modifiers = constructor.getModifierList(); modifiers.setModifierProperty(PsiModifier.PUBLIC, false); modifiers.setModifierProperty(PsiModifier.PROTECTED, false); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchMayIgnoreExceptionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchMayIgnoreExceptionInspection.java index e4b6fd4fad5c..f9918ced04c8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchMayIgnoreExceptionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CatchMayIgnoreExceptionInspection.java @@ -157,7 +157,7 @@ public class CatchMayIgnoreExceptionInspection extends AbstractBaseJavaLocalInsp myExceptionVar = exceptionVar; myMethods = StreamEx.of("getMessage", "getLocalizedMessage", "getCause") .flatArray(name -> exceptionClass.findMethodsByName(name, true)) - .filter(m -> m.getParameterList().getParametersCount() == 0) + .filter(m -> m.getParameterList().isEmpty()) .toList(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java index 1cfffc4f6434..84b1943ee085 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit4AnnotatedMethodInJUnit3TestCaseInspection.java @@ -149,7 +149,7 @@ public class JUnit4AnnotatedMethodInJUnit3TestCaseInspection extends JUnit4Annot @NonNls final String name = method.getName(); if (!method.hasModifierProperty(PsiModifier.STATIC) && PsiType.VOID.equals(method.getReturnType()) && - method.getParameterList().getParametersCount() == 0) { + method.getParameterList().isEmpty()) { final PsiModifierList modifierList = method.getModifierList(); if (name.startsWith("test")) { addAnnotationIfNotPresent(modifierList, "org.junit.Test"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit5AssertionsConverterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit5AssertionsConverterInspection.java index 17f45aef2376..de426b8bfa33 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit5AssertionsConverterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/JUnit5AssertionsConverterInspection.java @@ -120,7 +120,7 @@ public class JUnit5AssertionsConverterInspection extends BaseInspection { private boolean absentInJUnit5(PsiMethod psiMethod, String methodName) { if ("fail".equals(methodName)) { - return psiMethod.getParameterList().getParametersCount() == 0; + return psiMethod.getParameterList().isEmpty(); } if ("assertNotEquals".equals(methodName)) { PsiParameter[] parameters = psiMethod.getParameterList().getParameters(); diff --git a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java index 054fd567a874..8b98f5a7fb33 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/ipp/junit/DataPointHolderConversionIntention.java @@ -117,7 +117,7 @@ public class DataPointHolderConversionIntention extends PsiElementBaseIntentionA } final PsiMethod method = (PsiMethod)member; final PsiType returnType = method.getReturnType(); - if (returnType == null || returnType.equals(PsiType.VOID) || method.getParameterList().getParametersCount() != 0) { + if (returnType == null || returnType.equals(PsiType.VOID) || !method.getParameterList().isEmpty()) { return false; } final PsiCodeBlock body = method.getBody(); diff --git a/plugins/devkit/src/dom/impl/LanguageResolvingUtil.java b/plugins/devkit/src/dom/impl/LanguageResolvingUtil.java index 2559a4c4600b..adc32ed80a2f 100644 --- a/plugins/devkit/src/dom/impl/LanguageResolvingUtil.java +++ b/plugins/devkit/src/dom/impl/LanguageResolvingUtil.java @@ -155,7 +155,7 @@ class LanguageResolvingUtil { PsiMethod defaultConstructor = null; for (PsiMethod constructor : languagePsiClass.getConstructors()) { - if (constructor.getParameterList().getParametersCount() == 0) { + if (constructor.getParameterList().isEmpty()) { defaultConstructor = constructor; break; } diff --git a/plugins/devkit/src/inspections/QuickFixGetFamilyNameViolationInspection.java b/plugins/devkit/src/inspections/QuickFixGetFamilyNameViolationInspection.java index 5d8498a7ea22..fda89da5f094 100644 --- a/plugins/devkit/src/inspections/QuickFixGetFamilyNameViolationInspection.java +++ b/plugins/devkit/src/inspections/QuickFixGetFamilyNameViolationInspection.java @@ -46,7 +46,7 @@ public class QuickFixGetFamilyNameViolationInspection extends DevKitInspectionBa @Override public ProblemDescriptor[] checkMethod(@NotNull PsiMethod method, @NotNull InspectionManager manager, boolean isOnTheFly) { if ("getFamilyName".equals(method.getName()) && - method.getParameterList().getParametersCount() == 0 && + method.getParameterList().isEmpty() && !method.hasModifierProperty(PsiModifier.ABSTRACT)) { final PsiClass aClass = method.getContainingClass(); if (InheritanceUtil.isInheritor(aClass, QuickFix.class.getName()) && doesMethodViolate(method, new THashSet<>())) { diff --git a/plugins/devkit/src/inspections/RegistrationProblemsInspection.java b/plugins/devkit/src/inspections/RegistrationProblemsInspection.java index d5058e2ab6b6..48ae19cdea84 100644 --- a/plugins/devkit/src/inspections/RegistrationProblemsInspection.java +++ b/plugins/devkit/src/inspections/RegistrationProblemsInspection.java @@ -384,7 +384,7 @@ public class RegistrationProblemsInspection extends DevKitInspectionBase { final PsiMethod[] constructors = checkedClass.getConstructors(); if (constructors.length > 0) { for (PsiMethod ctor : constructors) { - if (ctor.getParameterList().getParametersCount() == 0) { + if (ctor.getParameterList().isEmpty()) { return new ConstructorType(ctor); } } diff --git a/plugins/devkit/src/util/PsiUtil.java b/plugins/devkit/src/util/PsiUtil.java index 96a139c82002..a855363433fe 100644 --- a/plugins/devkit/src/util/PsiUtil.java +++ b/plugins/devkit/src/util/PsiUtil.java @@ -49,7 +49,7 @@ public class PsiUtil { if (constructors.length == 0) return true; for (PsiMethod constructor : constructors) { - if (constructor.getParameterList().getParameters().length == 0 + if (constructor.getParameterList().isEmpty() && constructor.hasModifierProperty(PsiModifier.PUBLIC)) { return true; } @@ -117,7 +117,7 @@ public class PsiUtil { public static PsiMethod findNearestMethod(String name, @Nullable PsiClass cls) { if (cls == null) return null; for (PsiMethod method : cls.getMethods()) { - if (method.getParameterList().getParametersCount() == 0 && method.getName().equals(name)) { + if (method.getParameterList().isEmpty() && method.getName().equals(name)) { return method.getModifierList().hasModifierProperty(PsiModifier.ABSTRACT) ? null : method; } } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java index 792b70d34653..1475950339df 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/annotator/GroovyAnnotator.java @@ -31,7 +31,6 @@ import com.intellij.util.IncorrectOperationException; import com.intellij.util.ObjectUtils; import com.intellij.util.VisibilityUtil; import com.intellij.util.containers.ContainerUtil; -import java.util.HashSet; import com.intellij.util.containers.MultiMap; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; @@ -740,7 +739,7 @@ public class GroovyAnnotator extends GroovyElementVisitor { if (byName.length == 0) return null; Outer: for (PsiMethod method : byName) { - if (method.getParameterList().getParametersCount() == 0) return method; + if (method.getParameterList().isEmpty()) return method; if (!(method instanceof GrMethod)) continue; final GrParameter[] parameters = ((GrMethod)method).getParameterList().getParameters(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeElvisInspection.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeElvisInspection.java index 4fb7ff58cf56..74e7924a51b3 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeElvisInspection.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/control/GroovyConditionalCanBeElvisInspection.java @@ -132,7 +132,7 @@ public class GroovyConditionalCanBeElvisInspection extends BaseInspection { return resolved instanceof PsiMethod && "isEmpty".equals(((PsiMethod)resolved).getName()) && - ((PsiMethod)resolved).getParameterList().getParametersCount() == 0; + ((PsiMethod)resolved).getParameterList().isEmpty(); } /** @@ -166,7 +166,7 @@ public class GroovyConditionalCanBeElvisInspection extends BaseInspection { return resolved instanceof PsiMethod && "isEmpty".equals(((PsiMethod)resolved).getName()) && - ((PsiMethod)resolved).getParameterList().getParametersCount() == 0; + ((PsiMethod)resolved).getParameterList().isEmpty(); } private static boolean checkForNull(GrExpression condition, GrExpression then) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GDKSuperMethodSearcher.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GDKSuperMethodSearcher.java index b8edb5d73ab3..9aa6e6d21ccc 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GDKSuperMethodSearcher.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GDKSuperMethodSearcher.java @@ -130,7 +130,7 @@ public class GDKSuperMethodSearcher implements QueryExecutor 0) { + if (element instanceof PsiMethod && !((PsiMethod)element).getParameterList().isEmpty()) { return (PsiMethod)element; } else { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyConstructorUsagesSearcher.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyConstructorUsagesSearcher.java index c117bd029e34..90300eaa78a0 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyConstructorUsagesSearcher.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/findUsages/GroovyConstructorUsagesSearcher.java @@ -244,7 +244,7 @@ public class GroovyConstructorUsagesSearcher extends QueryExecutorBase 0 && !grParameters[0].isOptional()) return; } - else if (constructor.getParameterList().getParameters().length > 0) return; + else if (!constructor.getParameterList().isEmpty()) return; PsiManager manager = constructor.getManager(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/expectedTypes/GroovyExpectedTypesProvider.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/expectedTypes/GroovyExpectedTypesProvider.java index c08a207fc67e..ef2e2def7ab6 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/expectedTypes/GroovyExpectedTypesProvider.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/expectedTypes/GroovyExpectedTypesProvider.java @@ -150,7 +150,7 @@ public class GroovyExpectedTypesProvider { private static boolean resolvesToDefaultConstructor(GrCall call) { PsiMethod method = call.resolveMethod(); - if (method != null && method.isConstructor() && method.getParameterList().getParametersCount() == 0) return true; + if (method != null && method.isConstructor() && method.getParameterList().isEmpty()) return true; if (call instanceof GrConstructorCall) { PsiElement resolved = PsiImplUtil.extractUniqueResult(((GrConstructorCall)call).multiResolveClass()).getElement(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyTargetElementEvaluator.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyTargetElementEvaluator.java index cae07b0033ad..8a156fe70fb4 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyTargetElementEvaluator.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyTargetElementEvaluator.java @@ -61,7 +61,7 @@ public class GroovyTargetElementEvaluator extends JavaTargetElementEvaluator { argumentList != null && PsiImplUtil.hasNamedArguments(argumentList) && !PsiImplUtil.hasExpressionArguments(argumentList)) { - if (constructor.getParameterList().getParametersCount() == 0) return constructor.getContainingClass(); + if (constructor.getParameterList().isEmpty()) return constructor.getContainingClass(); } return constructor; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java index d2682716bb7e..295e574ec397 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GdkMethodUtil.java @@ -372,7 +372,7 @@ public class GdkMethodUtil { String name = method.getName(); return "getMetaClass".equals(name) && containingClass != null && - (method.getParameterList().getParametersCount() == 0 ^ + (method.getParameterList().isEmpty() ^ GroovyCommonClassNames.DEFAULT_GROOVY_METHODS.equals(containingClass.getQualifiedName())); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyPropertyUtils.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyPropertyUtils.java index df4d2da8e331..02408397d4dd 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyPropertyUtils.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/GroovyPropertyUtils.java @@ -213,7 +213,7 @@ public class GroovyPropertyUtils { public static boolean isSimplePropertyGetter(PsiMethod method, @Nullable String propertyName) { if (method == null || method.isConstructor()) return false; - if (method.getParameterList().getParametersCount() != 0) return false; + if (!method.getParameterList().isEmpty()) return false; if (!isGetterName(method.getName())) return false; boolean booleanReturnType = isBooleanOrBoxed(method.getReturnType()); if (method.getName().startsWith(IS_PREFIX) && !booleanReturnType) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java index 2cf52a625c6d..e4ce2ca70087 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/util/PsiUtil.java @@ -21,7 +21,6 @@ import com.intellij.util.ArrayUtil; import com.intellij.util.IncorrectOperationException; import com.intellij.util.VisibilityUtil; import com.intellij.util.containers.ContainerUtil; -import java.util.HashSet; import gnu.trove.TIntStack; import org.jetbrains.annotations.Contract; import org.jetbrains.annotations.NotNull; @@ -819,7 +818,7 @@ public class PsiUtil { if (!modifiers.hasModifierProperty(PsiModifier.STATIC) && !modifiers.hasModifierProperty(PsiModifier.PRIVATE) && !modifiers.hasModifierProperty(PsiModifier.PROTECTED) - && method.getParameterList().getParametersCount() == 0) { + && method.getParameterList().isEmpty()) { final PsiType type = getSmartReturnType(method); if (type != null && (TypesUtil.isClassType(type, CommonClassNames.JAVA_LANG_OBJECT) || TypesUtil.isClassType(type, GroovyCommonClassNames.GROOVY_LANG_CLOSURE))) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrDefaultMethodComparator.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrDefaultMethodComparator.java index 4efb83a5aec8..5c6a031bbbb0 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrDefaultMethodComparator.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/resolve/GrDefaultMethodComparator.java @@ -30,8 +30,8 @@ public class GrDefaultMethodComparator extends GrMethodComparator { final PsiType[] argTypes = context.getArgumentTypes(); if (context.isConstructor() && argTypes != null && argTypes.length == 1) { - if (method1.getParameterList().getParametersCount() == 0) return true; - if (method2.getParameterList().getParametersCount() == 0) return false; + if (method1.getParameterList().isEmpty()) return true; + if (method2.getParameterList().isEmpty()) return false; } PsiParameter[] params1 = method1.getParameterList().getParameters(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/DelegateTransformationSupport.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/DelegateTransformationSupport.java index ec808deb648d..4bbbd2d5bb15 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/DelegateTransformationSupport.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/transformations/impl/DelegateTransformationSupport.java @@ -57,7 +57,7 @@ public class DelegateTransformationSupport implements AstTransformationSupport { for (PsiMethod method : context.getMethods()) { final PsiAnnotation annotation = PsiImplUtil.getAnnotation(method, GroovyCommonClassNames.GROOVY_LANG_DELEGATE); if (annotation == null) continue; - if (method.getParameterList().getParametersCount() > 0) continue; + if (!method.getParameterList().isEmpty()) continue; declaredTypes.putIfAbsent(method.getReturnType(), annotation); } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/ext/spock/SpockTestFramework.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/ext/spock/SpockTestFramework.java index b81d288d6947..d5ccc534d88a 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/ext/spock/SpockTestFramework.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/ext/spock/SpockTestFramework.java @@ -83,7 +83,7 @@ public class SpockTestFramework extends GroovyTestFramework { if (!isTestClass(clazz, false)) return null; for (PsiMethod method : clazz.findMethodsByName(methodName, false)) { - if (method.getParameterList().getParametersCount() == 0) return method; + if (method.getParameterList().isEmpty()) return method; } return null; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java index 53cdb276461b..cfbb5968fd2b 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/completion/GroovyCompletionUtil.java @@ -406,7 +406,7 @@ public class GroovyCompletionUtil { for (GroovyResolveResult result : constructors) { final PsiElement element = result.getElement(); if (element instanceof PsiMethod) { - if (((PsiMethod)element).getParameterList().getParametersCount() > 0) { + if (!((PsiMethod)element).getParameterList().isEmpty()) { hasParameters = true; } if (result.isAccessible()) { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java index cc3388b91ee1..0a6d8f4f9fc1 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/ExpressionGenerator.java @@ -319,7 +319,7 @@ public class ExpressionGenerator extends Generator { final GroovyResolveResult resolveResult = newExpression.advancedResolve(); final PsiElement constructor = resolveResult.getElement(); if (constructor instanceof PsiMethod) { - return ((PsiMethod)constructor).getParameterList().getParametersCount() == 0; + return ((PsiMethod)constructor).getParameterList().isEmpty(); } final PsiElement resolved = refElement.resolve(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java index c8096881630a..5fae49a31039 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/convertToJava/StubGenerator.java @@ -171,7 +171,7 @@ public class StubGenerator implements ClassItemGenerator { if (constructors.length == 0) return; for (PsiMethod method : constructors) { - if (method.getParameterList().getParameters().length == 0 && PsiUtil.isAccessible(method, containingClass, containingClass)) { + if (method.getParameterList().isEmpty() && PsiUtil.isAccessible(method, containingClass, containingClass)) { return; //default constructor exists } } diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java index 21534d4b588d..9dc163d4d334 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/I18nInspection.java @@ -834,7 +834,7 @@ public class I18nInspection extends AbstractBaseJavaLocalInspectionTool implemen if (method == null) return false; final PsiType returnType = method.getReturnType(); return TO_STRING.equals(method.getName()) - && method.getParameterList().getParametersCount() == 0 + && method.getParameterList().isEmpty() && returnType != null && "java.lang.String".equals(returnType.getCanonicalText()); } diff --git a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java index 414eb795cce2..13ec1db7a151 100644 --- a/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java +++ b/plugins/java-i18n/src/com/intellij/codeInspection/i18n/JavaI18nUtil.java @@ -20,7 +20,6 @@ import com.intellij.psi.scope.util.PsiScopesUtil; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.TypeConversionUtil; import com.intellij.util.IncorrectOperationException; -import java.util.HashMap; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -280,7 +279,7 @@ public class JavaI18nUtil extends I18nUtil { PsiMethod method = (PsiMethod)element; PsiType returnType = method.getReturnType(); if (returnType != null && TypeConversionUtil.isAssignable(type, returnType) - && method.getParameterList().getParametersCount() == 0) { + && method.getParameterList().isEmpty()) { result.add(method.getName() + "()"); } } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxEntryPoint.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxEntryPoint.java index 302551636278..1fbc66e61b0f 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxEntryPoint.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFxEntryPoint.java @@ -46,7 +46,7 @@ public class JavaFxEntryPoint extends EntryPoint { public boolean isEntryPoint(@NotNull PsiElement psiElement) { if (psiElement instanceof PsiMethod) { final PsiMethod method = (PsiMethod)psiElement; - final int paramsCount = method.getParameterList().getParameters().length; + final int paramsCount = method.getParameterList().getParametersCount(); final String methodName = method.getName(); final PsiClass containingClass = method.getContainingClass(); if (paramsCount == 1 && 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 2beeb9323c3b..bb7adec381fa 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/JavaFxPsiUtil.java @@ -265,7 +265,7 @@ public class JavaFxPsiUtil { for (PsiMethod getter : getters) { if (getter.hasModifierProperty(PsiModifier.PUBLIC) && !getter.hasModifierProperty(PsiModifier.STATIC) && - getter.getParameterList().getParametersCount() == 0 && + getter.getParameterList().isEmpty() && InheritanceUtil.isInheritor(getter.getReturnType(), JavaFxCommonNames.JAVAFX_BEANS_VALUE_OBSERVABLE_VALUE)) { return getter; } @@ -519,7 +519,7 @@ public class JavaFxPsiUtil { GlobalSearchScope.allScope(project)); if (builderClass != null) { final PsiMethod[] buildMethods = builderClass.findMethodsByName("build", false); - if (buildMethods.length == 1 && buildMethods[0].getParameterList().getParametersCount() == 0) { + if (buildMethods.length == 1 && buildMethods[0].getParameterList().isEmpty()) { if (ClassInheritorsSearch.search(builderClass).forEach(aClass -> { PsiType returnType = null; final PsiMethod method = MethodSignatureUtil.findMethodBySuperMethod(aClass, buildMethods[0], false); @@ -707,7 +707,7 @@ public class JavaFxPsiUtil { } if (declaration instanceof PsiMethod) { final PsiMethod method = (PsiMethod)declaration; - if (method.getParameterList().getParametersCount() != 0) { + if (!method.getParameterList().isEmpty()) { return getSetterArgumentType(method); } final String propertyName = PropertyUtilBase.getPropertyName(method); @@ -752,7 +752,7 @@ public class JavaFxPsiUtil { } if (declaration instanceof PsiMethod) { PsiMethod psiMethod = (PsiMethod)declaration; - if (psiMethod.getParameterList().getParametersCount() == 0 && + if (psiMethod.getParameterList().isEmpty() && !psiMethod.hasModifierProperty(PsiModifier.STATIC)) { return getGetterReturnType(psiMethod); } @@ -1110,7 +1110,7 @@ public class JavaFxPsiUtil { if (psiClass == null || factoryMethodName == null) return null; final PsiMethod[] methods = psiClass.findMethodsByName(factoryMethodName, true); for (PsiMethod method : methods) { - if (method.getParameterList().getParametersCount() == 0 && + if (method.getParameterList().isEmpty() && method.hasModifierProperty(PsiModifier.STATIC)) { return PsiUtil.resolveClassInClassTypeOnly(method.getReturnType()); } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxRelatedItemLineMarkerProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxRelatedItemLineMarkerProvider.java index 7af2a9e3d482..55434a018fc8 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxRelatedItemLineMarkerProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/JavaFxRelatedItemLineMarkerProvider.java @@ -59,7 +59,7 @@ public class JavaFxRelatedItemLineMarkerProvider extends RelatedItemLineMarkerPr final PsiMethod[] constructors = containingClass.getConstructors(); boolean defaultConstructor = constructors.length == 0; for (PsiMethod constructor : constructors) { - if (constructor.getParameterList().getParametersCount() == 0) { + if (constructor.getParameterList().isEmpty()) { defaultConstructor = true; break; } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java index f5dbfc538d95..c3472238a858 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/JavaFxImplicitUsageProvider.java @@ -109,7 +109,7 @@ public class JavaFxImplicitUsageProvider implements ImplicitUsageProvider { private static boolean isInvokedByFxmlLoader(@NotNull PsiMethod method) { return "initialize".equals(method.getName()) && - method.getParameterList().getParametersCount() == 0 && + method.getParameterList().isEmpty() && isDeclaredInControllerClass(method); } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFactoryReferenceProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFactoryReferenceProvider.java index 554de5a26bf4..d4cc098e70f8 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFactoryReferenceProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFactoryReferenceProvider.java @@ -57,7 +57,7 @@ class JavaFxFactoryReferenceProvider extends PsiReferenceProvider { private static boolean isFactoryMethod(PsiMethod method) { return method.hasModifierProperty(PsiModifier.STATIC) && - method.getParameterList().getParametersCount() == 0 && + method.getParameterList().isEmpty() && !PsiType.VOID.equals(method.getReturnType()); } diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java index 08e96f569441..ea4438a4e38e 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxFieldIdReferenceProvider.java @@ -42,7 +42,7 @@ public class JavaFxFieldIdReferenceProvider extends JavaFxControllerBasedReferen if (fieldOrGetterMethod == null) { final PsiMethod[] methods = aClass.findMethodsByName(name, true); for (PsiMethod method : methods) { - if (method.getParameterList().getParameters().length == 0) { + if (method.getParameterList().isEmpty()) { fieldOrGetterMethod = method; break; } diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java index 10acdf5b0910..1b944bd448ed 100644 --- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java +++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfiguration.java @@ -675,7 +675,7 @@ public class JUnitConfiguration extends JavaTestConfigurationBase { } public static String getMethodPresentation(PsiMethod method) { - if (method.getParameterList().getParametersCount() > 0 && MetaAnnotationUtil.isMetaAnnotated(method, JUnitUtil.TEST5_ANNOTATIONS)) { + if (!method.getParameterList().isEmpty() && MetaAnnotationUtil.isMetaAnnotated(method, JUnitUtil.TEST5_ANNOTATIONS)) { return method.getName() + "(" + ClassUtil.getVMParametersMethodSignature(method) + ")"; } else { diff --git a/plugins/junit/src/com/intellij/execution/junit/codeInsight/references/MethodSourceReference.java b/plugins/junit/src/com/intellij/execution/junit/codeInsight/references/MethodSourceReference.java index 213436e6096e..01093370335b 100644 --- a/plugins/junit/src/com/intellij/execution/junit/codeInsight/references/MethodSourceReference.java +++ b/plugins/junit/src/com/intellij/execution/junit/codeInsight/references/MethodSourceReference.java @@ -72,6 +72,6 @@ public class MethodSourceReference extends PsiReferenceBase { } private static boolean staticNoParams(PsiMethod method) { - return method.hasModifierProperty(PsiModifier.STATIC) && method.getParameterList().getParametersCount() == 0; + return method.hasModifierProperty(PsiModifier.STATIC) && method.getParameterList().isEmpty(); } } diff --git a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java index ecbde9f464f3..49fc8f3df405 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java +++ b/plugins/junit/src/com/intellij/execution/junit2/inspection/JUnitEntryPoint.java @@ -54,7 +54,7 @@ public class JUnitEntryPoint extends EntryPointWithVisibilityLevel { } else if (psiElement instanceof PsiMethod) { final PsiMethod method = (PsiMethod)psiElement; - if (method.isConstructor() && method.getParameterList().getParametersCount() == 0) { + if (method.isConstructor() && method.getParameterList().isEmpty()) { return JUnitUtil.isTestClass(method.getContainingClass()); } if (JUnitUtil.isTestMethodOrConfig(method)) return true; diff --git a/plugins/testng/src/com/theoryinpractice/testng/inspection/JUnitConvertTool.java b/plugins/testng/src/com/theoryinpractice/testng/inspection/JUnitConvertTool.java index ae0b5b86a1bd..fb6df910ffaa 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/inspection/JUnitConvertTool.java +++ b/plugins/testng/src/com/theoryinpractice/testng/inspection/JUnitConvertTool.java @@ -255,10 +255,10 @@ public class JUnitConvertTool extends AbstractBaseJavaLocalInspectionTool { if (method.getName().startsWith("test")) { addMethodJavadocLine(factory, method, " * @testng.test"); } - else if ("setUp".equals(method.getName()) && method.getParameterList().getParameters().length == 0) { + else if ("setUp".equals(method.getName()) && method.getParameterList().isEmpty()) { addMethodJavadocLine(factory, method, " * @testng.before-test"); } - else if ("tearDown".equals(method.getName()) && method.getParameterList().getParameters().length == 0) { + else if ("tearDown".equals(method.getName()) && method.getParameterList().isEmpty()) { addMethodJavadocLine(factory, method, " * @testng.after-test"); } } @@ -309,10 +309,10 @@ public class JUnitConvertTool extends AbstractBaseJavaLocalInspectionTool { if (method.getName().startsWith("test")) { annotation = factory.createAnnotationFromText("@org.testng.annotations.Test", method); } - else if ("setUp".equals(method.getName()) && method.getParameterList().getParameters().length == 0) { + else if ("setUp".equals(method.getName()) && method.getParameterList().isEmpty()) { annotation = factory.createAnnotationFromText("@org.testng.annotations.BeforeMethod", method); } - else if ("tearDown".equals(method.getName()) && method.getParameterList().getParameters().length == 0) { + else if ("tearDown".equals(method.getName()) && method.getParameterList().isEmpty()) { annotation = factory.createAnnotationFromText("@org.testng.annotations.AfterMethod", method); } if (annotation != null) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateListenerAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateListenerAction.java index 133d391bb0c5..59bd28f53133 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateListenerAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/CreateListenerAction.java @@ -279,7 +279,7 @@ public class CreateListenerAction extends AbstractGuiEditorAction { return (PsiMethod) aClass.addBefore(newConstructor, firstMethod); } for(PsiMethod method: constructors) { - if (method.getParameterList().getParametersCount() == 0) { + if (method.getParameterList().isEmpty()) { return method; } } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/UIDesignerImplicitUsageProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/UIDesignerImplicitUsageProvider.java index 5bbbdf062e68..dec480740295 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/binding/UIDesignerImplicitUsageProvider.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/binding/UIDesignerImplicitUsageProvider.java @@ -32,7 +32,7 @@ public class UIDesignerImplicitUsageProvider implements ImplicitUsageProvider { PsiMethod method = (PsiMethod) element; if ((AsmCodeGenerator.CREATE_COMPONENTS_METHOD_NAME.equals(method.getName()) || AsmCodeGenerator.GET_ROOT_COMPONENT_METHOD_NAME.equals(method.getName()) || - AsmCodeGenerator.SETUP_METHOD_NAME.equals(method.getName())) && method.getParameterList().getParametersCount() == 0) { + AsmCodeGenerator.SETUP_METHOD_NAME.equals(method.getName())) && method.getParameterList().isEmpty()) { return true; } } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/IntrospectedProperty.java b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/IntrospectedProperty.java index 05fd2fbfcc66..5f4c7d857e8b 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/IntrospectedProperty.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/IntrospectedProperty.java @@ -170,7 +170,7 @@ public abstract class IntrospectedProperty extends Property final PsiMethod[] psiMethods = componentClass.findMethodsByName(myReadMethod.getName(), true); for(PsiMethod method: psiMethods) { if (!method.hasModifierProperty(PsiModifier.STATIC) && - method.getParameterList().getParametersCount() == 0) { + method.getParameterList().isEmpty()) { return true; } }