From 0f982ffa09371f0cf92b5bc8bc1eecc237bd0e16 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Fri, 24 May 2013 19:22:34 +0400 Subject: [PATCH] cleanup: @Override --- .../ClassReferencesSubclassInspection.java | 3 +++ .../DeclareCollectionAsInterfaceInspection.java | 1 + .../abstraction/InstanceofThisInspection.java | 3 +++ .../OverlyStrongTypeCastInspection.java | 1 + .../TypeMayBeWeakenedInspection.java | 2 +- ...oCollectionFieldFromParameterInspection.java | 7 ++++++- ...StaticFieldFromInstanceMethodInspection.java | 3 +++ .../AssignmentUsedAsConditionInspection.java | 6 ++++++ ...mentDecrementUsedAsExpressionInspection.java | 1 + .../assignment/NestedAssignmentInspection.java | 3 +++ ...ignmentWithOperatorAssignmentInspection.java | 1 + .../PointlessBitwiseExpressionInspection.java | 1 + .../ig/bitwise/ShiftOutOfRangeInspection.java | 1 + .../ArchaicSystemPropertyAccessInspection.java | 2 ++ .../siyeh/ig/bugs/ArrayEqualsInspection.java | 2 +- .../siyeh/ig/bugs/ArrayHashCodeInspection.java | 1 + .../CastConflictsWithInstanceofInspection.java | 2 ++ .../CastToIncompatibleInterfaceInspection.java | 3 +++ .../ig/bugs/ClassNewInstanceInspection.java | 5 +++-- ...CompareToUsesNonFinalVariableInspection.java | 4 ++++ .../ig/bugs/CovariantEqualsInspection.java | 3 +++ .../ig/bugs/EmptyInitializerInspection.java | 7 +++++++ .../ig/bugs/EmptyStatementBodyInspection.java | 8 +++++++- ...ualsBetweenInconvertibleTypesInspection.java | 8 ++++++-- .../EqualsUsesNonFinalVariableInspection.java | 5 +++++ ...LoopThatDoesntUseLoopVariableInspection.java | 3 +++ .../src/com/siyeh/ig/bugs/FormatDecode.java | 10 ++++++++++ .../HashCodeUsesNonFinalVariableInspection.java | 5 +++++ .../bugs/ImplicitArrayToStringInspection.java | 1 + ...stanceofIncompatibleInterfaceInspection.java | 3 +++ .../InstantiationOfUtilityClassInspection.java | 3 +++ ...ratorHasNextCallsIteratorNextInspection.java | 3 +++ .../ig/bugs/MathRandomCastToIntInspection.java | 1 + .../ig/bugs/MisspelledCompareToInspection.java | 4 ++++ .../ig/bugs/MisspelledEqualsInspection.java | 4 ++++ .../ig/bugs/MisspelledHashcodeInspection.java | 4 ++++ .../ig/bugs/MisspelledToStringInspection.java | 4 ++++ ...wStringBufferWithCharArgumentInspection.java | 1 + .../bugs/NonShortCircuitBooleanInspection.java | 12 +++++++++++- ...llArgumentToVariableArgMethodInspection.java | 4 ++++ .../siyeh/ig/bugs/ObjectEqualityInspection.java | 1 + .../ig/bugs/ObjectEqualsNullInspection.java | 4 ++++ ...sultOfObjectAllocationIgnoredInspection.java | 3 +++ .../ig/bugs/StaticCallOnSubclassInspection.java | 7 +++++++ ...taticFieldReferenceOnSubclassInspection.java | 7 +++++++ ...ringConcatenationInFormatCallInspection.java | 1 + ...catenationInMessageFormatCallInspection.java | 1 + .../siyeh/ig/bugs/StringEqualityInspection.java | 10 +++++++++- .../bugs/SubtractionInCompareToInspection.java | 8 +++++++- .../TextLabelInSwitchStatementInspection.java | 3 +++ .../AnonymousInnerClassInspection.java | 5 +++++ .../ClassInTopLevelPackageInspection.java | 8 +++++++- .../classlayout/ClassInitializerInspection.java | 4 ++++ .../ClassMayBeInterfaceInspection.java | 6 ++++++ .../ClassNameDiffersFromFileNameInspection.java | 6 +++++- ...nstantDeclaredInAbstractClassInspection.java | 3 +++ .../ConstantDeclaredInInterfaceInspection.java | 3 +++ .../FieldCanBeMovedToSubclassInspection.java | 1 + .../ig/classlayout/FinalMethodInspection.java | 4 ++++ .../FinalStaticMethodInspection.java | 5 +++++ .../InnerClassOnInterfaceInspection.java | 9 ++++++++- .../LimitedScopeInnerClassInspection.java | 5 +++++ .../ListenerMayUseAdapterInspection.java | 3 ++- .../MethodReturnAlwaysConstantInspection.java | 1 + .../MissingDeprecatedAnnotationInspection.java | 1 + .../MissingOverrideAnnotationInspection.java | 1 + ...MultipleTopLevelClassesInFileInspection.java | 5 +++++ .../NonFinalFieldInEnumInspection.java | 1 + .../NoopMethodInAbstractClassInspection.java | 3 +++ .../ProtectedMemberInFinalClassInspection.java | 1 + ...icConstructorInNonPublicClassInspection.java | 6 ++++++ .../StaticFieldCanBeMovedToUseInspection.java | 1 + .../StaticNonFinalFieldInspection.java | 4 ++++ ...ityClassWithPublicConstructorInspection.java | 1 + ...lassWithoutPrivateConstructorInspection.java | 3 +++ .../classmetrics/ClassComplexityInspection.java | 6 ++++++ .../ClassInheritanceDepthInspection.java | 6 ++++++ .../ig/classmetrics/ClassMetricInspection.java | 5 +++-- .../ClassNestingDepthInspection.java | 6 ++++++ .../ConstructorCountInspection.java | 6 ++++++ .../CloneCallsConstructorsInspection.java | 3 +++ .../CloneCallsSuperCloneInspection.java | 5 +++++ .../controlflow/BreakStatementInspection.java | 3 +++ .../BreakStatementWithLabelInspection.java | 3 +++ ...pressionWithIdenticalBranchesInspection.java | 6 ++++++ .../ig/controlflow/ConfusingElseInspection.java | 1 + ...ConstantConditionalExpressionInspection.java | 1 + .../ConstantIfStatementInspection.java | 2 ++ .../ContinueStatementInspection.java | 3 +++ .../ContinueStatementWithLabelInspection.java | 3 +++ .../DefaultNotLastCaseInSwitchInspection.java | 3 +++ .../controlflow/DoubleNegationInspection.java | 6 ++++++ .../DuplicateBooleanBranchInspection.java | 3 +++ .../DuplicateConditionInspection.java | 4 ++++ .../FallthruInSwitchStatementInspection.java | 10 +++++++--- .../ForLoopReplaceableByWhileInspection.java | 1 + .../IfMayBeConditionalInspection.java | 1 + ...tatementWithIdenticalBranchesInspection.java | 1 + ...fStatementWithTooManyBranchesInspection.java | 6 +++++- .../controlflow/LabeledStatementInspection.java | 3 +++ ...ConditionNotUpdatedInsideLoopInspection.java | 6 +++++- .../LoopStatementsThatDontLoopInspection.java | 5 +++++ ...hImplicitTerminationConditionInspection.java | 6 ++++++ .../NestedConditionalExpressionInspection.java | 3 +++ .../NestedSwitchStatementInspection.java | 3 +++ .../PointlessBooleanExpressionInspection.java | 1 + ...lifiableConditionalExpressionInspection.java | 1 + .../controlflow/SwitchStatementInspection.java | 3 +++ ...ementWithConfusingDeclarationInspection.java | 4 ++++ ...chStatementWithTooFewBranchesInspection.java | 4 ++++ ...hStatementWithTooManyBranchesInspection.java | 6 +++++- ...witchStatementsWithoutDefaultInspection.java | 5 +++++ .../ig/controlflow/TrivialIfInspection.java | 1 + ...ecessaryConditionalExpressionInspection.java | 8 ++++++++ .../UnnecessaryContinueInspection.java | 5 +++++ .../UnnecessaryDefaultInspection.java | 3 +++ ...ecessaryLabelOnBreakStatementInspection.java | 7 +++++++ ...ssaryLabelOnContinueStatementInspection.java | 7 +++++++ .../ConstantValueVariableUseInspection.java | 1 + .../ig/dataflow/LawOfDemeterInspection.java | 6 +++++- .../OrredNotEqualExpressionInspection.java | 13 +++++++------ .../ReuseOfLocalVariableInspection.java | 1 + .../ig/dataflow/TooBroadScopeInspection.java | 3 ++- .../ClassWithTooManyDependentsInspection.java | 2 ++ ...TooManyTransitiveDependenciesInspection.java | 2 ++ ...thTooManyTransitiveDependentsInspection.java | 2 ++ .../CyclicClassDependencyInspection.java | 1 + .../CyclicClassInitializationInspection.java | 1 + .../CyclicPackageDependencyInspection.java | 1 + .../ReturnOfCollectionFieldInspection.java | 1 + .../BadExceptionCaughtInspection.java | 1 + ...tExceptionImmediatelyRethrownInspection.java | 1 + ...ntinueOrBreakFromFinallyBlockInspection.java | 4 ++++ .../EmptyCatchBlockInspection.java | 1 + .../EmptyFinallyBlockInspection.java | 2 ++ .../errorhandling/EmptyTryBlockInspection.java | 6 +++++- ...lyBlockCannotCompleteNormallyInspection.java | 5 +++++ .../InstanceofCatchParameterInspection.java | 3 +++ .../NestedTryStatementInspection.java | 3 +++ .../ReturnFromFinallyBlockInspection.java | 5 +++++ .../ThreadDeathRethrownInspection.java | 4 ++++ .../ThrowCaughtLocallyInspection.java | 6 +++++- .../ThrowFromFinallyBlockInspection.java | 4 ++++ .../ig/finalization/FinalizeInspection.java | 4 ++++ .../FinalizeNotProtectedInspection.java | 6 ++++++ .../NoExplicitFinalizeCallsInspection.java | 5 +++++ .../siyeh/ig/fixes/AddSerialVersionUIDFix.java | 2 ++ .../com/siyeh/ig/fixes/AddThisQualifierFix.java | 1 + .../com/siyeh/ig/fixes/ChangeModifierFix.java | 7 ++++++- .../src/com/siyeh/ig/fixes/DeleteImportFix.java | 4 +++- .../ig/fixes/DeleteUnnecessaryStatementFix.java | 10 ++++++---- .../com/siyeh/ig/fixes/EqualityToEqualsFix.java | 7 ++++++- .../com/siyeh/ig/fixes/ExtractMethodFix.java | 3 +++ .../ExtractParameterAsLocalVariableFix.java | 1 + .../src/com/siyeh/ig/fixes/InlineCallFix.java | 3 +++ .../com/siyeh/ig/fixes/InlineVariableFix.java | 1 + .../siyeh/ig/fixes/IntroduceConstantFix.java | 3 +++ .../com/siyeh/ig/fixes/MakeCloneableFix.java | 1 + .../com/siyeh/ig/fixes/MakeFieldFinalFix.java | 1 + .../siyeh/ig/fixes/MakeFieldStaticFinalFix.java | 1 + .../ig/fixes/MakeInitializerExplicitFix.java | 2 ++ .../com/siyeh/ig/fixes/MakeSerializableFix.java | 1 + .../src/com/siyeh/ig/fixes/MemberSignature.java | 1 + .../ig/fixes/MoveAnonymousToInnerClassFix.java | 3 +++ .../src/com/siyeh/ig/fixes/MoveClassFix.java | 13 ++++++++----- .../siyeh/ig/fixes/NormalizeDeclarationFix.java | 3 ++- .../com/siyeh/ig/fixes/RemoveModifierFix.java | 2 ++ .../com/siyeh/ig/fixes/RenameParameterFix.java | 4 +++- .../ReplaceInheritanceWithDelegationFix.java | 1 + .../siyeh/ig/fixes/SerialVersionUIDBuilder.java | 1 + .../ig/imports/OnDemandImportInspection.java | 3 +++ .../ig/imports/SingleClassImportInspection.java | 3 +++ ...AbstractClassNeverImplementedInspection.java | 3 +++ ...ctClassWithoutAbstractMethodsInspection.java | 3 +++ ...hodWithMissingImplementationsInspection.java | 4 ++++ .../ExtendsAnnotationInspection.java | 5 +++++ .../InterfaceNeverImplementedInspection.java | 6 +++++- .../RedundantMethodOverrideInspection.java | 6 ++++++ .../ig/inheritance/StaticInheritanceFix.java | 8 ++++++++ .../StaticInheritanceInspection.java | 7 ++++++- ...stractMethodCallInConstructorInspection.java | 3 +++ ...nstanceVariableInitializationInspection.java | 10 ++++++++-- ...ableUsedInClassInitializationInspection.java | 4 ++++ ...nThreadSafeLazyInitializationInspection.java | 8 +++++++- .../NumericToStringInspection.java | 4 ++++ .../StringTokenizerInspection.java | 4 ++++ .../TimeToStringInspection.java | 4 ++++ ...assWithOnlyOneDirectInheritorInspection.java | 3 +++ ...nonymousInnerClassMayBeStaticInspection.java | 4 ++++ .../ArrayLengthInLoopConditionInspection.java | 3 +++ ...fMemoryOnLargeArrayAllocationInspection.java | 6 +++++- .../ig/j2me/ConnectionResourceInspection.java | 4 ++++ ...aceWithOnlyOneDirectInheritorInspection.java | 3 +++ .../MultiplyOrDivideByPowerOfTwoInspection.java | 7 +++++++ ...argePrimitiveArrayInitializerInspection.java | 6 +++++- .../ig/j2me/RecordStoreResourceInspection.java | 4 ++++ .../SingleCharacterStartsWithInspection.java | 6 ++++++ .../ClassWithoutConstructorInspection.java | 1 + .../ClassWithoutNoArgConstructorInspection.java | 6 +++++- .../FieldHasSetterButNoGetterInspection.java | 8 +++++++- ...ackageDotHtmlMayBePackageInfoInspection.java | 3 +++ .../UnnecessaryInheritDocInspection.java | 1 + .../siyeh/ig/jdk/AnnotationClassInspection.java | 3 +++ .../siyeh/ig/jdk/AssertStatementInspection.java | 3 +++ .../com/siyeh/ig/jdk/AutoBoxingInspection.java | 1 + .../siyeh/ig/jdk/AutoUnboxingInspection.java | 1 + .../com/siyeh/ig/jdk/EnumClassInspection.java | 3 +++ .../ig/jdk/ForeachStatementInspection.java | 6 ++++++ .../siyeh/ig/jdk/VarargParameterInspection.java | 1 + .../AssertEqualsMayBeAssertSameInspection.java | 5 +++-- ...rClassIsPublicStaticVoidNoArgInspection.java | 4 +++- ...eforeOrAfterIsPublicVoidNoArgInspection.java | 1 + ...xceptionsDeclaredOnTestMethodInspection.java | 1 + ...zedParametersStaticCollectionInspection.java | 4 ++++ .../junit/SetupCallsSuperSetupInspection.java | 1 + .../TeardownCallsSuperTeardownInspection.java | 1 + .../TestCaseWithConstructorInspection.java | 4 ++++ ...tatementGuardedByLogConditionInspection.java | 1 + .../SuppressionAnnotationInspection.java | 3 +++ .../ig/maturity/SystemOutErrInspection.java | 4 ++++ .../ig/maturity/ThreadDumpStackInspection.java | 4 ++++ .../ThrowablePrintStackTraceInspection.java | 4 ++++ .../ig/maturity/TodoCommentInspection.java | 3 +++ .../ig/memory/StaticCollectionInspection.java | 6 +++++- .../com/siyeh/ig/memory/SystemGCInspection.java | 4 ++++ .../CyclomaticComplexityInspection.java | 6 ++++++ .../MethodWithMultipleLoopsInspection.java | 3 +++ .../methodmetrics/NestingDepthInspection.java | 6 ++++++ .../NonCommentSourceStatementsInspection.java | 6 ++++++ .../ParametersPerMethodInspection.java | 6 ++++++ .../ThrownExceptionsPerMethodInspection.java | 6 ++++++ ...AccessReplaceableByMethodCallInspection.java | 1 + .../EnumerationCanBeIterationInspection.java | 1 + .../ig/migration/ForCanBeForeachInspection.java | 3 ++- .../ig/migration/IfCanBeSwitchInspection.java | 3 +++ .../IndexOfReplaceableByContainsInspection.java | 1 + ...ferReplaceableByStringBuilderInspection.java | 5 ++++- ...yFinallyCanBeTryWithResourcesInspection.java | 1 + .../migration/UnnecessaryBoxingInspection.java | 1 + .../UnnecessaryUnboxingInspection.java | 3 ++- .../migration/WhileCanBeForeachInspection.java | 2 +- .../AnnotationNamingConventionInspection.java | 8 ++++++++ ...ssNamePrefixedWithPackageNameInspection.java | 5 +++++ .../ClassNameSameAsAncestorNameInspection.java | 5 +++++ .../naming/ClassNamingConventionInspection.java | 8 ++++++++ .../ig/naming/DollarSignInNameInspection.java | 5 +++++ ...umeratedClassNamingConventionInspection.java | 8 ++++++++ ...tanceVariableNamingConventionInspection.java | 8 ++++++++ .../InterfaceNamingConventionInspection.java | 8 ++++++++ .../MethodNameSameAsClassNameInspection.java | 1 + .../MethodNameSameAsParentNameInspection.java | 5 +++++ ...xceptionNameEndsWithExceptionInspection.java | 1 + .../OverloadedVarargsMethodInspection.java | 3 +++ ...iffersFromOverriddenParameterInspection.java | 10 +++++++++- .../ParameterNamingConventionInspection.java | 9 +++++++++ .../StaticMethodNamingConventionInspection.java | 8 ++++++++ ...TypeParameterNamingConventionInspection.java | 8 ++++++++ .../siyeh/ig/numeric/BadOddnessInspection.java | 8 +++++++- .../ig/numeric/BigDecimalEqualsInspection.java | 1 + .../CachedNumberConstructorCallInspection.java | 2 ++ .../CharUsedInArithmeticContextInspection.java | 2 ++ .../ComparisonOfShortAndCharInspection.java | 3 +++ .../ig/numeric/ComparisonToNaNInspection.java | 6 ++++++ ...ConfusingFloatingPointLiteralInspection.java | 1 + .../ig/numeric/ConstantMathCallInspection.java | 1 + .../ConvertOctalLiteralToDecimalFix.java | 1 + .../ig/numeric/DivideByZeroInspection.java | 4 ++++ ...oubleLiteralMayBeFloatLiteralInspection.java | 1 + .../FloatingPointEqualityInspection.java | 3 +++ .../ImplicitNumericConversionInspection.java | 1 + .../IntLiteralMayBeLongLiteralInspection.java | 1 + ...gLiteralsEndingWithLowercaseLInspection.java | 7 +++++++ .../NonReproducibleMathCallInspection.java | 6 ++++++ ...PointlessArithmeticExpressionInspection.java | 3 ++- .../siyeh/ig/numeric/RemoveLeadingZeroFix.java | 1 + .../siyeh/ig/numeric/UnaryPlusInspection.java | 3 +++ .../UnnecessaryUnaryMinusInspection.java | 6 ++++++ ...ableBigDecimalConstructorCallInspection.java | 4 ++++ .../performance/BoxingBoxedValueInspection.java | 1 + .../CallToSimpleGetterInClassInspection.java | 1 + .../CallToSimpleSetterInClassInspection.java | 8 ++++++++ .../ClassInitializerMayBeStaticInspection.java | 2 ++ ...ctionsMustHaveInitialCapacityInspection.java | 4 ++++ .../ConstantStringInternInspection.java | 1 + ...xReplaceableByCompiledPatternInspection.java | 1 + .../performance/FieldMayBeStaticInspection.java | 4 ++++ .../InnerClassMayBeStaticInspection.java | 1 + ...tiatingObjectToGetClassObjectInspection.java | 1 + .../performance/JavaLangReflectInspection.java | 3 +++ ...KeySetIterationMayUseEntrySetInspection.java | 1 + .../LengthOneStringInIndexOfInspection.java | 1 + ...ngthOneStringsInConcatenationInspection.java | 1 + .../ManualArrayToCollectionCopyInspection.java | 1 + .../ObjectAllocationInLoopInspection.java | 3 +++ .../RandomDoubleForRandomIntegerInspection.java | 1 + ...BufferToStringInConcatenationInspection.java | 1 + ...ationInsideStringBufferAppendInspection.java | 1 + .../StringConstructorInspection.java | 3 ++- .../StringEqualsEmptyStringInspection.java | 1 + .../performance/StringToStringInspection.java | 1 + .../ig/performance/SubstringZeroInspection.java | 1 + .../ig/performance/TailRecursionInspection.java | 1 + ...llWithZeroLengthArrayArgumentInspection.java | 1 + .../TrivialStringConcatenationInspection.java | 1 + ...mporaryOnConversionFromStringInspection.java | 1 + ...TemporaryOnConversionToStringInspection.java | 1 + .../HardcodedFileSeparatorsInspection.java | 5 +++++ .../HardcodedLineSeparatorsInspection.java | 4 ++++ .../ig/portability/NativeMethodsInspection.java | 4 ++++ .../ig/portability/RuntimeExecInspection.java | 4 ++++ .../ig/portability/SystemExitInspection.java | 4 ++++ .../ig/portability/SystemGetenvInspection.java | 4 ++++ .../UseOfProcessBuilderInspection.java | 3 +++ .../portability/UseOfSunClassesInspection.java | 3 +++ .../com/siyeh/ig/psiutils/HighlightUtils.java | 1 + .../com/siyeh/ig/psiutils/InheritanceUtil.java | 2 ++ .../DriverManagerGetConnectionInspection.java | 4 ++++ .../ClassLoaderInstantiationInspection.java | 3 +++ ...CloneableClassInSecureContextInspection.java | 3 +++ .../security/DesignForExtensionInspection.java | 3 +++ .../ig/security/NonFinalCloneInspection.java | 3 +++ ...aticInnerClassInSecureContextInspection.java | 3 +++ .../PublicStaticArrayFieldInspection.java | 3 +++ .../PublicStaticCollectionFieldInspection.java | 3 +++ .../SystemSetSecurityManagerInspection.java | 4 ++++ ...zableWithSerializationMethodsInspection.java | 4 ++++ ...ableWithSerialVersionUIDFieldInspection.java | 3 ++- ...adObjectAndWriteObjectPrivateInspection.java | 5 +++++ .../ReadObjectInitializationInspection.java | 4 ++++ ...solveAndWriteReplaceProtectedInspection.java | 4 ++++ ...stentFieldsWithWrongSignatureInspection.java | 3 +++ ...erialVersionUIDNotStaticFinalInspection.java | 1 + ...ClassHasSerialVersionUIDFieldInspection.java | 5 +++++ ...WithNonSerializableOuterClassInspection.java | 3 +++ ...ntFieldInNonSerializableClassInspection.java | 6 ++++++ .../TransientFieldNotInitializedInspection.java | 3 +++ .../style/CStyleArrayDeclarationInspection.java | 6 ++++++ ...ConcatCanBeReplacedByOperatorInspection.java | 1 + .../ig/style/ChainedEqualityInspection.java | 4 ++++ .../ConstantOnLHSOfComparisonInspection.java | 1 + .../ConstantOnRHSOfComparisonInspection.java | 1 + ...rolFlowStatementWithoutBracesInspection.java | 1 + .../EqualsCalledOnEnumConstantInspection.java | 7 ++++--- .../siyeh/ig/style/ExtendsObjectInspection.java | 1 + .../ig/style/ImplicitCallToSuperInspection.java | 3 ++- ...tIndexOfReplaceableByContainsInspection.java | 1 + .../LiteralAsArgToStringEqualsInspection.java | 6 ++++++ .../ig/style/MissortedModifiersInspection.java | 10 +++++++++- .../MultipleTypedDeclarationInspection.java | 5 +++++ .../ig/style/RedundantImplementsInspection.java | 1 + .../siyeh/ig/style/ReturnThisInspection.java | 4 ++++ .../style/SimplifiableAnnotationInspection.java | 1 + .../SizeReplaceableByIsEmptyInspection.java | 1 + .../TypeParameterExtendsObjectInspection.java | 2 ++ ...rilyQualifiedInnerClassAccessInspection.java | 1 + ...cessarilyQualifiedStaticUsageInspection.java | 1 + ...fiedStaticallyImportedElementInspection.java | 1 + .../UnnecessaryBlockStatementInspection.java | 1 + ...nnecessaryCallToStringValueOfInspection.java | 1 + ...nstantArrayCreationExpressionInspection.java | 9 +++++---- .../style/UnnecessaryConstructorInspection.java | 3 ++- .../UnnecessaryInterfaceModifierInspection.java | 1 + .../style/UnnecessaryParenthesesInspection.java | 1 + .../UnnecessaryQualifierForThisInspection.java | 6 ++++++ .../style/UnnecessarySemicolonInspection.java | 1 + .../UnnecessarySuperConstructorInspection.java | 7 +++++++ .../UnnecessarySuperQualifierInspection.java | 1 + .../ig/style/UnnecessaryThisInspection.java | 2 ++ .../UnnecessaryToStringCallInspection.java | 1 + .../UnqualifiedInnerClassAccessInspection.java | 1 + .../style/UnqualifiedStaticUsageInspection.java | 9 ++++++++- .../siyeh/ig/telemetry/TelemetryDisplay.java | 4 ++++ .../ig/threading/AwaitNotInLoopInspection.java | 3 +++ ...aitWithoutCorrespondingSignalInspection.java | 3 +++ .../siyeh/ig/threading/BusyWaitInspection.java | 3 +++ .../ig/threading/ConditionSignalInspection.java | 1 + .../DoubleCheckedLockingInspection.java | 1 + .../EmptySynchronizedStatementInspection.java | 5 ++++- .../MethodMayBeSynchronizedInspection.java | 6 ++++++ .../ig/threading/NakedNotifyInspection.java | 3 +++ .../NestedSynchronizedStatementInspection.java | 3 +++ ...odOverridesSynchronizedMethodInspection.java | 5 ++++- .../NotifyCalledOnConditionInspection.java | 3 +++ ...otifyNotInSynchronizedContextInspection.java | 3 +++ ...otifyWithoutCorrespondingWaitInspection.java | 3 +++ .../ig/threading/ObjectNotifyInspection.java | 7 +++++++ ...AccessedInSynchronizedContextInspection.java | 4 ++++ ...gnalWithoutCorrespondingAwaitInspection.java | 3 +++ ...ocalVariableOrMethodParameterInspection.java | 7 ++++++- .../threading/SynchronizeOnThisInspection.java | 3 +++ .../SystemRunFinalizersOnExitInspection.java | 4 ++++ .../ig/threading/ThreadPriorityInspection.java | 4 ++++ .../siyeh/ig/threading/ThreadRunInspection.java | 2 ++ .../ThreadStopSuspendResumeInspection.java | 4 ++++ .../ThreadWithDefaultRunMethodInspection.java | 4 ++++ .../ig/threading/ThreadYieldInspection.java | 4 ++++ .../threading/UnconditionalWaitInspection.java | 3 +++ .../threading/VolatileArrayFieldInspection.java | 3 +++ .../VolatileLongOrDoubleFieldInspection.java | 3 +++ .../WaitCalledOnConditionInspection.java | 3 +++ .../ig/threading/WaitNotInLoopInspection.java | 3 +++ .../WaitOrAwaitWithoutTimeoutInspection.java | 3 +++ .../WaitWhileHoldingTwoLocksInspection.java | 3 +++ ...aitWithoutCorrespondingNotifyInspection.java | 3 +++ .../src/com/siyeh/ig/ui/TextField.java | 3 +++ .../AmbiguousFieldAccessInspection.java | 3 +++ .../AmbiguousMethodCallInspection.java | 17 ++++++++++++----- ...HidesContainingMethodVariableInspection.java | 5 +++++ .../ClassEscapesItsScopeInspection.java | 4 ++++ .../FieldHidesSuperclassFieldInspection.java | 9 ++++++++- ...riableHidesOuterClassVariableInspection.java | 9 ++++++++- ...lVariableHidingMemberVariableInspection.java | 9 ++++++++- ...odOverridesPackageLocalMethodInspection.java | 11 ++++++++++- .../MethodOverridesPrivateMethodInspection.java | 6 ++++++ .../MethodOverridesStaticMethodInspection.java | 6 ++++++ ...ParameterHidingMemberVariableInspection.java | 7 +++++++ ...TypeParameterHidesVisibleTypeInspection.java | 5 +++++ 417 files changed, 1435 insertions(+), 92 deletions(-) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/ClassReferencesSubclassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/ClassReferencesSubclassInspection.java index b91094a7f097..2dfc8fccc640 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/ClassReferencesSubclassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/ClassReferencesSubclassInspection.java @@ -25,12 +25,14 @@ import org.jetbrains.annotations.Nullable; public class ClassReferencesSubclassInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "class.references.subclass.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiNamedElement element = (PsiNamedElement)infos[0]; @@ -46,6 +48,7 @@ public class ClassReferencesSubclassInspection extends BaseInspection { containingClassName); } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassReferencesSubclassVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java index 66ec9a6ad882..53ef3d2b8ffc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/DeclareCollectionAsInterfaceInspection.java @@ -101,6 +101,7 @@ public class DeclareCollectionAsInterfaceInspection extends BaseInspection { this.typeString = typeString; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/InstanceofThisInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/InstanceofThisInspection.java index 6a1209660033..d517ae6f841d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/InstanceofThisInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/InstanceofThisInspection.java @@ -24,16 +24,19 @@ import org.jetbrains.annotations.NotNull; public class InstanceofThisInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("instanceof.check.for.this.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("instanceof.check.for.this.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new InstanceofThisVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java index c04c935ad565..c4e04cca3653 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/OverlyStrongTypeCastInspection.java @@ -70,6 +70,7 @@ public class OverlyStrongTypeCastInspection extends BaseInspection { private static class OverlyStrongCastFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java index 835046511e74..6220d96b5d33 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/abstraction/TypeMayBeWeakenedInspection.java @@ -21,7 +21,6 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.search.searches.OverridingMethodsSearch; -import com.intellij.util.IncorrectOperationException; import com.intellij.util.Query; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; @@ -123,6 +122,7 @@ public class TypeMayBeWeakenedInspection extends BaseInspection { this.fqClassName = fqClassName; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("type.may.be.weakened.quickfix", fqClassName); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToCollectionFieldFromParameterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToCollectionFieldFromParameterInspection.java index 1bbd83de00fa..528724e22317 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToCollectionFieldFromParameterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToCollectionFieldFromParameterInspection.java @@ -15,10 +15,10 @@ */ package com.siyeh.ig.assignment; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -36,17 +36,20 @@ public class AssignmentToCollectionFieldFromParameterInspection */ public boolean ignorePrivateMethods = true; + @Override @NotNull public String getID() { return "AssignmentToCollectionOrArrayFieldFromParameter"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "assignment.collection.array.field.from.parameter.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiExpression rhs = (PsiExpression)infos[0]; @@ -64,6 +67,7 @@ public class AssignmentToCollectionFieldFromParameterInspection } } + @Override @Nullable public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel( @@ -72,6 +76,7 @@ public class AssignmentToCollectionFieldFromParameterInspection "ignorePrivateMethods"); } + @Override public BaseInspectionVisitor buildVisitor() { return new AssignmentToCollectionFieldFromParameterVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToStaticFieldFromInstanceMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToStaticFieldFromInstanceMethodInspection.java index 1edc01df8eed..570563c82650 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToStaticFieldFromInstanceMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentToStaticFieldFromInstanceMethodInspection.java @@ -27,18 +27,21 @@ import org.jetbrains.annotations.NotNull; public class AssignmentToStaticFieldFromInstanceMethodInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "assignment.to.static.field.from.instance.method.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "assignment.to.static.field.from.instance.method.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new AssignmentToStaticFieldFromInstanceMethod(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentUsedAsConditionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentUsedAsConditionInspection.java index 1dfdf601941d..8f2b629f6cff 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentUsedAsConditionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/AssignmentUsedAsConditionInspection.java @@ -28,18 +28,21 @@ import org.jetbrains.annotations.NotNull; public class AssignmentUsedAsConditionInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "assignment.used.as.condition.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "assignment.used.as.condition.problem.descriptor"); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new AssignmentUsedAsConditionFix(); } @@ -47,12 +50,14 @@ public class AssignmentUsedAsConditionInspection extends BaseInspection { private static class AssignmentUsedAsConditionFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "assignment.used.as.condition.replace.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiAssignmentExpression expression = @@ -66,6 +71,7 @@ public class AssignmentUsedAsConditionInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new AssignmentUsedAsConditionVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/IncrementDecrementUsedAsExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/IncrementDecrementUsedAsExpressionInspection.java index b6278f607c88..7b0d4e3ef018 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/IncrementDecrementUsedAsExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/IncrementDecrementUsedAsExpressionInspection.java @@ -97,6 +97,7 @@ public class IncrementDecrementUsedAsExpressionInspection this.elementText = elementText; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/NestedAssignmentInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/NestedAssignmentInspection.java index 3ff39cbc79a8..e28f3238282e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/NestedAssignmentInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/NestedAssignmentInspection.java @@ -26,18 +26,21 @@ import org.jetbrains.annotations.NotNull; public class NestedAssignmentInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "nested.assignment.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "nested.assignment.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NestedAssignmentVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java index 3a6bef7275aa..e93df553d445 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/assignment/ReplaceAssignmentWithOperatorAssignmentInspection.java @@ -136,6 +136,7 @@ public class ReplaceAssignmentWithOperatorAssignmentInspection extends BaseInspe signText); } + @Override @NotNull public String getName() { return m_name; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java index 358c66737e4a..f893ac229ca2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bitwise/PointlessBitwiseExpressionInspection.java @@ -169,6 +169,7 @@ public class PointlessBitwiseExpressionInspection extends BaseInspection { private class PointlessBitwiseFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bitwise/ShiftOutOfRangeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bitwise/ShiftOutOfRangeInspection.java index c8e978cdd075..eee9459ffd54 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bitwise/ShiftOutOfRangeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bitwise/ShiftOutOfRangeInspection.java @@ -72,6 +72,7 @@ public class ShiftOutOfRangeInspection extends BaseInspection { this.isLong = isLong; } + @Override @NotNull public String getName() { final int newValue; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ArchaicSystemPropertyAccessInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ArchaicSystemPropertyAccessInspection.java index 0744eda55b30..430e2ee98e40 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ArchaicSystemPropertyAccessInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ArchaicSystemPropertyAccessInspection.java @@ -70,6 +70,7 @@ public class ArchaicSystemPropertyAccessInspection extends BaseInspection { private static class ReplaceWithParseMethodFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( @@ -106,6 +107,7 @@ public class ArchaicSystemPropertyAccessInspection extends BaseInspection { private static class ReplaceWithStandardPropertyAccessFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ArrayEqualsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ArrayEqualsInspection.java index 6d9eeed69e36..0eee77fa756b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ArrayEqualsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ArrayEqualsInspection.java @@ -24,7 +24,6 @@ import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.siyeh.ig.psiutils.MethodCallUtils; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -69,6 +68,7 @@ public class ArrayEqualsInspection extends BaseInspection { this.deepEquals = deepEquals; } + @Override @NotNull public String getName() { if (deepEquals) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ArrayHashCodeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ArrayHashCodeInspection.java index 6e96ea6ea9e8..2e46a812f4bc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ArrayHashCodeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ArrayHashCodeInspection.java @@ -66,6 +66,7 @@ public class ArrayHashCodeInspection extends BaseInspection { this.deepHashCode = deepHashCode; } + @Override @NotNull public String getName() { if (deepHashCode) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CastConflictsWithInstanceofInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CastConflictsWithInstanceofInspection.java index 2a8d1b10aeda..77fd142e7040 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CastConflictsWithInstanceofInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CastConflictsWithInstanceofInspection.java @@ -208,6 +208,7 @@ public class CastConflictsWithInstanceofInspection extends BaseInspection { myCastType = castType; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("cast.conflicts.with.instanceof.quickfix1", myCastType, myInstanceofType); @@ -229,6 +230,7 @@ public class CastConflictsWithInstanceofInspection extends BaseInspection { myCastType = castType; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("cast.conflicts.with.instanceof.quickfix2", myInstanceofType, myCastType); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CastToIncompatibleInterfaceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CastToIncompatibleInterfaceInspection.java index 18ed3d757ae9..8f9a9895768c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CastToIncompatibleInterfaceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CastToIncompatibleInterfaceInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class CastToIncompatibleInterfaceInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "casting.to.incompatible.interface.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "casting.to.incompatible.interface.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new CastToIncompatibleInterfaceVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ClassNewInstanceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ClassNewInstanceInspection.java index 06149f46ccfa..afca4c139995 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ClassNewInstanceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ClassNewInstanceInspection.java @@ -22,16 +22,16 @@ import com.intellij.psi.codeStyle.JavaCodeStyleManager; import com.intellij.psi.search.GlobalSearchScope; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; +import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.siyeh.InspectionGadgetsBundle; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import java.util.Set; import java.util.HashSet; +import java.util.Set; public class ClassNewInstanceInspection extends BaseInspection { @@ -57,6 +57,7 @@ public class ClassNewInstanceInspection extends BaseInspection { private static class ClassNewInstanceFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CompareToUsesNonFinalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CompareToUsesNonFinalVariableInspection.java index a1c6c9fa9ac6..b43103bdefda 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CompareToUsesNonFinalVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CompareToUsesNonFinalVariableInspection.java @@ -28,24 +28,28 @@ import org.jetbrains.annotations.Nullable; public class CompareToUsesNonFinalVariableInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "non.final.field.compareto.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "non.final.field.compareto.problem.descriptor"); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { final PsiField field = (PsiField)infos[0]; return MakeFieldFinalFix.buildFix(field); } + @Override public BaseInspectionVisitor buildVisitor() { return new CompareToUsesNonFinalVariableVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CovariantEqualsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CovariantEqualsInspection.java index c3f2642996e4..d80b0b341616 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CovariantEqualsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/CovariantEqualsInspection.java @@ -25,18 +25,21 @@ import org.jetbrains.annotations.NotNull; public class CovariantEqualsInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "covariant.equals.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "covariant.equals.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new CovariantEqualsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EmptyInitializerInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EmptyInitializerInspection.java index 8fca41c32afc..4a3976d4173e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EmptyInitializerInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EmptyInitializerInspection.java @@ -30,35 +30,41 @@ import org.jetbrains.annotations.NotNull; public class EmptyInitializerInspection extends BaseInspection { + @Override @NotNull public String getID() { return "EmptyClassInitializer"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "empty.class.initializer.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "empty.class.initializer.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new EmptyInitializerFix(); } private static class EmptyInitializerFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "empty.class.initializer.delete.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement element = descriptor.getPsiElement(); @@ -70,6 +76,7 @@ public class EmptyInitializerInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new EmptyInitializerVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EmptyStatementBodyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EmptyStatementBodyInspection.java index 4297498b096a..dd9a02421c86 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EmptyStatementBodyInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EmptyStatementBodyInspection.java @@ -15,11 +15,11 @@ */ package com.siyeh.ig.bugs; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.psi.*; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -31,30 +31,36 @@ public class EmptyStatementBodyInspection extends BaseInspection { */ public boolean m_reportEmptyBlocks = true; + @Override @NotNull public String getID() { return "StatementWithEmptyBody"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("statement.with.empty.body.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("statement.with.empty.body.problem.descriptor"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("statement.with.empty.body.include.option"), this, "m_reportEmptyBlocks"); } + @Override public BaseInspectionVisitor buildVisitor() { return new EmptyStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EqualsBetweenInconvertibleTypesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EqualsBetweenInconvertibleTypesInspection.java index 7a5731e5b11b..717e10e98cbd 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EqualsBetweenInconvertibleTypesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EqualsBetweenInconvertibleTypesInspection.java @@ -26,12 +26,14 @@ import org.jetbrains.annotations.NotNull; public class EqualsBetweenInconvertibleTypesInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "equals.between.inconvertible.types.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiType comparedType = (PsiType)infos[0]; @@ -42,10 +44,12 @@ public class EqualsBetweenInconvertibleTypesInspection comparisonType.getPresentableText()); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new EqualsBetweenInconvertibleTypesVisitor(); } @@ -83,8 +87,8 @@ public class EqualsBetweenInconvertibleTypesInspection } final PsiType comparedTypeErasure = TypeConversionUtil.erasure(comparedType); final PsiType comparisonTypeErasure = TypeConversionUtil.erasure(comparisonType); - if (comparedTypeErasure == null || - comparisonTypeErasure == null || + if (comparedTypeErasure == null || + comparisonTypeErasure == null || TypeConversionUtil.areTypesConvertible(comparedTypeErasure, comparisonTypeErasure)) { return; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EqualsUsesNonFinalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EqualsUsesNonFinalVariableInspection.java index 00d4927e1fab..edc0361d2965 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EqualsUsesNonFinalVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/EqualsUsesNonFinalVariableInspection.java @@ -27,29 +27,34 @@ import org.jetbrains.annotations.Nullable; public class EqualsUsesNonFinalVariableInspection extends BaseInspection { + @Override @NotNull public String getID() { return "NonFinalFieldReferenceInEquals"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "non.final.field.in.equals.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "non.final.field.in.equals.problem.descriptor"); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { final PsiField field = (PsiField)infos[0]; return MakeFieldFinalFix.buildFix(field); } + @Override public BaseInspectionVisitor buildVisitor() { return new EqualsUsesNonFinalVariableVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ForLoopThatDoesntUseLoopVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ForLoopThatDoesntUseLoopVariableInspection.java index b17d786b50ac..c817907a76c9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ForLoopThatDoesntUseLoopVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ForLoopThatDoesntUseLoopVariableInspection.java @@ -24,12 +24,14 @@ import org.jetbrains.annotations.NotNull; public class ForLoopThatDoesntUseLoopVariableInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "for.loop.not.use.loop.variable.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final boolean condition = ((Boolean)infos[0]).booleanValue(); @@ -46,6 +48,7 @@ public class ForLoopThatDoesntUseLoopVariableInspection "for.loop.not.use.loop.variable.problem.descriptor.update"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ForLoopThatDoesntUseLoopVariableVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/FormatDecode.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/FormatDecode.java index 4a27c2dacbd6..f659b9b31e0c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/FormatDecode.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/FormatDecode.java @@ -172,10 +172,12 @@ class FormatDecode { private static class AllValidator implements Validator { + @Override public boolean valid(PsiType type) { return true; } + @Override public String type() { return "any"; } @@ -183,6 +185,7 @@ class FormatDecode { private static class DateValidator implements Validator { + @Override public boolean valid(PsiType type) { final String text = type.getCanonicalText(); @@ -192,6 +195,7 @@ class FormatDecode { CommonClassNames.JAVA_UTIL_CALENDAR.equals(text); } + @Override public String type() { return "Date/Time"; } @@ -199,12 +203,14 @@ class FormatDecode { private static class CharValidator implements Validator { + @Override public boolean valid(PsiType type) { final String text = type.getCanonicalText(); return PsiType.CHAR.equals(type) || CommonClassNames.JAVA_LANG_CHARACTER.equals(text); } + @Override public String type() { return "char"; } @@ -212,6 +218,7 @@ class FormatDecode { private static class IntValidator implements Validator { + @Override public boolean valid(PsiType type) { final String text = type.getCanonicalText(); return PsiType.INT.equals(type) || @@ -225,6 +232,7 @@ class FormatDecode { "java.math.BigInteger".equals(text); } + @Override public String type() { return "integer type"; } @@ -232,6 +240,7 @@ class FormatDecode { private static class FloatValidator implements Validator { + @Override public boolean valid(PsiType type) { final String text = type.getCanonicalText(); return PsiType.DOUBLE.equals(type) || @@ -241,6 +250,7 @@ class FormatDecode { "java.math.BigDecimal".equals(text); } + @Override public String type() { return "floating point"; } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/HashCodeUsesNonFinalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/HashCodeUsesNonFinalVariableInspection.java index 42a375cbe500..60c1957a756e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/HashCodeUsesNonFinalVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/HashCodeUsesNonFinalVariableInspection.java @@ -28,29 +28,34 @@ import org.jetbrains.annotations.Nullable; public class HashCodeUsesNonFinalVariableInspection extends BaseInspection { + @Override @NotNull public String getID() { return "NonFinalFieldReferencedInHashCode"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "non.final.field.in.hashcode.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "non.final.field.in.hashcode.problem.descriptor"); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { final PsiField field = (PsiField)infos[0]; return MakeFieldFinalFix.buildFix(field); } + @Override public BaseInspectionVisitor buildVisitor() { return new HashCodeUsesNonFinalVariableVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ImplicitArrayToStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ImplicitArrayToStringInspection.java index 1669020af209..84307f732e9e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ImplicitArrayToStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ImplicitArrayToStringInspection.java @@ -86,6 +86,7 @@ public class ImplicitArrayToStringInspection extends BaseInspection { this.removeToString = removeToString; } + @Override @NotNull public String getName() { @NonNls final String expressionText; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/InstanceofIncompatibleInterfaceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/InstanceofIncompatibleInterfaceInspection.java index 48bc709e7bef..f9ed0508d7b8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/InstanceofIncompatibleInterfaceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/InstanceofIncompatibleInterfaceInspection.java @@ -25,18 +25,21 @@ import org.jetbrains.annotations.NotNull; public class InstanceofIncompatibleInterfaceInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "instanceof.with.incompatible.interface.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "instanceof.with.incompatible.interface.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new InstanceofIncompatibleInterfaceVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/InstantiationOfUtilityClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/InstantiationOfUtilityClassInspection.java index d0805b5538d5..91449372f975 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/InstantiationOfUtilityClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/InstantiationOfUtilityClassInspection.java @@ -27,18 +27,21 @@ import org.jetbrains.annotations.NotNull; public class InstantiationOfUtilityClassInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "instantiation.utility.class.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "instantiation.utility.class.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new InstantiationOfUtilityClassVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java index 1fc55a332e7d..ea55c8778593 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/IteratorHasNextCallsIteratorNextInspection.java @@ -29,18 +29,21 @@ import org.jetbrains.annotations.NotNull; public class IteratorHasNextCallsIteratorNextInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "iterator.hasnext.which.calls.next.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "iterator.hasnext.which.calls.next.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new IteratorHasNextCallsIteratorNext(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java index 7f1a33c505b6..b21554fb3b87 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MathRandomCastToIntInspection.java @@ -63,6 +63,7 @@ public class MathRandomCastToIntInspection extends BaseInspection { } private static class MathRandomCastToIntegerFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledCompareToInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledCompareToInspection.java index 94cd419f9e19..b4f291e09d74 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledCompareToInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledCompareToInspection.java @@ -28,22 +28,26 @@ import org.jetbrains.annotations.NotNull; public class MisspelledCompareToInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "misspelled.compareto.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "misspelled.compareto.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(HardcodedMethodConstants.COMPARE_TO); } + @Override public BaseInspectionVisitor buildVisitor() { return new MisspelledCompareToVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledEqualsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledEqualsInspection.java index f9f1db15d9a6..6fbfc19fe394 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledEqualsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledEqualsInspection.java @@ -28,22 +28,26 @@ import org.jetbrains.annotations.NotNull; public class MisspelledEqualsInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "misspelled.equals.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "misspelled.equals.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(HardcodedMethodConstants.EQUALS); } + @Override public BaseInspectionVisitor buildVisitor() { return new MisspelledEqualsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledHashcodeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledHashcodeInspection.java index 1829f6c2fd36..83e5b6b63294 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledHashcodeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledHashcodeInspection.java @@ -28,22 +28,26 @@ import org.jetbrains.annotations.NotNull; public class MisspelledHashcodeInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "misspelled.hashcode.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "misspelled.hashcode.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(HardcodedMethodConstants.HASH_CODE); } + @Override public BaseInspectionVisitor buildVisitor() { return new MisspelledHashcodeVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledToStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledToStringInspection.java index f49aced413f6..27518e6acb4a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledToStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/MisspelledToStringInspection.java @@ -28,22 +28,26 @@ import org.jetbrains.annotations.NotNull; public class MisspelledToStringInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "misspelled.tostring.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "misspelled.tostring.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(HardcodedMethodConstants.TO_STRING); } + @Override public BaseInspectionVisitor buildVisitor() { return new MisspelledToStringVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/NewStringBufferWithCharArgumentInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/NewStringBufferWithCharArgumentInspection.java index 8377b997225b..f72d9d5effd1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/NewStringBufferWithCharArgumentInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/NewStringBufferWithCharArgumentInspection.java @@ -63,6 +63,7 @@ public class NewStringBufferWithCharArgumentInspection extends BaseInspection { private static class NewStringBufferWithCharArgumentFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/NonShortCircuitBooleanInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/NonShortCircuitBooleanInspection.java index f94237d0b048..cf3469382895 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/NonShortCircuitBooleanInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/NonShortCircuitBooleanInspection.java @@ -17,7 +17,10 @@ package com.siyeh.ig.bugs; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; -import com.intellij.psi.*; +import com.intellij.psi.JavaTokenType; +import com.intellij.psi.PsiExpression; +import com.intellij.psi.PsiPolyadicExpression; +import com.intellij.psi.PsiType; import com.intellij.psi.tree.IElementType; import com.intellij.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; @@ -28,21 +31,25 @@ import org.jetbrains.annotations.NotNull; public class NonShortCircuitBooleanInspection extends BaseInspection { + @Override @NotNull public String getID() { return "NonShortCircuitBooleanExpression"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("non.short.circuit.boolean.expression.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("non.short.circuit.boolean.expression.problem.descriptor"); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new NonShortCircuitBooleanFix(); } @@ -50,11 +57,13 @@ public class NonShortCircuitBooleanInspection extends BaseInspection { private static class NonShortCircuitBooleanFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("non.short.circuit.boolean.expression.replace.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiPolyadicExpression expression = (PsiPolyadicExpression)descriptor.getPsiElement(); final IElementType tokenType = expression.getOperationTokenType(); @@ -80,6 +89,7 @@ public class NonShortCircuitBooleanInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new NonShortCircuitBooleanVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/NullArgumentToVariableArgMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/NullArgumentToVariableArgMethodInspection.java index 2a91c48c7834..a14e18543820 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/NullArgumentToVariableArgMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/NullArgumentToVariableArgMethodInspection.java @@ -26,22 +26,26 @@ import org.jetbrains.annotations.NotNull; public class NullArgumentToVariableArgMethodInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "null.argument.to.var.arg.method.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "null.argument.to.var.arg.method.problem.descriptor"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new NullArgumentToVariableArgVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java index 582a1a5d8d7d..11d418a88af2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ObjectEqualityInspection.java @@ -143,6 +143,7 @@ public class ObjectEqualityInspection extends BaseInspection { final PsiElementProcessor.CollectElementsWithLimit processor = new PsiElementProcessor.CollectElementsWithLimit(6); final ProgressManager progressManager = ProgressManager.getInstance(); progressManager.runProcess(new Runnable() { + @Override public void run() { ClassInheritorsSearch.search(aClass, scope, true, true).forEach(new PsiElementProcessorAdapter(processor)); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ObjectEqualsNullInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ObjectEqualsNullInspection.java index 8ae1f7678558..8116cf39378d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ObjectEqualsNullInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ObjectEqualsNullInspection.java @@ -27,22 +27,26 @@ import org.jetbrains.annotations.NotNull; public class ObjectEqualsNullInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "object.equals.null.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "object.equals.null.problem.descriptor"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new ObjectEqualsNullVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ResultOfObjectAllocationIgnoredInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ResultOfObjectAllocationIgnoredInspection.java index eace327f462d..86ade7c861fc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ResultOfObjectAllocationIgnoredInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/ResultOfObjectAllocationIgnoredInspection.java @@ -25,16 +25,19 @@ import org.jetbrains.annotations.NotNull; public class ResultOfObjectAllocationIgnoredInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("result.of.object.allocation.ignored.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("result.of.object.allocation.ignored.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ResultOfObjectAllocationIgnoredVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java index a00b64564e2c..77bc67cade34 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StaticCallOnSubclassInspection.java @@ -28,17 +28,20 @@ import org.jetbrains.annotations.NotNull; public class StaticCallOnSubclassInspection extends BaseInspection { + @Override @NotNull public String getID() { return "StaticMethodReferencedViaSubclass"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "static.method.via.subclass.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiClass declaringClass = (PsiClass)infos[0]; @@ -48,18 +51,21 @@ public class StaticCallOnSubclassInspection extends BaseInspection { declaringClass.getQualifiedName(), referencedClass.getQualifiedName()); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new StaticCallOnSubclassFix(); } private static class StaticCallOnSubclassFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "static.method.via.subclass.rationalize.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiIdentifier name = @@ -92,6 +98,7 @@ public class StaticCallOnSubclassInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new StaticCallOnSubclassVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StaticFieldReferenceOnSubclassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StaticFieldReferenceOnSubclassInspection.java index bc88820b8ae8..feffc6e1acfa 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StaticFieldReferenceOnSubclassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StaticFieldReferenceOnSubclassInspection.java @@ -29,17 +29,20 @@ import org.jetbrains.annotations.NotNull; public class StaticFieldReferenceOnSubclassInspection extends BaseInspection { + @Override @NotNull public String getID() { return "StaticFieldReferencedViaSubclass"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "static.field.via.subclass.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiClass declaringClass = (PsiClass)infos[0]; @@ -50,18 +53,21 @@ public class StaticFieldReferenceOnSubclassInspection referencedClass.getQualifiedName()); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new StaticFieldOnSubclassFix(); } private static class StaticFieldOnSubclassFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "static.field.via.subclass.rationalize.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiIdentifier name = @@ -75,6 +81,7 @@ public class StaticFieldReferenceOnSubclassInspection } } + @Override public BaseInspectionVisitor buildVisitor() { return new StaticFieldOnSubclassVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StringConcatenationInFormatCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StringConcatenationInFormatCallInspection.java index 7e063201ea5a..812b105cbfda 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StringConcatenationInFormatCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StringConcatenationInFormatCallInspection.java @@ -57,6 +57,7 @@ public class StringConcatenationInFormatCallInspection extends BaseInspection { myPlural = plural; } + @Override @NotNull public String getName() { if (myPlural) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StringConcatenationInMessageFormatCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StringConcatenationInMessageFormatCallInspection.java index 21f7b91b9316..0ba3920dc3ac 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StringConcatenationInMessageFormatCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StringConcatenationInMessageFormatCallInspection.java @@ -61,6 +61,7 @@ public class StringConcatenationInMessageFormatCallInspection extends BaseInspec this.variableName = variableName; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("string.concatenation.in.format.call.quickfix", variableName); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StringEqualityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StringEqualityInspection.java index a5595b0810aa..0ac07245fd8f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StringEqualityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/StringEqualityInspection.java @@ -15,7 +15,10 @@ */ package com.siyeh.ig.bugs; -import com.intellij.psi.*; +import com.intellij.psi.PsiBinaryExpression; +import com.intellij.psi.PsiExpression; +import com.intellij.psi.PsiJavaToken; +import com.intellij.psi.PsiKeyword; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -27,24 +30,29 @@ import org.jetbrains.annotations.NotNull; public class StringEqualityInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("string.comparison.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("string.comparison.problem.descriptor"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new ObjectEqualityVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new EqualityToEqualsFix(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/SubtractionInCompareToInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/SubtractionInCompareToInspection.java index d6389db80691..5e5c2cbd3a9b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/SubtractionInCompareToInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/SubtractionInCompareToInspection.java @@ -15,7 +15,10 @@ */ package com.siyeh.ig.bugs; -import com.intellij.psi.*; +import com.intellij.psi.JavaTokenType; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiMethod; +import com.intellij.psi.PsiPolyadicExpression; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiTreeUtil; import com.siyeh.InspectionGadgetsBundle; @@ -26,18 +29,21 @@ import org.jetbrains.annotations.NotNull; public class SubtractionInCompareToInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "subtraction.in.compareto.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "subtraction.in.compareto.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SubtractionInCompareToVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/TextLabelInSwitchStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/TextLabelInSwitchStatementInspection.java index d9ebdbaebe17..e8d70713e3a7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/TextLabelInSwitchStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/bugs/TextLabelInSwitchStatementInspection.java @@ -23,18 +23,21 @@ import org.jetbrains.annotations.NotNull; public class TextLabelInSwitchStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "text.label.in.switch.statement.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "text.label.in.switch.statement.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new TextLabelInSwitchStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/AnonymousInnerClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/AnonymousInnerClassInspection.java index 351279d9e55a..8a158991c934 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/AnonymousInnerClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/AnonymousInnerClassInspection.java @@ -27,26 +27,31 @@ import org.jetbrains.annotations.NotNull; public class AnonymousInnerClassInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "anonymous.inner.class.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "anonymous.inner.class.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new MoveAnonymousToInnerClassFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new AnonymousInnerClassVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInTopLevelPackageInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInTopLevelPackageInspection.java index 0c737cfa98a1..f4e036636f58 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInTopLevelPackageInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInTopLevelPackageInspection.java @@ -15,10 +15,10 @@ */ package com.siyeh.ig.classlayout; +import com.intellij.psi.JspPsiUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiFile; import com.intellij.psi.PsiJavaFile; -import com.intellij.psi.JspPsiUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -29,31 +29,37 @@ import org.jetbrains.annotations.NotNull; public class ClassInTopLevelPackageInspection extends BaseInspection { + @Override @NotNull public String getID() { return "ClassWithoutPackageStatement"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "class.in.top.level.package.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "class.in.top.level.package.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new MoveClassFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassInTopLevelPackageVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java index 5eba85e50529..61267cd73918 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassInitializerInspection.java @@ -27,17 +27,20 @@ import org.jetbrains.annotations.Nullable; public class ClassInitializerInspection extends BaseInspection { + @Override @NotNull public String getID() { return "NonStaticInitializer"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "class.initializer.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( @@ -50,6 +53,7 @@ public class ClassInitializerInspection extends BaseInspection { return new ChangeModifierFix(PsiModifier.STATIC); } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassInitializerVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassMayBeInterfaceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassMayBeInterfaceInspection.java index 479226013f4c..e8eb75e3fcf3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassMayBeInterfaceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassMayBeInterfaceInspection.java @@ -31,30 +31,35 @@ import org.jetbrains.annotations.Nullable; public class ClassMayBeInterfaceInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "class.may.be.interface.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "class.may.be.interface.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new ClassMayBeInterfaceFix(); } private static class ClassMayBeInterfaceFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "class.may.be.interface.convert.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiIdentifier classNameIdentifier = @@ -149,6 +154,7 @@ public class ClassMayBeInterfaceInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassMayBeInterfaceVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassNameDiffersFromFileNameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassNameDiffersFromFileNameInspection.java index 58479bd5216c..b15fdae9de71 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassNameDiffersFromFileNameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ClassNameDiffersFromFileNameInspection.java @@ -15,10 +15,10 @@ */ package com.siyeh.ig.classlayout; +import com.intellij.psi.JspPsiUtil; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiJavaFile; -import com.intellij.psi.JspPsiUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -29,18 +29,21 @@ import org.jetbrains.annotations.Nullable; public class ClassNameDiffersFromFileNameInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "class.name.differs.from.file.name.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "class.name.differs.from.file.name.problem.descriptor"); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { final PsiJavaFile file = (PsiJavaFile)infos[0]; @@ -57,6 +60,7 @@ public class ClassNameDiffersFromFileNameInspection extends BaseInspection { return new RenameFix(filenameWithoutPrefix); } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassNameDiffersFromFileNameVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ConstantDeclaredInAbstractClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ConstantDeclaredInAbstractClassInspection.java index 9cb2cce82aae..4fbabb6868d7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ConstantDeclaredInAbstractClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ConstantDeclaredInAbstractClassInspection.java @@ -25,18 +25,21 @@ import org.jetbrains.annotations.NotNull; public class ConstantDeclaredInAbstractClassInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "constant.declared.in.abstract.class.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "constant.declared.in.abstract.class.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ConstantDeclaredInAbstractClassVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ConstantDeclaredInInterfaceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ConstantDeclaredInInterfaceInspection.java index f81c9ff00d68..0d60846f27e5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ConstantDeclaredInInterfaceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ConstantDeclaredInInterfaceInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class ConstantDeclaredInInterfaceInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "constant.declared.in.interface.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "constant.declared.in.interface.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ConstantDeclaredInInterfaceVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FieldCanBeMovedToSubclassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FieldCanBeMovedToSubclassInspection.java index 2725165b907d..cc1c4efc348e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FieldCanBeMovedToSubclassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FieldCanBeMovedToSubclassInspection.java @@ -39,6 +39,7 @@ public class FieldCanBeMovedToSubclassInspection extends BaseGlobalInspection { //return InspectionGadgetsBundle.message("field.can.be.moved.so.subclass.display.name"); } + @Override @Nullable public CommonProblemDescriptor[] checkElement( RefEntity refEntity, AnalysisScope analysisScope, diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FinalMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FinalMethodInspection.java index 67c1bcc7d7fb..afe6f4775110 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FinalMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FinalMethodInspection.java @@ -26,21 +26,25 @@ import org.jetbrains.annotations.NotNull; public class FinalMethodInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("final.method.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "final.method.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new FinalMethodVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new RemoveModifierFix((String)infos[0]); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FinalStaticMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FinalStaticMethodInspection.java index 071eb06d0bee..f7850b019bab 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FinalStaticMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/FinalStaticMethodInspection.java @@ -26,26 +26,31 @@ import org.jetbrains.annotations.NotNull; public class FinalStaticMethodInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "final.static.method.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "final.static.method.problem.descriptor"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new FinalStaticMethodVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new RemoveModifierFix((String)infos[0]); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/InnerClassOnInterfaceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/InnerClassOnInterfaceInspection.java index c66dd130088d..cff1d771c29c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/InnerClassOnInterfaceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/InnerClassOnInterfaceInspection.java @@ -15,10 +15,10 @@ */ package com.siyeh.ig.classlayout; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.psi.PsiAnonymousClass; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiTypeParameter; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -35,23 +35,27 @@ public class InnerClassOnInterfaceInspection extends BaseInspection { */ public boolean m_ignoreInnerInterfaces = false; + @Override @NotNull public String getID() { return "InnerClassOfInterface"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "inner.class.on.interface.display.name"); } + @Override public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message( "inner.class.on.interface.ignore.option"), this, "m_ignoreInnerInterfaces"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiClass parentInterface = (PsiClass)infos[0]; @@ -60,14 +64,17 @@ public class InnerClassOnInterfaceInspection extends BaseInspection { "inner.class.on.interface.problem.descriptor", interfaceName); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new MoveClassFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new InnerClassOnInterfaceVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/LimitedScopeInnerClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/LimitedScopeInnerClassInspection.java index 5a85bec4c765..0187c39f7cb6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/LimitedScopeInnerClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/LimitedScopeInnerClassInspection.java @@ -26,26 +26,31 @@ import org.jetbrains.annotations.NotNull; public class LimitedScopeInnerClassInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "limited.scope.inner.class.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "limited.scope.inner.class.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new MoveClassFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new LimitedScopeInnerClassVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java index da459c6d40fe..96aed1ea843c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ListenerMayUseAdapterInspection.java @@ -29,7 +29,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; -import javax.swing.JComponent; +import javax.swing.*; public class ListenerMayUseAdapterInspection extends BaseInspection { @@ -76,6 +76,7 @@ public class ListenerMayUseAdapterInspection extends BaseInspection { this.adapterClass = adapterClass; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MethodReturnAlwaysConstantInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MethodReturnAlwaysConstantInspection.java index ee75dc7fd472..733f52b2fa7e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MethodReturnAlwaysConstantInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MethodReturnAlwaysConstantInspection.java @@ -43,6 +43,7 @@ public class MethodReturnAlwaysConstantInspection extends BaseGlobalInspection { "method.return.always.constant.display.name"); } + @Override public CommonProblemDescriptor[] checkElement( RefEntity refEntity, AnalysisScope scope, InspectionManager manager, GlobalInspectionContext globalContext) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MissingDeprecatedAnnotationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MissingDeprecatedAnnotationInspection.java index dcaa6c0fe205..92c3d13399a3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MissingDeprecatedAnnotationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MissingDeprecatedAnnotationInspection.java @@ -53,6 +53,7 @@ public class MissingDeprecatedAnnotationInspection extends BaseInspection { private static class MissingDeprecatedAnnotationFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("missing.deprecated.annotation.add.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MissingOverrideAnnotationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MissingOverrideAnnotationInspection.java index 86ad139b48e0..0e1c587e2c57 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MissingOverrideAnnotationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MissingOverrideAnnotationInspection.java @@ -83,6 +83,7 @@ public class MissingOverrideAnnotationInspection extends BaseInspection { private static class MissingOverrideAnnotationFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MultipleTopLevelClassesInFileInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MultipleTopLevelClassesInFileInspection.java index f8f027002ee1..e12e284080ca 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MultipleTopLevelClassesInFileInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/MultipleTopLevelClassesInFileInspection.java @@ -27,26 +27,31 @@ import org.jetbrains.annotations.NotNull; public class MultipleTopLevelClassesInFileInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "multiple.top.level.classes.in.file.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "multiple.top.level.classes.in.file.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new MoveClassFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new MultipleTopLevelClassesInFileVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/NonFinalFieldInEnumInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/NonFinalFieldInEnumInspection.java index f292af39ff21..4992b5d4ee47 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/NonFinalFieldInEnumInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/NonFinalFieldInEnumInspection.java @@ -46,6 +46,7 @@ public class NonFinalFieldInEnumInspection extends BaseInspection { return InspectionGadgetsBundle.message("non.final.field.in.enum.problem.descriptor", enumClass.getName()); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { final PsiField field = (PsiField)infos[1]; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/NoopMethodInAbstractClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/NoopMethodInAbstractClassInspection.java index dfcd908d8e77..99180b628738 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/NoopMethodInAbstractClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/NoopMethodInAbstractClassInspection.java @@ -26,16 +26,19 @@ import org.jetbrains.annotations.NotNull; public class NoopMethodInAbstractClassInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("noop.method.in.abstract.class.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("noop.method.in.abstract.class.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NoopMethodInAbstractClassVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ProtectedMemberInFinalClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ProtectedMemberInFinalClassInspection.java index 0b057efbbc5a..02562bbbd036 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ProtectedMemberInFinalClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/ProtectedMemberInFinalClassInspection.java @@ -71,6 +71,7 @@ public class ProtectedMemberInFinalClassInspection extends BaseInspection { private static class MakePrivateFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("make.private.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/PublicConstructorInNonPublicClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/PublicConstructorInNonPublicClassInspection.java index 08bb2434f55c..7cf7cc5f98c0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/PublicConstructorInNonPublicClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/PublicConstructorInNonPublicClassInspection.java @@ -32,11 +32,13 @@ import java.util.List; public class PublicConstructorInNonPublicClassInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("public.constructor.in.non.public.class.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiMethod method = (PsiMethod)infos[0]; @@ -44,10 +46,12 @@ public class PublicConstructorInNonPublicClassInspection extends BaseInspection method.getName()); } + @Override public BaseInspectionVisitor buildVisitor() { return new PublicConstructorInNonPublicClassVisitor(); } + @Override @NotNull public InspectionGadgetsFix[] buildFixes(Object... infos) { final List fixes = new ArrayList(); @@ -68,6 +72,7 @@ public class PublicConstructorInNonPublicClassInspection extends BaseInspection this.modifier = modifier; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( @@ -76,6 +81,7 @@ public class PublicConstructorInNonPublicClassInspection extends BaseInspection ); } + @Override protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement element = descriptor.getPsiElement(); final PsiModifierList modifierList = (PsiModifierList)element.getParent(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/StaticFieldCanBeMovedToUseInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/StaticFieldCanBeMovedToUseInspection.java index 0b85aacd675d..b5e749b6c1f9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/StaticFieldCanBeMovedToUseInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/StaticFieldCanBeMovedToUseInspection.java @@ -40,6 +40,7 @@ public class StaticFieldCanBeMovedToUseInspection extends BaseGlobalInspection { // "static.field.can.be.moved.to.use.display.name"); } + @Override @Nullable public CommonProblemDescriptor[] checkElement( RefEntity refEntity, AnalysisScope analysisScope, diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/StaticNonFinalFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/StaticNonFinalFieldInspection.java index 1826d0c5d558..d74dec72c5a8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/StaticNonFinalFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/StaticNonFinalFieldInspection.java @@ -27,24 +27,28 @@ import org.jetbrains.annotations.Nullable; public class StaticNonFinalFieldInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "static.non.final.field.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "static.non.final.field.problem.descriptor"); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { final PsiField field = (PsiField)infos[0]; return MakeFieldFinalFix.buildFix(field); } + @Override public BaseInspectionVisitor buildVisitor() { return new StaticNonFinalFieldVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithPublicConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithPublicConstructorInspection.java index 65e50faecc4f..59d529e4037b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithPublicConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithPublicConstructorInspection.java @@ -65,6 +65,7 @@ public class UtilityClassWithPublicConstructorInspection m_multipleConstructors = multipleConstructors; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java index a36331612ef0..d524ae25ecbb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classlayout/UtilityClassWithoutPrivateConstructorInspection.java @@ -100,6 +100,7 @@ public class UtilityClassWithoutPrivateConstructorInspection extends BaseInspect private static class CreateEmptyPrivateConstructor extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("utility.class.without.private.constructor.create.quickfix"); @@ -122,6 +123,7 @@ public class UtilityClassWithoutPrivateConstructorInspection extends BaseInspect final PsiElement context = element.getParent(); if (context instanceof PsiNewExpression) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { Messages.showInfoMessage(aClass.getProject(), "Utility class has instantiations, private constructor will not be created", @@ -144,6 +146,7 @@ public class UtilityClassWithoutPrivateConstructorInspection extends BaseInspect private static class MakeConstructorPrivateFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("utility.class.without.private.constructor.make.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassComplexityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassComplexityInspection.java index 96e2cf060a29..81e09de91492 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassComplexityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassComplexityInspection.java @@ -27,26 +27,31 @@ public class ClassComplexityInspection private static final int DEFAULT_COMPLEXITY_LIMIT = 80; + @Override @NotNull public String getID() { return "OverlyComplexClass"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "overly.complex.class.display.name"); } + @Override protected int getDefaultLimit() { return DEFAULT_COMPLEXITY_LIMIT; } + @Override protected String getConfigurationLabel() { return InspectionGadgetsBundle.message( "cyclomatic.complexity.limit.option"); } + @Override @NotNull public String buildErrorString(Object... infos) { final Integer totalComplexity = (Integer)infos[0]; @@ -54,6 +59,7 @@ public class ClassComplexityInspection "overly.complex.class.problem.descriptor", totalComplexity); } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassComplexityVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassInheritanceDepthInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassInheritanceDepthInspection.java index b48ed92e44f2..75fd5c1ce12d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassInheritanceDepthInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassInheritanceDepthInspection.java @@ -28,6 +28,7 @@ import java.util.Set; public class ClassInheritanceDepthInspection extends ClassMetricInspection { + @Override @NotNull public String getID() { return "ClassTooDeepInInheritanceTree"; @@ -35,20 +36,24 @@ public class ClassInheritanceDepthInspection private static final int CLASS_INHERITANCE_LIMIT = 2; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("class.too.deep.display.name"); } + @Override protected int getDefaultLimit() { return CLASS_INHERITANCE_LIMIT; } + @Override protected String getConfigurationLabel() { return InspectionGadgetsBundle.message( "class.too.deep.inheritance.depth.limit.option"); } + @Override @NotNull public String buildErrorString(Object... infos) { final Integer count = (Integer)infos[0]; @@ -56,6 +61,7 @@ public class ClassInheritanceDepthInspection "class.too.deep.problem.descriptor", count); } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassNestingLevel(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassMetricInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassMetricInspection.java index 8e088048fff8..b10c078e4b8d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassMetricInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassMetricInspection.java @@ -15,10 +15,10 @@ */ package com.siyeh.ig.classmetrics; -import com.siyeh.ig.BaseInspection; import com.intellij.codeInspection.ui.SingleIntegerFieldOptionsPanel; +import com.siyeh.ig.BaseInspection; -import javax.swing.JComponent; +import javax.swing.*; public abstract class ClassMetricInspection extends BaseInspection { @@ -35,6 +35,7 @@ public abstract class ClassMetricInspection extends BaseInspection { return m_limit; } + @Override public JComponent createOptionsPanel() { final String label = getConfigurationLabel(); return new SingleIntegerFieldOptionsPanel(label, diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassNestingDepthInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassNestingDepthInspection.java index 05f11420872b..37f3751706a3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassNestingDepthInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ClassNestingDepthInspection.java @@ -27,26 +27,31 @@ public class ClassNestingDepthInspection private static final int CLASS_NESTING_LIMIT = 1; + @Override @NotNull public String getID() { return "InnerClassTooDeeplyNested"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "inner.class.too.deeply.nested.display.name"); } + @Override protected int getDefaultLimit() { return CLASS_NESTING_LIMIT; } + @Override protected String getConfigurationLabel() { return InspectionGadgetsBundle.message( "inner.class.too.deeply.nested.nesting.limit.option"); } + @Override @NotNull public String buildErrorString(Object... infos) { final Integer nestingLevel = (Integer)infos[0]; @@ -55,6 +60,7 @@ public class ClassNestingDepthInspection nestingLevel); } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassNestingLevel(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ConstructorCountInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ConstructorCountInspection.java index 39f61b3d4636..24bfbea7f2d0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ConstructorCountInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/classmetrics/ConstructorCountInspection.java @@ -33,20 +33,24 @@ public class ConstructorCountInspection extends ClassMetricInspection { public boolean ignoreDeprecatedConstructors = false; + @Override @NotNull public String getID() { return "ClassWithTooManyConstructors"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("too.many.constructors.display.name"); } + @Override protected int getDefaultLimit() { return CONSTRUCTOR_COUNT_LIMIT; } + @Override protected String getConfigurationLabel() { return InspectionGadgetsBundle.message("too.many.constructors.count.limit.option"); } @@ -68,12 +72,14 @@ public class ConstructorCountInspection extends ClassMetricInspection { return panel; } + @Override @NotNull public String buildErrorString(Object... infos) { final Integer count = (Integer)infos[0]; return InspectionGadgetsBundle.message("too.many.constructors.problem.descriptor", count); } + @Override public BaseInspectionVisitor buildVisitor() { return new ConstructorCountVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneCallsConstructorsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneCallsConstructorsInspection.java index ef09f62414c0..40d90c1ed6da 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneCallsConstructorsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneCallsConstructorsInspection.java @@ -25,18 +25,21 @@ import org.jetbrains.annotations.NotNull; public class CloneCallsConstructorsInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "clone.instantiates.objects.with.constructor.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "clone.instantiates.objects.with.constructor.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new CloneCallsConstructorVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneCallsSuperCloneInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneCallsSuperCloneInspection.java index 4994730c35d2..43317990ac9b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneCallsSuperCloneInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/cloneable/CloneCallsSuperCloneInspection.java @@ -26,27 +26,32 @@ import org.jetbrains.annotations.NotNull; public class CloneCallsSuperCloneInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CloneDoesntCallSuperClone"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "clone.doesnt.call.super.clone.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "clone.doesnt.call.super.clone.problem.descriptor"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new NoExplicitCloneCallsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/BreakStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/BreakStatementInspection.java index 436a169c30de..e7f14e92325d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/BreakStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/BreakStatementInspection.java @@ -24,17 +24,20 @@ import org.jetbrains.annotations.NotNull; public class BreakStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("break.statement.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "statement.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new BreakStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/BreakStatementWithLabelInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/BreakStatementWithLabelInspection.java index 0f570d439f86..2c29601d2ba4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/BreakStatementWithLabelInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/BreakStatementWithLabelInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class BreakStatementWithLabelInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "break.statement.with.label.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "break.statement.with.label.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new BreakStatementWithLabelVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspection.java index ab147d0460f2..d51b23e7c02a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConditionalExpressionWithIdenticalBranchesInspection.java @@ -30,30 +30,35 @@ import org.jetbrains.annotations.NotNull; public class ConditionalExpressionWithIdenticalBranchesInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "conditional.expression.with.identical.branches.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "conditional.expression.with.identical.branches.problem.descriptor"); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new CollapseConditional(); } private static class CollapseConditional extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "conditional.expression.with.identical.branches.collapse.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiConditionalExpression expression = @@ -66,6 +71,7 @@ public class ConditionalExpressionWithIdenticalBranchesInspection } } + @Override public BaseInspectionVisitor buildVisitor() { return new ConditionalExpressionWithIdenticalBranchesVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java index 390f1f7a1c3a..975a421907b1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConfusingElseInspection.java @@ -72,6 +72,7 @@ public class ConfusingElseInspection extends BaseInspection { private static class ConfusingElseFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("confusing.else.unwrap.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConstantConditionalExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConstantConditionalExpressionInspection.java index c17fd7501a64..12bf1cead2ba 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConstantConditionalExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConstantConditionalExpressionInspection.java @@ -74,6 +74,7 @@ public class ConstantConditionalExpressionInspection private static class ConstantConditionalFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConstantIfStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConstantIfStatementInspection.java index 088dbf977482..c3b87fe67511 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConstantIfStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ConstantIfStatementInspection.java @@ -65,12 +65,14 @@ public class ConstantIfStatementInspection extends BaseInspection { private static class ConstantIfStatementFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "constant.conditional.expression.simplify.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement ifKeyword = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ContinueStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ContinueStatementInspection.java index 7001ca5d3d7e..36fc3d81fe77 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ContinueStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ContinueStatementInspection.java @@ -23,18 +23,21 @@ import org.jetbrains.annotations.NotNull; public class ContinueStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "continue.statement.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "statement.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ContinueStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ContinueStatementWithLabelInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ContinueStatementWithLabelInspection.java index 7fd20294fdee..e679e7ce1119 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ContinueStatementWithLabelInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ContinueStatementWithLabelInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class ContinueStatementWithLabelInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "continue.statement.with.label.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "continue.statement.with.label.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ContinueStatementWithLabelVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java index 017fdf8ed953..453243cf0d00 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DefaultNotLastCaseInSwitchInspection.java @@ -26,18 +26,21 @@ import org.jetbrains.annotations.NotNull; public class DefaultNotLastCaseInSwitchInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "default.not.last.case.in.switch.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "default.not.last.case.in.switch.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new DefaultNotLastCaseInSwitchVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DoubleNegationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DoubleNegationInspection.java index 5cf828ec22cc..92eebc3e22a2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DoubleNegationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DoubleNegationInspection.java @@ -30,11 +30,13 @@ import org.jetbrains.annotations.Nullable; public class DoubleNegationInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("double.negation.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("double.negation.problem.descriptor"); @@ -45,6 +47,7 @@ public class DoubleNegationInspection extends BaseInspection { return true; } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { return new DoubleNegationFix(); @@ -52,11 +55,13 @@ public class DoubleNegationInspection extends BaseInspection { private static class DoubleNegationFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("double.negation.quickfix"); } + @Override protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement expression = descriptor.getPsiElement(); if (expression instanceof PsiPrefixExpression) { @@ -96,6 +101,7 @@ public class DoubleNegationInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new DoubleNegationVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DuplicateBooleanBranchInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DuplicateBooleanBranchInspection.java index 2bd2fcae11d1..81a8d10fe28f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DuplicateBooleanBranchInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DuplicateBooleanBranchInspection.java @@ -29,16 +29,19 @@ import java.util.Set; public class DuplicateBooleanBranchInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("duplicate.boolean.branch.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("duplicate.boolean.branch.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new DuplicateBooleanBranchVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DuplicateConditionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DuplicateConditionInspection.java index 905868060d5c..cc734b3fbd42 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DuplicateConditionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/DuplicateConditionInspection.java @@ -40,22 +40,26 @@ public class DuplicateConditionInspection extends BaseInspection { // This is a dirty fix of 'squared' algorithm performance issue. private static final int LIMIT_DEPTH = 20; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("duplicate.condition.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("duplicate.condition.problem.descriptor"); } + @Override @Nullable public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("duplicate.condition.ignore.method.calls.option"), this, "ignoreMethodCalls"); } + @Override public BaseInspectionVisitor buildVisitor() { return new DuplicateConditionVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/FallthruInSwitchStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/FallthruInSwitchStatementInspection.java index fd09a2c674b3..b82a755f98d2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/FallthruInSwitchStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/FallthruInSwitchStatementInspection.java @@ -16,11 +16,9 @@ package com.siyeh.ig.controlflow; import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -29,42 +27,48 @@ import com.siyeh.ig.psiutils.ControlFlowUtils; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.swing.*; import java.util.regex.Pattern; public class FallthruInSwitchStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("fallthru.in.switch.statement.display.name"); } + @Override @NotNull public String getID() { return "fallthrough"; } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("fallthru.in.switch.statement.problem.descriptor"); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { return new FallthruInSwitchStatementFix(); } + @Override public BaseInspectionVisitor buildVisitor() { return new FallthroughInSwitchStatementVisitor(); } private static class FallthruInSwitchStatementFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("fallthru.in.switch.statement.quickfix"); } + @Override protected void doFix(Project project, ProblemDescriptor descriptor) { final PsiSwitchLabelStatement labelStatement = (PsiSwitchLabelStatement)descriptor.getPsiElement(); final JavaPsiFacade psiFacade = JavaPsiFacade.getInstance(project); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java index 2369a00cfe22..38171620de1e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/ForLoopReplaceableByWhileInspection.java @@ -70,6 +70,7 @@ public class ForLoopReplaceableByWhileInspection extends BaseInspection { private static class ReplaceForByWhileFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfMayBeConditionalInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfMayBeConditionalInspection.java index 003d693e51dd..f06b43727c86 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfMayBeConditionalInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfMayBeConditionalInspection.java @@ -67,6 +67,7 @@ public class IfMayBeConditionalInspection extends BaseInspection { private static class IfMayBeConditionalFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java index 1c731527e2a7..d8b2cdfd76dd 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfStatementWithIdenticalBranchesInspection.java @@ -62,6 +62,7 @@ public class IfStatementWithIdenticalBranchesInspection public CollapseIfFix() { } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfStatementWithTooManyBranchesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfStatementWithTooManyBranchesInspection.java index bbe3eb88fa96..2ff82f4cfc51 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfStatementWithTooManyBranchesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/IfStatementWithTooManyBranchesInspection.java @@ -15,10 +15,10 @@ */ package com.siyeh.ig.controlflow; +import com.intellij.codeInspection.ui.SingleIntegerFieldOptionsPanel; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiIfStatement; import com.intellij.psi.PsiStatement; -import com.intellij.codeInspection.ui.SingleIntegerFieldOptionsPanel; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -38,12 +38,14 @@ public class IfStatementWithTooManyBranchesInspection */ public int m_limit = DEFAULT_BRANCH_LIMIT; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "if.statement.with.too.many.branches.display.name"); } + @Override public JComponent createOptionsPanel() { return new SingleIntegerFieldOptionsPanel( InspectionGadgetsBundle.message( @@ -51,6 +53,7 @@ public class IfStatementWithTooManyBranchesInspection this, "m_limit"); } + @Override @NotNull protected String buildErrorString(Object... infos) { final Integer branchCount = (Integer)infos[0]; @@ -59,6 +62,7 @@ public class IfStatementWithTooManyBranchesInspection branchCount); } + @Override public BaseInspectionVisitor buildVisitor() { return new IfStatementWithTooManyBranchesVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LabeledStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LabeledStatementInspection.java index 9f329a70a808..1caf93bf55b2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LabeledStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LabeledStatementInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class LabeledStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "labeled.statement.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "labeled.statement.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new LabeledStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LoopConditionNotUpdatedInsideLoopInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LoopConditionNotUpdatedInsideLoopInspection.java index b57c0612aa12..b4affec0d8da 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LoopConditionNotUpdatedInsideLoopInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LoopConditionNotUpdatedInsideLoopInspection.java @@ -15,11 +15,11 @@ */ package com.siyeh.ig.controlflow; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.PsiUtil; import com.intellij.util.SmartList; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -38,18 +38,21 @@ public class LoopConditionNotUpdatedInsideLoopInspection @SuppressWarnings({"PublicField"}) public boolean ignoreIterators = false; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "loop.condition.not.updated.inside.loop.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "loop.condition.not.updated.inside.loop.problem.descriptor"); } + @Override @Nullable public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel( @@ -57,6 +60,7 @@ public class LoopConditionNotUpdatedInsideLoopInspection this, "ignoreIterators"); } + @Override public BaseInspectionVisitor buildVisitor() { return new LoopConditionNotUpdatedInsideLoopVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LoopStatementsThatDontLoopInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LoopStatementsThatDontLoopInspection.java index ac1aef772283..123def339394 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LoopStatementsThatDontLoopInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LoopStatementsThatDontLoopInspection.java @@ -24,27 +24,32 @@ import org.jetbrains.annotations.NotNull; public class LoopStatementsThatDontLoopInspection extends BaseInspection { + @Override @NotNull public String getID() { return "LoopStatementThatDoesntLoop"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "loop.statements.that.dont.loop.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "loop.statements.that.dont.loop.problem.descriptor"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new LoopStatementsThatDontLoopVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LoopWithImplicitTerminationConditionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LoopWithImplicitTerminationConditionInspection.java index 3517eed74a6d..95eaca0a1706 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LoopWithImplicitTerminationConditionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/LoopWithImplicitTerminationConditionInspection.java @@ -31,6 +31,7 @@ import org.jetbrains.annotations.Nullable; public class LoopWithImplicitTerminationConditionInspection extends BaseInspection { + @Override @Nls @NotNull public String getDisplayName() { @@ -38,6 +39,7 @@ public class LoopWithImplicitTerminationConditionInspection "loop.with.implicit.termination.condition.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { if (Boolean.TRUE.equals(infos[0])) { @@ -48,6 +50,7 @@ public class LoopWithImplicitTerminationConditionInspection "loop.with.implicit.termination.condition.problem.descriptor"); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { return new LoopWithImplicitTerminationConditionFix(); @@ -56,12 +59,14 @@ public class LoopWithImplicitTerminationConditionInspection private static class LoopWithImplicitTerminationConditionFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "loop.with.implicit.termination.condition.quickfix"); } + @Override protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement element = descriptor.getPsiElement(); @@ -171,6 +176,7 @@ public class LoopWithImplicitTerminationConditionInspection } } + @Override public BaseInspectionVisitor buildVisitor() { return new LoopWithImplicitTerminationConditionVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NestedConditionalExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NestedConditionalExpressionInspection.java index f2552780b797..baa06004503e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NestedConditionalExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NestedConditionalExpressionInspection.java @@ -25,18 +25,21 @@ import org.jetbrains.annotations.NotNull; public class NestedConditionalExpressionInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "nested.conditional.expression.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "nested.conditional.expression.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NestedConditionalExpressionVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NestedSwitchStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NestedSwitchStatementInspection.java index 1a2cb4b20c57..03ccee9d581f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NestedSwitchStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/NestedSwitchStatementInspection.java @@ -26,18 +26,21 @@ import org.jetbrains.annotations.NotNull; public class NestedSwitchStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "nested.switch.statement.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "nested.switch.statement.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NestedSwitchStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java index 953bbe18e771..dd147732a816 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/PointlessBooleanExpressionInspection.java @@ -272,6 +272,7 @@ public class PointlessBooleanExpressionInspection extends BaseInspection { private class PointlessBooleanExpressionFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("constant.conditional.expression.simplify.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SimplifiableConditionalExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SimplifiableConditionalExpressionInspection.java index 297eea5e0944..6b1a1e36ae1e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SimplifiableConditionalExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SimplifiableConditionalExpressionInspection.java @@ -63,6 +63,7 @@ public class SimplifiableConditionalExpressionInspection private static class SimplifiableConditionalFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementInspection.java index 949932b8d05a..0aadebe15a0b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementInspection.java @@ -23,17 +23,20 @@ import org.jetbrains.annotations.NotNull; public class SwitchStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("switch.statement.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "statement.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SwitchStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithConfusingDeclarationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithConfusingDeclarationInspection.java index 98669f9bb982..db4e66e7efb3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithConfusingDeclarationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithConfusingDeclarationInspection.java @@ -26,21 +26,25 @@ import java.util.Set; public class SwitchStatementWithConfusingDeclarationInspection extends BaseInspection { + @Override @NotNull public String getID() { return "LocalVariableUsedAndDeclaredInDifferentSwitchBranches"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("switch.statement.with.confusing.declaration.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("switch.statement.with.confusing.declaration.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SwitchStatementWithConfusingDeclarationVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java index 173e2b510e70..4e25987a34fc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooFewBranchesInspection.java @@ -33,22 +33,26 @@ public class SwitchStatementWithTooFewBranchesInspection extends BaseInspection @SuppressWarnings("PublicField") public int m_limit = DEFAULT_BRANCH_LIMIT; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("switch.statement.with.too.few.branches.display.name"); } + @Override public JComponent createOptionsPanel() { return new SingleIntegerFieldOptionsPanel(InspectionGadgetsBundle.message("switch.statement.with.too.few.branches.min.option"), this, "m_limit"); } + @Override @NotNull protected String buildErrorString(Object... infos) { final Integer branchCount = (Integer)infos[0]; return InspectionGadgetsBundle.message("switch.statement.with.too.few.branches.problem.descriptor", branchCount); } + @Override public BaseInspectionVisitor buildVisitor() { return new SwitchStatementWithTooFewBranchesVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooManyBranchesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooManyBranchesInspection.java index d3f0116ae8ae..6dae5fa01006 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooManyBranchesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementWithTooManyBranchesInspection.java @@ -15,9 +15,9 @@ */ package com.siyeh.ig.controlflow; +import com.intellij.codeInspection.ui.SingleIntegerFieldOptionsPanel; import com.intellij.psi.PsiCodeBlock; import com.intellij.psi.PsiSwitchStatement; -import com.intellij.codeInspection.ui.SingleIntegerFieldOptionsPanel; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -37,12 +37,14 @@ public class SwitchStatementWithTooManyBranchesInspection */ public int m_limit = DEFAULT_BRANCH_LIMIT; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "switch.statement.with.too.many.branches.display.name"); } + @Override public JComponent createOptionsPanel() { return new SingleIntegerFieldOptionsPanel( InspectionGadgetsBundle.message( @@ -50,6 +52,7 @@ public class SwitchStatementWithTooManyBranchesInspection this, "m_limit"); } + @Override @NotNull protected String buildErrorString(Object... infos) { final Integer branchCount = (Integer)infos[0]; @@ -58,6 +61,7 @@ public class SwitchStatementWithTooManyBranchesInspection branchCount); } + @Override public BaseInspectionVisitor buildVisitor() { return new SwitchStatementWithTooManyBranchesVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementsWithoutDefaultInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementsWithoutDefaultInspection.java index 7d581b1d7979..c82c97503d36 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementsWithoutDefaultInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/SwitchStatementsWithoutDefaultInspection.java @@ -29,26 +29,31 @@ public class SwitchStatementsWithoutDefaultInspection extends BaseInspection { @SuppressWarnings("PublicField") public boolean m_ignoreFullyCoveredEnums = true; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("switch.statements.without.default.display.name"); } + @Override @NotNull public String getID() { return "SwitchStatementWithoutDefaultBranch"; } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("switch.statements.without.default.problem.descriptor"); } + @Override public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("switch.statement.without.default.ignore.option"), this, "m_ignoreFullyCoveredEnums"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SwitchStatementsWithoutDefaultVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/TrivialIfInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/TrivialIfInspection.java index 589768d67b5a..02df8872c5b5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/TrivialIfInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/TrivialIfInspection.java @@ -63,6 +63,7 @@ public class TrivialIfInspection extends BaseInspection { } private static class TrivialIfFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryConditionalExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryConditionalExpressionInspection.java index cfce327fa357..d7b654c7c3af 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryConditionalExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryConditionalExpressionInspection.java @@ -30,25 +30,30 @@ import org.jetbrains.annotations.NotNull; public class UnnecessaryConditionalExpressionInspection extends BaseInspection { + @Override @NotNull public String getID() { return "RedundantConditionalExpression"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "unnecessary.conditional.expression.display.name"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new UnnecessaryConditionalExpressionVisitor(); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiConditionalExpression expression = @@ -73,6 +78,7 @@ public class UnnecessaryConditionalExpressionInspection } } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new UnnecessaryConditionalFix(); } @@ -80,12 +86,14 @@ public class UnnecessaryConditionalExpressionInspection private static class UnnecessaryConditionalFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "constant.conditional.expression.simplify.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiConditionalExpression expression = diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java index aa87717b4647..aaf795cefa13 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryContinueInspection.java @@ -33,16 +33,19 @@ public class UnnecessaryContinueInspection extends BaseInspection { @SuppressWarnings("PublicField") public boolean ignoreInThenBranch = false; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("unnecessary.continue.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("unnecessary.continue.problem.descriptor"); } + @Override public boolean isEnabledByDefault() { return true; } @@ -52,10 +55,12 @@ public class UnnecessaryContinueInspection extends BaseInspection { return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("unnecessary.return.option"), this, "ignoreInThenBranch"); } + @Override public BaseInspectionVisitor buildVisitor() { return new UnnecessaryContinueVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new DeleteUnnecessaryStatementFix("continue"); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java index 0e233cddf4bf..01b694e22b5f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryDefaultInspection.java @@ -26,18 +26,21 @@ import org.jetbrains.annotations.Nullable; public class UnnecessaryDefaultInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "unnecessary.default.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "unnecessary.default.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new UnnecessaryDefaultVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnBreakStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnBreakStatementInspection.java index dc35d1728268..3f662822bac3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnBreakStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnBreakStatementInspection.java @@ -29,22 +29,26 @@ import org.jetbrains.annotations.NotNull; public class UnnecessaryLabelOnBreakStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "unnecessary.label.on.break.statement.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "unnecessary.label.on.break.statement.problem.descriptor"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new UnnecessaryLabelOnBreakStatementFix(); } @@ -52,12 +56,14 @@ public class UnnecessaryLabelOnBreakStatementInspection private static class UnnecessaryLabelOnBreakStatementFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "unnecessary.label.remove.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement breakKeywordElement = descriptor.getPsiElement(); @@ -72,6 +78,7 @@ public class UnnecessaryLabelOnBreakStatementInspection } } + @Override public BaseInspectionVisitor buildVisitor() { return new UnnecessaryLabelOnBreakStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnContinueStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnContinueStatementInspection.java index ae7828b040c5..8dfbef3e8a31 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnContinueStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/controlflow/UnnecessaryLabelOnContinueStatementInspection.java @@ -29,22 +29,26 @@ import org.jetbrains.annotations.NotNull; public class UnnecessaryLabelOnContinueStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "unnecessary.label.on.continue.statement.display.name"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "unnecessary.label.on.continue.statement.problem.descriptor"); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new UnnecessaryLabelOnContinueStatementFix(); } @@ -52,12 +56,14 @@ public class UnnecessaryLabelOnContinueStatementInspection private static class UnnecessaryLabelOnContinueStatementFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "unnecessary.label.remove.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement continueKeywordElement = @@ -73,6 +79,7 @@ public class UnnecessaryLabelOnContinueStatementInspection } } + @Override public BaseInspectionVisitor buildVisitor() { return new UnnecessaryLabelOnContinueStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java index d2b321b9b7c3..8fbb8315c157 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ConstantValueVariableUseInspection.java @@ -63,6 +63,7 @@ public class ConstantValueVariableUseInspection extends BaseInspection { } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/LawOfDemeterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/LawOfDemeterInspection.java index 9246f4a56796..a5e8ae475e56 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/LawOfDemeterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/LawOfDemeterInspection.java @@ -15,9 +15,9 @@ */ package com.siyeh.ig.dataflow; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.openapi.util.Key; import com.intellij.psi.*; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -35,17 +35,20 @@ public class LawOfDemeterInspection extends BaseInspection { private static final Key key = Key.create("LawOfDemeterInspection"); + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("law.of.demeter.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "law.of.demeter.problem.descriptor"); } + @Override @Nullable public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message( @@ -53,6 +56,7 @@ public class LawOfDemeterInspection extends BaseInspection { "ignoreLibraryCalls"); } + @Override public BaseInspectionVisitor buildVisitor() { return new LawOfDemeterVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/OrredNotEqualExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/OrredNotEqualExpressionInspection.java index 65676c289efc..204e6242e4a9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/OrredNotEqualExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/OrredNotEqualExpressionInspection.java @@ -15,16 +15,16 @@ */ package com.siyeh.ig.dataflow; +import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Pair; +import com.intellij.psi.*; +import com.intellij.psi.tree.IElementType; +import com.intellij.util.IncorrectOperationException; +import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.siyeh.InspectionGadgetsBundle; -import com.intellij.openapi.project.Project; -import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.util.IncorrectOperationException; -import com.intellij.psi.*; -import com.intellij.psi.tree.IElementType; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -59,6 +59,7 @@ public class OrredNotEqualExpressionInspection extends BaseInspection { private static class OrredNotEqualExpressionFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java index 291b77744cad..210ca85120c4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/ReuseOfLocalVariableInspection.java @@ -65,6 +65,7 @@ public class ReuseOfLocalVariableInspection private static class ReuseOfLocalVariableFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java index c19d2364003c..8964e4261e62 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dataflow/TooBroadScopeInspection.java @@ -38,7 +38,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.swing.JComponent; +import javax.swing.*; import java.util.Collection; public class TooBroadScopeInspection extends BaseInspection { @@ -94,6 +94,7 @@ public class TooBroadScopeInspection extends BaseInspection { this.variableName = variableName; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("too.broad.scope.narrow.quickfix", variableName); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyDependentsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyDependentsInspection.java index 4d7e93e9f8d5..6eae1d24d47f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyDependentsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyDependentsInspection.java @@ -44,6 +44,7 @@ public class ClassWithTooManyDependentsInspection extends BaseGlobalInspection { "class.with.too.many.dependents.display.name"); } + @Override @Nullable public CommonProblemDescriptor[] checkElement( RefEntity refEntity, @@ -73,6 +74,7 @@ public class ClassWithTooManyDependentsInspection extends BaseGlobalInspection { }; } + @Override public JComponent createOptionsPanel() { return new SingleIntegerFieldOptionsPanel( InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependenciesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependenciesInspection.java index 1e9dd8cd7996..19deae5818c1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependenciesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependenciesInspection.java @@ -45,6 +45,7 @@ public class ClassWithTooManyTransitiveDependenciesInspection "class.with.too.many.transitive.dependencies.display.name"); } + @Override @Nullable public CommonProblemDescriptor[] checkElement( RefEntity refEntity, @@ -73,6 +74,7 @@ public class ClassWithTooManyTransitiveDependenciesInspection }; } + @Override public JComponent createOptionsPanel() { return new SingleIntegerFieldOptionsPanel( InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependentsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependentsInspection.java index aea258bdce06..b1818783fc8c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependentsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/ClassWithTooManyTransitiveDependentsInspection.java @@ -45,6 +45,7 @@ public class ClassWithTooManyTransitiveDependentsInspection "class.with.too.many.transitive.dependents.display.name"); } + @Override @Nullable public CommonProblemDescriptor[] checkElement( RefEntity refEntity, @@ -74,6 +75,7 @@ public class ClassWithTooManyTransitiveDependentsInspection }; } + @Override public JComponent createOptionsPanel() { return new SingleIntegerFieldOptionsPanel( InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java index 4f3687a7c91c..8f6a4405fb52 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassDependencyInspection.java @@ -39,6 +39,7 @@ public class CyclicClassDependencyInspection extends BaseGlobalInspection { "cyclic.class.dependency.display.name"); } + @Override @Nullable public CommonProblemDescriptor[] checkElement( RefEntity refEntity, diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassInitializationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassInitializationInspection.java index e15117924378..363944457113 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassInitializationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicClassInitializationInspection.java @@ -39,6 +39,7 @@ public class CyclicClassInitializationInspection extends BaseGlobalInspection { "cyclic.class.initialization.display.name"); } + @Override @Nullable public CommonProblemDescriptor[] checkElement( RefEntity refEntity, diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicPackageDependencyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicPackageDependencyInspection.java index a238d494f411..8b1bcdc68961 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicPackageDependencyInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/dependency/CyclicPackageDependencyInspection.java @@ -38,6 +38,7 @@ public class CyclicPackageDependencyInspection extends BaseGlobalInspection { "cyclic.package.dependency.display.name"); } + @Override @Nullable public CommonProblemDescriptor[] checkElement( RefEntity refEntity, diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldInspection.java index b6014d636204..ba17fd3e75fd 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/encapsulation/ReturnOfCollectionFieldInspection.java @@ -116,6 +116,7 @@ public class ReturnOfCollectionFieldInspection extends BaseInspection { myQualifiedClassName = qualifiedClassName; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaughtInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaughtInspection.java index efd5262eb325..7b487272415c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaughtInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/BadExceptionCaughtInspection.java @@ -61,6 +61,7 @@ public class BadExceptionCaughtInspection extends BaseInspection { } } + @Override @NotNull public String getID() { return "ProhibitedExceptionCaught"; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CaughtExceptionImmediatelyRethrownInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CaughtExceptionImmediatelyRethrownInspection.java index daef6ca96979..3988f486ec61 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CaughtExceptionImmediatelyRethrownInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/CaughtExceptionImmediatelyRethrownInspection.java @@ -74,6 +74,7 @@ public class CaughtExceptionImmediatelyRethrownInspection extends BaseInspection this.removeTryCatch = removeTryCatch; } + @Override @NotNull public String getName() { if (removeTryCatch) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ContinueOrBreakFromFinallyBlockInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ContinueOrBreakFromFinallyBlockInspection.java index 49658caa0dbb..c9f4dc3322b5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ContinueOrBreakFromFinallyBlockInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ContinueOrBreakFromFinallyBlockInspection.java @@ -27,22 +27,26 @@ import org.jetbrains.annotations.NotNull; public class ContinueOrBreakFromFinallyBlockInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "continue.or.break.from.finally.block.display.name"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "continue.or.break.from.finally.block.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ContinueOrBreakFromFinallyBlockVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspection.java index 472431d0976d..fce85fc16b35 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyCatchBlockInspection.java @@ -88,6 +88,7 @@ public class EmptyCatchBlockInspection extends BaseInspection { private static class EmptyCatchBlockFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java index 81b9a007879e..cc4e330acfdb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyFinallyBlockInspection.java @@ -57,6 +57,7 @@ public class EmptyFinallyBlockInspection extends BaseInspection { } private static class RemoveTryFinallyBlockFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("remove.try.finally.block.quickfix"); @@ -98,6 +99,7 @@ public class EmptyFinallyBlockInspection extends BaseInspection { } private static class RemoveFinallyBlockFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("remove.finally.block.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyTryBlockInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyTryBlockInspection.java index 335ae20bf831..11277851b353 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyTryBlockInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/EmptyTryBlockInspection.java @@ -15,9 +15,9 @@ */ package com.siyeh.ig.errorhandling; +import com.intellij.psi.JspPsiUtil; import com.intellij.psi.PsiCodeBlock; import com.intellij.psi.PsiTryStatement; -import com.intellij.psi.JspPsiUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -25,21 +25,25 @@ import org.jetbrains.annotations.NotNull; public class EmptyTryBlockInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("empty.try.block.display.name"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "empty.try.block.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new EmptyTryBlockVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/FinallyBlockCannotCompleteNormallyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/FinallyBlockCannotCompleteNormallyInspection.java index 8ba2a4a0ff9a..6fa813f30909 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/FinallyBlockCannotCompleteNormallyInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/FinallyBlockCannotCompleteNormallyInspection.java @@ -28,27 +28,32 @@ import org.jetbrains.annotations.NotNull; public class FinallyBlockCannotCompleteNormallyInspection extends BaseInspection { + @Override @NotNull public String getID() { return "finally"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "finally.block.cannot.complete.normally.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "finally.block.cannot.complete.normally.problem.descriptor"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new FinallyBlockCannotCompleteNormallyVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/InstanceofCatchParameterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/InstanceofCatchParameterInspection.java index 0d7c4b04d792..b10896117daa 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/InstanceofCatchParameterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/InstanceofCatchParameterInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class InstanceofCatchParameterInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "instanceof.catch.parameter.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "instanceof.catch.parameter.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new InstanceofCatchParameterVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/NestedTryStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/NestedTryStatementInspection.java index 2ca5a10ea2fe..75ad8dc9cc4e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/NestedTryStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/NestedTryStatementInspection.java @@ -26,18 +26,21 @@ import org.jetbrains.annotations.NotNull; public class NestedTryStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "nested.try.statement.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "nested.try.statement.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NestedTryStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ReturnFromFinallyBlockInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ReturnFromFinallyBlockInspection.java index 06e60bc864a5..ce64c43958ac 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ReturnFromFinallyBlockInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ReturnFromFinallyBlockInspection.java @@ -24,25 +24,30 @@ import org.jetbrains.annotations.NotNull; public class ReturnFromFinallyBlockInspection extends BaseInspection { + @Override @NotNull public String getID() { return "ReturnInsideFinallyBlock"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("return.from.finally.block.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("return.from.finally.block.problem.descriptor"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new ReturnFromFinallyBlockVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java index e06ae76e64db..5d389ce89859 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThreadDeathRethrownInspection.java @@ -24,23 +24,27 @@ import org.jetbrains.annotations.NotNull; public class ThreadDeathRethrownInspection extends BaseInspection { + @Override @NotNull public String getID() { return "ThreadDeathNotRethrown"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "thread.death.rethrown.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "thread.death.rethrown.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ThreadDeathRethrownVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowCaughtLocallyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowCaughtLocallyInspection.java index ff68e4d400bc..204ef7ced7f6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowCaughtLocallyInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowCaughtLocallyInspection.java @@ -15,13 +15,13 @@ */ package com.siyeh.ig.errorhandling; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.psiutils.ClassUtils; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -34,18 +34,21 @@ public class ThrowCaughtLocallyInspection extends BaseInspection { */ public boolean ignoreRethrownExceptions = false; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "throw.caught.locally.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "throw.caught.locally.problem.descriptor"); } + @Override @Nullable public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message( @@ -53,6 +56,7 @@ public class ThrowCaughtLocallyInspection extends BaseInspection { "ignoreRethrownExceptions"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ThrowCaughtLocallyVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowFromFinallyBlockInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowFromFinallyBlockInspection.java index 77aa1ec4a8ae..78596a89f1b8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowFromFinallyBlockInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/errorhandling/ThrowFromFinallyBlockInspection.java @@ -24,22 +24,26 @@ import org.jetbrains.annotations.NotNull; public class ThrowFromFinallyBlockInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "throw.from.finally.block.display.name"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "throw.from.finally.block.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ThrowFromFinallyBlockVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/FinalizeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/FinalizeInspection.java index f2dff3375adf..4cc643d2b725 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/FinalizeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/FinalizeInspection.java @@ -31,17 +31,20 @@ public class FinalizeInspection extends BaseInspection { @SuppressWarnings("PublicField") public boolean ignoreTrivialFinalizers = true; + @Override @NotNull public String getID() { return "FinalizeDeclaration"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "finalize.declaration.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( @@ -55,6 +58,7 @@ public class FinalizeInspection extends BaseInspection { "ignoreTrivialFinalizers"); } + @Override public BaseInspectionVisitor buildVisitor() { return new FinalizeDeclaredVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/FinalizeNotProtectedInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/FinalizeNotProtectedInspection.java index 14ff48b45084..c124c0fac1eb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/FinalizeNotProtectedInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/FinalizeNotProtectedInspection.java @@ -28,33 +28,39 @@ import org.jetbrains.annotations.NotNull; public class FinalizeNotProtectedInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "finalize.not.declared.protected.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "finalize.not.declared.protected.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new FinalizeDeclaredProtectedVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new ProtectedFinalizeFix(); } private static class ProtectedFinalizeFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("make.protected.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement methodName = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/NoExplicitFinalizeCallsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/NoExplicitFinalizeCallsInspection.java index 2f98525f415b..0f726cca3bd4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/NoExplicitFinalizeCallsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/finalization/NoExplicitFinalizeCallsInspection.java @@ -29,27 +29,32 @@ import org.jetbrains.annotations.NotNull; public class NoExplicitFinalizeCallsInspection extends BaseInspection { + @Override @NotNull public String getID() { return "FinalizeCalledExplicitly"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "finalize.called.explicitly.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "finalize.called.explicitly.problem.descriptor"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new NoExplicitFinalizeCallsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddSerialVersionUIDFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddSerialVersionUIDFix.java index b53e04f27846..fc3d22834bd5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddSerialVersionUIDFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddSerialVersionUIDFix.java @@ -25,11 +25,13 @@ import org.jetbrains.annotations.NotNull; public class AddSerialVersionUIDFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("add.serialversionuidfield.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement classIdentifier = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddThisQualifierFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddThisQualifierFix.java index 0945107f1e01..c3600bf7a428 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddThisQualifierFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/AddThisQualifierFix.java @@ -31,6 +31,7 @@ import org.jetbrains.annotations.NotNull; public class AddThisQualifierFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("add.this.qualifier.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ChangeModifierFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ChangeModifierFix.java index d5ec08723a57..80f932d3ef31 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ChangeModifierFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ChangeModifierFix.java @@ -17,7 +17,10 @@ package com.siyeh.ig.fixes; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; -import com.intellij.psi.*; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiModifier; +import com.intellij.psi.PsiModifierList; +import com.intellij.psi.PsiModifierListOwner; import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; @@ -33,12 +36,14 @@ public class ChangeModifierFix extends InspectionGadgetsFix { this.modifierText = modifierText; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("change.modifier.quickfix", modifierText); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement element = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/DeleteImportFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/DeleteImportFix.java index 50c3054b7952..21188c6057b0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/DeleteImportFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/DeleteImportFix.java @@ -19,16 +19,18 @@ import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.util.IncorrectOperationException; -import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.InspectionGadgetsBundle; +import com.siyeh.ig.InspectionGadgetsFix; import org.jetbrains.annotations.NotNull; public class DeleteImportFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("delete.import.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement importStatement = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java index e71253e747db..ccd70d63f0d6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/DeleteUnnecessaryStatementFix.java @@ -15,13 +15,13 @@ */ package com.siyeh.ig.fixes; -import com.siyeh.ig.InspectionGadgetsFix; -import com.siyeh.InspectionGadgetsBundle; -import com.intellij.openapi.project.Project; import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.util.IncorrectOperationException; +import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.util.IncorrectOperationException; +import com.siyeh.InspectionGadgetsBundle; +import com.siyeh.ig.InspectionGadgetsFix; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -33,12 +33,14 @@ public class DeleteUnnecessaryStatementFix extends InspectionGadgetsFix { this.name = name; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "smth.unnecessary.remove.quickfix", name); } + @Override protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement keywordElement = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java index ca12e0025c30..4ef8fea58ef4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/EqualityToEqualsFix.java @@ -17,7 +17,10 @@ package com.siyeh.ig.fixes; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; -import com.intellij.psi.*; +import com.intellij.psi.JavaTokenType; +import com.intellij.psi.PsiBinaryExpression; +import com.intellij.psi.PsiElement; +import com.intellij.psi.PsiExpression; import com.intellij.psi.tree.IElementType; import com.intellij.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; @@ -28,12 +31,14 @@ import org.jetbrains.annotations.NotNull; public class EqualityToEqualsFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "object.comparison.replace.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement comparisonToken = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractMethodFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractMethodFix.java index 355addca548f..fe23fd71d149 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractMethodFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractMethodFix.java @@ -30,11 +30,13 @@ import org.jetbrains.annotations.NotNull; public class ExtractMethodFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("extract.method.quickfix"); } + @Override public void doFix(final Project project, ProblemDescriptor descriptor) { final PsiExpression expression = (PsiExpression)descriptor.getPsiElement(); @@ -45,6 +47,7 @@ public class ExtractMethodFix extends InspectionGadgetsFix { final DataManager dataManager = DataManager.getInstance(); final DataContext dataContext = dataManager.getDataContext(); final Runnable runnable = new Runnable() { + @Override public void run() { extractHandler.invoke(project, new PsiElement[]{expression}, dataContext); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractParameterAsLocalVariableFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractParameterAsLocalVariableFix.java index aa064e3b14ed..e301dd07105e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractParameterAsLocalVariableFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ExtractParameterAsLocalVariableFix.java @@ -32,6 +32,7 @@ import org.jetbrains.annotations.NotNull; public class ExtractParameterAsLocalVariableFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineCallFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineCallFix.java index c1fc1068cad7..dcdb95811084 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineCallFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineCallFix.java @@ -29,11 +29,13 @@ import org.jetbrains.annotations.NotNull; public class InlineCallFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("inline.call.quickfix"); } + @Override public void doFix(final Project project, ProblemDescriptor descriptor) { final PsiElement nameElement = descriptor.getPsiElement(); final PsiReferenceExpression methodExpression = @@ -45,6 +47,7 @@ public class InlineCallFix extends InspectionGadgetsFix { JavaRefactoringActionHandlerFactory.getInstance(); final RefactoringActionHandler inlineHandler = factory.createInlineHandler(); final Runnable runnable = new Runnable() { + @Override public void run() { inlineHandler.invoke(project, new PsiElement[]{methodCallExpression}, null); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineVariableFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineVariableFix.java index 4c5a1f2d31ec..91f20b50dd63 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineVariableFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/InlineVariableFix.java @@ -32,6 +32,7 @@ import java.util.Collection; public class InlineVariableFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("inline.variable.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceConstantFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceConstantFix.java index e42074e53f22..bb0692bc3cf3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceConstantFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IntroduceConstantFix.java @@ -30,11 +30,13 @@ import org.jetbrains.annotations.NotNull; public class IntroduceConstantFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("introduce.constant.quickfix"); } + @Override public void doFix(@NotNull final Project project, ProblemDescriptor descriptor) { @@ -42,6 +44,7 @@ public class IntroduceConstantFix extends InspectionGadgetsFix { final Application application = ApplicationManager.getApplication(); application.invokeLater(new Runnable() { + @Override public void run() { if (!constant.isValid()) return; final JavaRefactoringActionHandlerFactory factory = diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeCloneableFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeCloneableFix.java index 74a5da8e506c..1d76d4129a79 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeCloneableFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeCloneableFix.java @@ -33,6 +33,7 @@ public class MakeCloneableFix extends InspectionGadgetsFix { this.isInterface = isInterface; } + @Override @NotNull public String getName() { if (isInterface) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java index b42289be74c3..9afcac8ca6b9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeFieldFinalFix.java @@ -47,6 +47,7 @@ public class MakeFieldFinalFix extends InspectionGadgetsFix { return new MakeFieldFinalFix(field.getName()); } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("make.field.final.quickfix", diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java index e600dd9020c0..36d168d5b81b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeFieldStaticFinalFix.java @@ -51,6 +51,7 @@ public class MakeFieldStaticFinalFix extends InspectionGadgetsFix { return new MakeFieldStaticFinalFix(field.getName()); } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java index 7950cc3e6d3b..80cdb2ce1715 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeInitializerExplicitFix.java @@ -26,12 +26,14 @@ import org.jetbrains.annotations.NotNull; public class MakeInitializerExplicitFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "make.initialization.explicit.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement fieldName = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeSerializableFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeSerializableFix.java index e8953920fb79..a0a781aba289 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeSerializableFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MakeSerializableFix.java @@ -27,6 +27,7 @@ import org.jetbrains.annotations.NotNull; public class MakeSerializableFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MemberSignature.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MemberSignature.java index 8b25f893758b..d77df3120b63 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MemberSignature.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MemberSignature.java @@ -102,6 +102,7 @@ public class MemberSignature implements Comparable { return modifiers; } + @Override public int compareTo(MemberSignature other) { final int result = name.compareTo(other.name); if (result != 0) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MoveAnonymousToInnerClassFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MoveAnonymousToInnerClassFix.java index f7fd0df22b5c..bd41131641e6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MoveAnonymousToInnerClassFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MoveAnonymousToInnerClassFix.java @@ -41,11 +41,13 @@ public class MoveAnonymousToInnerClassFix extends InspectionGadgetsFix { "move.anonymous.to.inner.quickfix"); } + @Override @NotNull public String getName() { return name; } + @Override public void doFix(@NotNull final Project project, ProblemDescriptor descriptor) { final PsiElement nameElement = descriptor.getPsiElement(); final PsiAnonymousClass aClass = @@ -57,6 +59,7 @@ public class MoveAnonymousToInnerClassFix extends InspectionGadgetsFix { final DataManager dataManager = DataManager.getInstance(); final DataContext dataContext = dataManager.getDataContext(); final Runnable runnable = new Runnable() { + @Override public void run() { anonymousToInner.invoke(project, new PsiElement[]{aClass}, dataContext); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MoveClassFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MoveClassFix.java index b7c77db09139..2e564872e410 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MoveClassFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/MoveClassFix.java @@ -16,26 +16,28 @@ package com.siyeh.ig.fixes; import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.openapi.project.Project; -import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.application.Application; +import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.DataContext; +import com.intellij.openapi.application.Application; +import com.intellij.openapi.application.ApplicationManager; +import com.intellij.openapi.project.Project; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringActionHandler; import com.intellij.refactoring.RefactoringActionHandlerFactory; -import com.intellij.ide.DataManager; -import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.InspectionGadgetsBundle; +import com.siyeh.ig.InspectionGadgetsFix; import org.jetbrains.annotations.NotNull; public class MoveClassFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("move.class.quickfix"); } + @Override public void doFix(@NotNull final Project project, ProblemDescriptor descriptor) { final PsiElement nameElement = descriptor.getPsiElement(); @@ -43,6 +45,7 @@ public class MoveClassFix extends InspectionGadgetsFix { final Application application = ApplicationManager.getApplication(); application.invokeLater(new Runnable() { + @Override public void run() { final RefactoringActionHandlerFactory factory = RefactoringActionHandlerFactory.getInstance(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java index cbe89813cf44..f4fabe414b11 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/NormalizeDeclarationFix.java @@ -19,12 +19,13 @@ import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.util.IncorrectOperationException; -import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.InspectionGadgetsBundle; +import com.siyeh.ig.InspectionGadgetsFix; import org.jetbrains.annotations.NotNull; public class NormalizeDeclarationFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("normalize.declaration.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveModifierFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveModifierFix.java index febe047605e6..de6a2c44267e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveModifierFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RemoveModifierFix.java @@ -31,12 +31,14 @@ public class RemoveModifierFix extends InspectionGadgetsFix { this.modifierText = modifierText; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("remove.modifier.quickfix", modifierText); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement modifierElement = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RenameParameterFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RenameParameterFix.java index 0a8f10ad4db8..1a99ce0c0f65 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RenameParameterFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/RenameParameterFix.java @@ -20,8 +20,8 @@ import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringFactory; import com.intellij.refactoring.RenameRefactoring; -import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.InspectionGadgetsBundle; +import com.siyeh.ig.InspectionGadgetsFix; import org.jetbrains.annotations.NotNull; public class RenameParameterFix extends InspectionGadgetsFix { @@ -33,11 +33,13 @@ public class RenameParameterFix extends InspectionGadgetsFix { m_targetName = targetName; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("renameto.quickfix", m_targetName); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) { final PsiElement nameIdentifier = descriptor.getPsiElement(); final PsiElement elementToRename = nameIdentifier.getParent(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ReplaceInheritanceWithDelegationFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ReplaceInheritanceWithDelegationFix.java index 67b00daed37e..9538ded5e6c7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ReplaceInheritanceWithDelegationFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/ReplaceInheritanceWithDelegationFix.java @@ -50,6 +50,7 @@ public class ReplaceInheritanceWithDelegationFix extends InspectionGadgetsFix { final DataManager dataManager = DataManager.getInstance(); final DataContext dataContext = dataManager.getDataContext(); final Runnable runnable = new Runnable() { + @Override public void run() { anonymousToInner.invoke(project, new PsiElement[]{aClass}, dataContext); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java index 3fab1109daaf..23811567380c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/SerialVersionUIDBuilder.java @@ -51,6 +51,7 @@ public class SerialVersionUIDBuilder extends JavaRecursiveElementVisitor { private static final Comparator INTERFACE_COMPARATOR = new Comparator() { + @Override public int compare(PsiClass object1, PsiClass object2) { if (object1 == null && object2 == null) { return 0; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/imports/OnDemandImportInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/imports/OnDemandImportInspection.java index 3619d9f866e7..035cb3b79913 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/imports/OnDemandImportInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/imports/OnDemandImportInspection.java @@ -23,16 +23,19 @@ import org.jetbrains.annotations.NotNull; public class OnDemandImportInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("import.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("import.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new PackageImportVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/imports/SingleClassImportInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/imports/SingleClassImportInspection.java index 43bf9e58de4a..74ea302309c6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/imports/SingleClassImportInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/imports/SingleClassImportInspection.java @@ -23,18 +23,21 @@ import org.jetbrains.annotations.NotNull; public class SingleClassImportInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "single.class.import.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "single.class.import.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new PackageImportVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractClassNeverImplementedInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractClassNeverImplementedInspection.java index 34b9b65b940e..436cfe7aedf0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractClassNeverImplementedInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractClassNeverImplementedInspection.java @@ -25,18 +25,21 @@ import org.jetbrains.annotations.NotNull; public class AbstractClassNeverImplementedInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "abstract.class.never.implemented.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "abstract.class.never.implemented.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new AbstractClassNeverImplementedVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractClassWithoutAbstractMethodsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractClassWithoutAbstractMethodsInspection.java index 4faf016a1821..8e72ad6b8c34 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractClassWithoutAbstractMethodsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractClassWithoutAbstractMethodsInspection.java @@ -29,18 +29,21 @@ import java.util.Set; public class AbstractClassWithoutAbstractMethodsInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "abstract.class.without.abstract.methods.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "abstract.class.without.abstract.methods.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new AbstractClassWithoutAbstractMethodsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractMethodWithMissingImplementationsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractMethodWithMissingImplementationsInspection.java index ec0a927af93c..aa74dc2498a8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractMethodWithMissingImplementationsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/AbstractMethodWithMissingImplementationsInspection.java @@ -35,18 +35,21 @@ import java.util.List; public class AbstractMethodWithMissingImplementationsInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "abstract.method.with.missing.implementations.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "abstract.method.with.missing.implementations.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new AbstractMethodWithMissingImplementationsVisitor(); } @@ -150,6 +153,7 @@ public class AbstractMethodWithMissingImplementationsInspection this.aClass = aClass; } + @Override public void run() { final SearchScope searchScope = aClass.getUseScope(); inheritors = ClassInheritorsSearch.search(aClass, searchScope, true) diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/ExtendsAnnotationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/ExtendsAnnotationInspection.java index 33dda28d4dda..232caff520c4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/ExtendsAnnotationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/ExtendsAnnotationInspection.java @@ -27,21 +27,25 @@ import org.jetbrains.annotations.NotNull; public class ExtendsAnnotationInspection extends BaseInspection { + @Override @NotNull public String getID() { return "ClassExplicitlyAnnotation"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "extends.annotation.display.name"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiClass containingClass = (PsiClass)infos[0]; @@ -50,6 +54,7 @@ public class ExtendsAnnotationInspection extends BaseInspection { containingClass.getName()); } + @Override public BaseInspectionVisitor buildVisitor() { return new ExtendsAnnotationVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/InterfaceNeverImplementedInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/InterfaceNeverImplementedInspection.java index 60b280b753e9..dde313226f02 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/InterfaceNeverImplementedInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/InterfaceNeverImplementedInspection.java @@ -15,8 +15,8 @@ */ package com.siyeh.ig.inheritance; -import com.intellij.psi.PsiClass; import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; +import com.intellij.psi.PsiClass; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -33,12 +33,14 @@ public class InterfaceNeverImplementedInspection extends BaseInspection { */ public boolean ignoreInterfacesThatOnlyDeclareConstants = false; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "interface.never.implemented.display.name"); } + @Override @Nullable public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel( @@ -47,12 +49,14 @@ public class InterfaceNeverImplementedInspection extends BaseInspection { "ignoreInterfacesThatOnlyDeclareConstants"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "interface.never.implemented.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new InterfaceNeverImplementedVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java index 484f65a0dda7..8fb25495abff 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/RedundantMethodOverrideInspection.java @@ -32,18 +32,21 @@ import org.jetbrains.annotations.Nullable; public class RedundantMethodOverrideInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "redundant.method.override.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "redundant.method.override.problem.descriptor"); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { return new RedundantMethodOverrideFix(); @@ -52,12 +55,14 @@ public class RedundantMethodOverrideInspection extends BaseInspection { private static class RedundantMethodOverrideFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "redundant.method.override.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement methodNameIdentifier = descriptor.getPsiElement(); @@ -67,6 +72,7 @@ public class RedundantMethodOverrideInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new RedundantMethodOverrideVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java index 3b62619e3b77..3fb47d4e5093 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/StaticInheritanceFix.java @@ -53,6 +53,7 @@ class StaticInheritanceFix extends InspectionGadgetsFix { myReplaceInWholeProject = replaceInWholeProject; } + @Override @NotNull public String getName() { String scope = @@ -60,8 +61,10 @@ class StaticInheritanceFix extends InspectionGadgetsFix { return InspectionGadgetsBundle.message("static.inheritance.replace.quickfix", scope); } + @Override public void doFix(final Project project, final ProblemDescriptor descriptor) throws IncorrectOperationException { ApplicationManager.getApplication().invokeLater(new Runnable() { + @Override public void run() { dodoFix(project, descriptor); } @@ -81,6 +84,7 @@ class StaticInheritanceFix extends InspectionGadgetsFix { ProgressManager.getInstance().run(new Task.Modal(project, "Replacing usages of " + iface.getName(), false) { + @Override public void run(@NotNull ProgressIndicator indicator) { for (final PsiField field : allFields) { final Query search = ReferencesSearch.search(field, implementingClass.getUseScope(), false); @@ -100,6 +104,7 @@ class StaticInheritanceFix extends InspectionGadgetsFix { if (!isInheritor) continue; } final Runnable runnable = new Runnable() { + @Override public void run() { if (isQuickFixOnReadOnlyFile(referenceExpression)) { return; @@ -119,6 +124,7 @@ class StaticInheritanceFix extends InspectionGadgetsFix { } } final Runnable runnable = new Runnable() { + @Override public void run() { PsiClassType classType = JavaPsiFacade.getInstance(project).getElementFactory().createType(iface); IntentionAction fix = QuickFixFactory.getInstance().createExtendsListFix(implementingClass, classType, false); @@ -133,8 +139,10 @@ class StaticInheritanceFix extends InspectionGadgetsFix { private static void invokeWriteAction(final Runnable runnable, final PsiFile file) { try { GuiUtils.runOrInvokeAndWait(new Runnable() { + @Override public void run() { new WriteCommandAction(file.getProject(), file) { + @Override protected void run(Result result) throws Throwable { runnable.run(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/StaticInheritanceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/StaticInheritanceInspection.java index eb1cd8e824c9..b17cd7d2139e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/StaticInheritanceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/inheritance/StaticInheritanceInspection.java @@ -15,7 +15,9 @@ */ package com.siyeh.ig.inheritance; -import com.intellij.psi.*; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiJavaCodeReferenceElement; +import com.intellij.psi.PsiReferenceList; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -27,12 +29,14 @@ import java.util.Set; public class StaticInheritanceInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "static.inheritance.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( @@ -46,6 +50,7 @@ public class StaticInheritanceInspection extends BaseInspection { } + @Override public BaseInspectionVisitor buildVisitor() { return new StaticInheritanceVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/AbstractMethodCallInConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/AbstractMethodCallInConstructorInspection.java index 4209d3f03cef..8fc9f4c8dd8f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/AbstractMethodCallInConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/AbstractMethodCallInConstructorInspection.java @@ -25,16 +25,19 @@ import org.jetbrains.annotations.NotNull; public class AbstractMethodCallInConstructorInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("abstract.method.call.in.constructor.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("abstract.method.call.in.constructor.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new AbstractMethodCallInConstructorVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/InstanceVariableInitializationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/InstanceVariableInitializationInspection.java index c6267adadcbe..b49f562ed545 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/InstanceVariableInitializationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/InstanceVariableInitializationInspection.java @@ -16,9 +16,9 @@ package com.siyeh.ig.initialization; import com.intellij.codeInsight.daemon.ImplicitUsageProvider; -import com.intellij.psi.*; -import com.intellij.openapi.extensions.Extensions; import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; +import com.intellij.openapi.extensions.Extensions; +import com.intellij.psi.*; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -39,17 +39,20 @@ public class InstanceVariableInitializationInspection extends BaseInspection { */ public boolean m_ignorePrimitives = false; + @Override @NotNull public String getID() { return "InstanceVariableMayNotBeInitialized"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "instance.variable.may.not.be.initialized.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final Boolean junitTestCase = (Boolean)infos[0]; @@ -61,16 +64,19 @@ public class InstanceVariableInitializationInspection extends BaseInspection { "instance.variable.may.not.be.initialized.problem.descriptor"); } + @Override public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel( InspectionGadgetsBundle.message("primitive.fields.ignore.option"), this, "m_ignorePrimitives"); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new MakeInitializerExplicitFix(); } + @Override public BaseInspectionVisitor buildVisitor() { return new InstanceVariableInitializationVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonFinalStaticVariableUsedInClassInitializationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonFinalStaticVariableUsedInClassInitializationInspection.java index d378baff9075..302c0a571213 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonFinalStaticVariableUsedInClassInitializationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonFinalStaticVariableUsedInClassInitializationInspection.java @@ -27,24 +27,28 @@ import org.jetbrains.annotations.Nullable; public class NonFinalStaticVariableUsedInClassInitializationInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "non.final.static.variable.initialization.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "non.final.static.variable.initialization.problem.descriptor"); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { final PsiField field = (PsiField)infos[0]; return MakeFieldFinalFix.buildFix(field); } + @Override public BaseInspectionVisitor buildVisitor() { return new NonFinalStaticVariableUsedInClassInitializationVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java index aadab8775fbe..cf30a6d5ff7c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/initialization/NonThreadSafeLazyInitializationInspection.java @@ -28,26 +28,29 @@ import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; import java.util.Collection; public class NonThreadSafeLazyInitializationInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "non.thread.safe.lazy.initialization.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "non.thread.safe.lazy.initialization.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new UnsafeSafeLazyInitializationVisitor(); } @@ -89,6 +92,7 @@ public class NonThreadSafeLazyInitializationInspection private static boolean isAssignedOnce(PsiElement referent) { final int[] writeCount = new int[1]; return ReferencesSearch.search(referent).forEach(new Processor() { + @Override public boolean process(PsiReference reference) { PsiElement element = reference.getElement(); if (!(element instanceof PsiExpression)) { @@ -188,6 +192,7 @@ public class NonThreadSafeLazyInitializationInspection } private static class IntroduceHolderFix extends InspectionGadgetsFix { + @Override protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { PsiReferenceExpression expression = (PsiReferenceExpression)descriptor.getPsiElement(); PsiElement resolved = expression.resolve(); @@ -226,6 +231,7 @@ public class NonThreadSafeLazyInitializationInspection return string + "Holder"; } + @Override @NotNull public String getName() { return "Introduce holder class"; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/NumericToStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/NumericToStringInspection.java index 7c732ced30fa..74238a56eee7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/NumericToStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/NumericToStringInspection.java @@ -25,23 +25,27 @@ import org.jetbrains.annotations.NotNull; public class NumericToStringInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToNumericToString"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "call.to.numeric.tostring.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "call.to.numeric.tostring.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NumericToStringVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/StringTokenizerInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/StringTokenizerInspection.java index 09b9205c9253..26f1ec166e74 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/StringTokenizerInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/StringTokenizerInspection.java @@ -24,23 +24,27 @@ import org.jetbrains.annotations.NotNull; public class StringTokenizerInspection extends BaseInspection { + @Override @NotNull public String getID() { return "UseOfStringTokenizer"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "use.stringtokenizer.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "use.stringtokenizer.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new StringTokenizerVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/TimeToStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/TimeToStringInspection.java index 6f502b731b04..bbe79b138137 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/TimeToStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/internationalization/TimeToStringInspection.java @@ -24,23 +24,27 @@ import org.jetbrains.annotations.NotNull; public class TimeToStringInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToTimeToString"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "time.tostring.call.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "time.tostring.call.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new TimeToStringVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AbstractClassWithOnlyOneDirectInheritorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AbstractClassWithOnlyOneDirectInheritorInspection.java index a8e4dcdbbbe2..cf43b20796b0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AbstractClassWithOnlyOneDirectInheritorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AbstractClassWithOnlyOneDirectInheritorInspection.java @@ -26,16 +26,19 @@ import org.jetbrains.annotations.NotNull; public class AbstractClassWithOnlyOneDirectInheritorInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("abstract.class.with.only.one.direct.inheritor.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("abstract.class.with.only.one.direct.inheritor.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new AbstractClassWithOnlyOneDirectInheritorVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AnonymousInnerClassMayBeStaticInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AnonymousInnerClassMayBeStaticInspection.java index 4dc6a7cd8627..395e812e2ee5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AnonymousInnerClassMayBeStaticInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/AnonymousInnerClassMayBeStaticInspection.java @@ -27,24 +27,28 @@ import org.jetbrains.annotations.NotNull; public class AnonymousInnerClassMayBeStaticInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "anonymous.inner.may.be.named.static.inner.class.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "anonymous.inner.may.be.named.static.inner.class.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new MoveAnonymousToInnerClassFix( InspectionGadgetsBundle.message( "anonymous.inner.may.be.named.static.inner.class.quickfix")); } + @Override public BaseInspectionVisitor buildVisitor() { return new AnonymousInnerClassMayBeStaticVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/ArrayLengthInLoopConditionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/ArrayLengthInLoopConditionInspection.java index 916659937f41..9fa8d7022b00 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/ArrayLengthInLoopConditionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/ArrayLengthInLoopConditionInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class ArrayLengthInLoopConditionInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "array.length.in.loop.condition.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "array.length.in.loop.condition.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ArrayLengthInLoopConditionVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/CheckForOutOfMemoryOnLargeArrayAllocationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/CheckForOutOfMemoryOnLargeArrayAllocationInspection.java index b1aca1fb7a13..bd76d0cff722 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/CheckForOutOfMemoryOnLargeArrayAllocationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/CheckForOutOfMemoryOnLargeArrayAllocationInspection.java @@ -15,10 +15,10 @@ */ package com.siyeh.ig.j2me; +import com.intellij.codeInspection.ui.SingleIntegerFieldOptionsPanel; import com.intellij.psi.*; import com.intellij.psi.util.ConstantExpressionUtil; import com.intellij.psi.util.PsiTreeUtil; -import com.intellij.codeInspection.ui.SingleIntegerFieldOptionsPanel; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -34,18 +34,21 @@ public class CheckForOutOfMemoryOnLargeArrayAllocationInspection */ public int m_limit = 64; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "large.array.allocation.no.outofmemoryerror.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "large.array.allocation.no.outofmemoryerror.problem.descriptor"); } + @Override public JComponent createOptionsPanel() { return new SingleIntegerFieldOptionsPanel( InspectionGadgetsBundle.message( @@ -53,6 +56,7 @@ public class CheckForOutOfMemoryOnLargeArrayAllocationInspection this, "m_limit"); } + @Override public BaseInspectionVisitor buildVisitor() { return new CheckForOutOfMemoryOnLargeArrayAllocationVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/ConnectionResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/ConnectionResourceInspection.java index 4d72cb411144..2ac34384b8b8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/ConnectionResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/ConnectionResourceInspection.java @@ -26,17 +26,20 @@ import org.jetbrains.annotations.NotNull; public class ConnectionResourceInspection extends BaseInspection { + @Override @NotNull public String getID() { return "ConnectionOpenedButNotSafelyClosed"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "connection.opened.not.safely.closed.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiType type = (PsiType)infos[0]; @@ -45,6 +48,7 @@ public class ConnectionResourceInspection extends BaseInspection { "resource.opened.not.closed.problem.descriptor", text); } + @Override public BaseInspectionVisitor buildVisitor() { return new RecordStoreResourceVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/InterfaceWithOnlyOneDirectInheritorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/InterfaceWithOnlyOneDirectInheritorInspection.java index f797a163c662..9bfde3e9bf0e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/InterfaceWithOnlyOneDirectInheritorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/InterfaceWithOnlyOneDirectInheritorInspection.java @@ -24,16 +24,19 @@ import org.jetbrains.annotations.NotNull; public class InterfaceWithOnlyOneDirectInheritorInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("interface.one.inheritor.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("interface.one.inheritor.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new InterfaceWithOnlyOneDirectInheritorVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java index d67432e980a4..53adeb8b441c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/MultiplyOrDivideByPowerOfTwoInspection.java @@ -41,12 +41,14 @@ public class MultiplyOrDivideByPowerOfTwoInspection */ public boolean checkDivision = false; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "multiply.or.divide.by.power.of.two.display.name"); } + @Override @Nullable public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message( @@ -54,6 +56,7 @@ public class MultiplyOrDivideByPowerOfTwoInspection "checkDivision"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( @@ -111,6 +114,7 @@ public class MultiplyOrDivideByPowerOfTwoInspection return expString; } + @Override public InspectionGadgetsFix buildFix(Object... infos) { final PsiExpression expression = (PsiExpression)infos[0]; if (expression instanceof PsiBinaryExpression) { @@ -136,12 +140,14 @@ public class MultiplyOrDivideByPowerOfTwoInspection private static class MultiplyByPowerOfTwoFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "multiply.or.divide.by.power.of.two.replace.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiExpression expression = @@ -151,6 +157,7 @@ public class MultiplyOrDivideByPowerOfTwoInspection } } + @Override public BaseInspectionVisitor buildVisitor() { return new ConstantShiftVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/OverlyLargePrimitiveArrayInitializerInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/OverlyLargePrimitiveArrayInitializerInspection.java index f462357bc22d..cca3afceb9d1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/OverlyLargePrimitiveArrayInitializerInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/OverlyLargePrimitiveArrayInitializerInspection.java @@ -15,11 +15,11 @@ */ package com.siyeh.ig.j2me; +import com.intellij.codeInspection.ui.SingleIntegerFieldOptionsPanel; import com.intellij.psi.PsiArrayInitializerExpression; import com.intellij.psi.PsiExpression; import com.intellij.psi.PsiPrimitiveType; import com.intellij.psi.PsiType; -import com.intellij.codeInspection.ui.SingleIntegerFieldOptionsPanel; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -35,12 +35,14 @@ public class OverlyLargePrimitiveArrayInitializerInspection */ public int m_limit = 64; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "large.initializer.primitive.type.array.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final Integer numElements = (Integer)infos[0]; @@ -49,6 +51,7 @@ public class OverlyLargePrimitiveArrayInitializerInspection numElements); } + @Override public JComponent createOptionsPanel() { return new SingleIntegerFieldOptionsPanel( InspectionGadgetsBundle.message( @@ -56,6 +59,7 @@ public class OverlyLargePrimitiveArrayInitializerInspection this, "m_limit"); } + @Override public BaseInspectionVisitor buildVisitor() { return new OverlyLargePrimitiveArrayInitializerVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/RecordStoreResourceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/RecordStoreResourceInspection.java index 20b088f8e886..c85dcd46be95 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/RecordStoreResourceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/RecordStoreResourceInspection.java @@ -25,17 +25,20 @@ import org.jetbrains.annotations.NotNull; public class RecordStoreResourceInspection extends BaseInspection { + @Override @NotNull public String getID() { return "RecordStoreOpenedButNotSafelyClosed"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "recordstore.opened.not.safely.closed.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiExpression expression = (PsiExpression)infos[0]; @@ -46,6 +49,7 @@ public class RecordStoreResourceInspection extends BaseInspection { "resource.opened.not.closed.problem.descriptor", text); } + @Override public BaseInspectionVisitor buildVisitor() { return new RecordStoreResourceVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/SingleCharacterStartsWithInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/SingleCharacterStartsWithInspection.java index 846e1fb63f8a..68f623bb5e02 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/SingleCharacterStartsWithInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/j2me/SingleCharacterStartsWithInspection.java @@ -31,18 +31,21 @@ import org.jetbrains.annotations.Nullable; public class SingleCharacterStartsWithInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "single.character.startswith.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "single.character.startswith.problem.descriptor"); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { return new SingleCharacterStartsWithFix(); @@ -51,12 +54,14 @@ public class SingleCharacterStartsWithInspection extends BaseInspection { private static class SingleCharacterStartsWithFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "single.character.startswith.quickfix"); } + @Override protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement element = descriptor.getPsiElement(); @@ -93,6 +98,7 @@ public class SingleCharacterStartsWithInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new SingleCharacterStartsWithVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/javabeans/ClassWithoutConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/javabeans/ClassWithoutConstructorInspection.java index 29b3943d81b9..3da92552f5b3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/javabeans/ClassWithoutConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/javabeans/ClassWithoutConstructorInspection.java @@ -50,6 +50,7 @@ public class ClassWithoutConstructorInspection extends BaseInspection { private static class ClassWithoutConstructorFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/javabeans/ClassWithoutNoArgConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/javabeans/ClassWithoutNoArgConstructorInspection.java index f8c67724ffc9..15497b0909e5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/javabeans/ClassWithoutNoArgConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/javabeans/ClassWithoutNoArgConstructorInspection.java @@ -15,6 +15,7 @@ */ package com.siyeh.ig.javabeans; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiMethod; import com.intellij.psi.PsiParameterList; @@ -22,7 +23,6 @@ import com.intellij.psi.PsiTypeParameter; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -34,12 +34,14 @@ public class ClassWithoutNoArgConstructorInspection extends BaseInspection { */ public boolean m_ignoreClassesWithNoConstructors = true; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "class.without.no.arg.constructor.display.name"); } + @Override public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel( InspectionGadgetsBundle.message( @@ -47,12 +49,14 @@ public class ClassWithoutNoArgConstructorInspection extends BaseInspection { this, "m_ignoreClassesWithNoConstructors"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "class.without.no.arg.constructor.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassWithoutNoArgConstructorVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/javabeans/FieldHasSetterButNoGetterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/javabeans/FieldHasSetterButNoGetterInspection.java index 3bdf4fbb1b03..93ea038b1e5d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/javabeans/FieldHasSetterButNoGetterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/javabeans/FieldHasSetterButNoGetterInspection.java @@ -16,7 +16,10 @@ package com.siyeh.ig.javabeans; import com.intellij.openapi.project.Project; -import com.intellij.psi.*; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiField; +import com.intellij.psi.PsiMethod; +import com.intellij.psi.PsiModifier; import com.intellij.psi.util.PropertyUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; @@ -25,18 +28,21 @@ import org.jetbrains.annotations.NotNull; public class FieldHasSetterButNoGetterInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "field.has.setter.but.no.getter.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "field.has.setter.but.no.getter.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new FieldHasSetterButNoGetterVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/PackageDotHtmlMayBePackageInfoInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/PackageDotHtmlMayBePackageInfoInspection.java index b6ec3b92ea1d..2b8b78a5ca28 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/PackageDotHtmlMayBePackageInfoInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/PackageDotHtmlMayBePackageInfoInspection.java @@ -73,6 +73,7 @@ public class PackageDotHtmlMayBePackageInfoInspection extends BaseInspection { private static class DeletePackageDotHtmlFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("package.dot.html.may.be.package.info.delete.quickfix"); @@ -107,6 +108,7 @@ public class PackageDotHtmlMayBePackageInfoInspection extends BaseInspection { this.aPackage = aPackage; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("package.dot.html.may.be.package.info.convert.quickfix"); @@ -165,6 +167,7 @@ public class PackageDotHtmlMayBePackageInfoInspection extends BaseInspection { final AsyncResult dataContextFromFocus = DataManager.getInstance().getDataContextFromFocus(); dataContextFromFocus.doWhenDone( new AsyncResult.Handler() { + @Override public void run(DataContext dataContext) { final FileEditorManager editorManager = FileEditorManager.getInstance(project); final VirtualFile virtualFile = file.getVirtualFile(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java index a0570e894c3e..c1f05d78f82a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/javadoc/UnnecessaryInheritDocInspection.java @@ -59,6 +59,7 @@ public class UnnecessaryInheritDocInspection extends BaseInspection { private static class UnnecessaryInheritDocFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AnnotationClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AnnotationClassInspection.java index f434a48cad7d..9988f1d68417 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AnnotationClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AnnotationClassInspection.java @@ -23,18 +23,21 @@ import org.jetbrains.annotations.NotNull; public class AnnotationClassInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "annotation.class.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "annotation.class.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new AnnotationClassVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AssertStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AssertStatementInspection.java index 30a39207c28c..f476082338dc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AssertStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AssertStatementInspection.java @@ -23,18 +23,21 @@ import org.jetbrains.annotations.NotNull; public class AssertStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "assert.statement.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "statement.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new AssertStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoBoxingInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoBoxingInspection.java index fddeb66b389a..270192124467 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoBoxingInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoBoxingInspection.java @@ -102,6 +102,7 @@ public class AutoBoxingInspection extends BaseInspection { private static class AutoBoxingFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("auto.boxing.make.boxing.explicit.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java index 37317d089357..180cfc2a5e3c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/AutoUnboxingInspection.java @@ -125,6 +125,7 @@ public class AutoUnboxingInspection extends BaseInspection { private static class AutoUnboxingFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/EnumClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/EnumClassInspection.java index 84660af0ae4e..2fd8c061d4bc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/EnumClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/EnumClassInspection.java @@ -23,17 +23,20 @@ import org.jetbrains.annotations.NotNull; public class EnumClassInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("enumerated.class.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "enumerated.class.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new EnumClassVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/ForeachStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/ForeachStatementInspection.java index ecbb3a369540..7563aea0dc24 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/ForeachStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/ForeachStatementInspection.java @@ -33,27 +33,32 @@ import org.jetbrains.annotations.NotNull; public class ForeachStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("extended.for.statement.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("extended.for.statement.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new ForEachFix(); } private static class ForEachFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("extended.for.statement.replace.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement element = descriptor.getPsiElement(); final PsiForeachStatement statement = (PsiForeachStatement)element.getParent(); @@ -129,6 +134,7 @@ public class ForeachStatementInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new ForeachStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/VarargParameterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/VarargParameterInspection.java index f93166cfd2b3..07f12b2dd116 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/VarargParameterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/jdk/VarargParameterInspection.java @@ -61,6 +61,7 @@ public class VarargParameterInspection extends BaseInspection { private static class VarargParameterFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("variable.argument.method.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AssertEqualsMayBeAssertSameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AssertEqualsMayBeAssertSameInspection.java index 362c5a17c41f..82ac660c8430 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AssertEqualsMayBeAssertSameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/AssertEqualsMayBeAssertSameInspection.java @@ -15,9 +15,9 @@ */ package com.siyeh.ig.junit; -import com.intellij.psi.*; -import com.intellij.openapi.project.Project; import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.openapi.project.Project; +import com.intellij.psi.*; import com.intellij.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; @@ -48,6 +48,7 @@ public class AssertEqualsMayBeAssertSameInspection extends BaseInspection { private static class AssertEqualsMayBeAssertSameFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("assertequals.may.be.assertsame.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspection.java index 51e38860938f..261947be96e8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspection.java @@ -18,8 +18,8 @@ package com.siyeh.ig.junit; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; -import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiFormatUtil; +import com.intellij.psi.util.PsiTreeUtil; import com.intellij.refactoring.changeSignature.ChangeSignatureProcessor; import com.intellij.refactoring.changeSignature.ParameterInfoImpl; import com.intellij.util.IncorrectOperationException; @@ -110,6 +110,7 @@ public class BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspection myName = name; } + @Override protected void doFix(final Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiMethod method = PsiTreeUtil.getParentOfType(descriptor.getPsiElement(), PsiMethod.class); if (method != null) { @@ -130,6 +131,7 @@ public class BeforeClassOrAfterClassIsPublicStaticVoidNoArgInspection } } + @Override @NotNull public String getName() { return myName; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/BeforeOrAfterIsPublicVoidNoArgInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/BeforeOrAfterIsPublicVoidNoArgInspection.java index e6c60be47122..24957aa850df 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/BeforeOrAfterIsPublicVoidNoArgInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/BeforeOrAfterIsPublicVoidNoArgInspection.java @@ -24,6 +24,7 @@ import org.jetbrains.annotations.NotNull; public class BeforeOrAfterIsPublicVoidNoArgInspection extends BaseInspection { + @Override @NotNull public String getID() { return "BeforeOrAfterWithIncorrectSignature"; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java index fd5dcfd8c6de..e92b0c82ab6d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/MultipleExceptionsDeclaredOnTestMethodInspection.java @@ -56,6 +56,7 @@ public class MultipleExceptionsDeclaredOnTestMethodInspection private static class MultipleExceptionsDeclaredOnTestMethodFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/ParameterizedParametersStaticCollectionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/ParameterizedParametersStaticCollectionInspection.java index f9feca17940a..94b3d3d403a7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/ParameterizedParametersStaticCollectionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/ParameterizedParametersStaticCollectionInspection.java @@ -46,6 +46,7 @@ public class ParameterizedParametersStaticCollectionInspection extends BaseInspe private static final String PARAMETERS_FQN = "org.junit.runners.Parameterized.Parameters"; private static final String PARAMETERIZED_FQN = "org.junit.runners.Parameterized"; + @Override @NotNull protected String buildErrorString(Object... infos) { return infos.length > 0 @@ -53,6 +54,7 @@ public class ParameterizedParametersStaticCollectionInspection extends BaseInspe : "Class #ref annotated @RunWith(Parameterized.class) lacks data provider"; } + @Override public BaseInspectionVisitor buildVisitor() { return new BaseInspectionVisitor() { @Override @@ -142,6 +144,7 @@ public class ParameterizedParametersStaticCollectionInspection extends BaseInspe } } + @Override @NotNull public String getName() { return infos.length > 0 ? (String)infos[0] : "Create @Parameterized.Parameters data provider"; @@ -149,6 +152,7 @@ public class ParameterizedParametersStaticCollectionInspection extends BaseInspe }; } + @Override @Nls @NotNull public String getDisplayName() { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/SetupCallsSuperSetupInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/SetupCallsSuperSetupInspection.java index 7484a8b5ef67..fafab661861f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/SetupCallsSuperSetupInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/SetupCallsSuperSetupInspection.java @@ -52,6 +52,7 @@ public class SetupCallsSuperSetupInspection extends BaseInspection { private static class AddSuperSetUpCall extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TeardownCallsSuperTeardownInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TeardownCallsSuperTeardownInspection.java index 40e0f3775119..c521c9976563 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TeardownCallsSuperTeardownInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TeardownCallsSuperTeardownInspection.java @@ -57,6 +57,7 @@ public class TeardownCallsSuperTeardownInspection extends BaseInspection { private static class AddSuperTearDownCall extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestCaseWithConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestCaseWithConstructorInspection.java index ca7a0f1d2a01..3b8529a67fc2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestCaseWithConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/junit/TestCaseWithConstructorInspection.java @@ -25,17 +25,20 @@ import org.jetbrains.annotations.Nullable; public class TestCaseWithConstructorInspection extends BaseInspection { + @Override @NotNull public String getID() { return "JUnitTestCaseWithNonTrivialConstructors"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "test.case.with.constructor.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { if (Boolean.TRUE.equals(infos[0])) { @@ -48,6 +51,7 @@ public class TestCaseWithConstructorInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new TestCaseWithConstructorVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java index 62dffa0e3871..911d59168e7d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/logging/LogStatementGuardedByLogConditionInspection.java @@ -101,6 +101,7 @@ public class LogStatementGuardedByLogConditionInspection extends BaseInspection private class LogStatementGuardedByLogConditionFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("log.statement.guarded.by.log.condition.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java index 2db8befe6d07..8f8c6a458314 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SuppressionAnnotationInspection.java @@ -30,18 +30,21 @@ import org.jetbrains.annotations.NotNull; public class SuppressionAnnotationInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "inspection.suppression.annotation.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "inspection.suppression.annotation.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SuppressionAnnotationVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SystemOutErrInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SystemOutErrInspection.java index 41b840574749..a0f08cf62116 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SystemOutErrInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/SystemOutErrInspection.java @@ -27,23 +27,27 @@ import org.jetbrains.annotations.NotNull; public class SystemOutErrInspection extends BaseInspection { + @Override @NotNull public String getID() { return "UseOfSystemOutOrSystemErr"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "use.system.out.err.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "use.system.out.err.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SystemOutErrVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/ThreadDumpStackInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/ThreadDumpStackInspection.java index e04c001a191f..d608892b1540 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/ThreadDumpStackInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/ThreadDumpStackInspection.java @@ -25,22 +25,26 @@ import org.jetbrains.annotations.NotNull; public class ThreadDumpStackInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToThreadDumpStack"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("dumpstack.call.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "dumpstack.call.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ThreadDumpStackVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/ThrowablePrintStackTraceInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/ThrowablePrintStackTraceInspection.java index 99ffd0b0819f..8a48858fe78b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/ThrowablePrintStackTraceInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/ThrowablePrintStackTraceInspection.java @@ -26,23 +26,27 @@ import org.jetbrains.annotations.NotNull; public class ThrowablePrintStackTraceInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToPrintStackTrace"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "printstacktrace.call.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "printstacktrace.call.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ThrowablePrintStackTraceVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/TodoCommentInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/TodoCommentInspection.java index 534541c6b113..9b79d5453758 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/TodoCommentInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/maturity/TodoCommentInspection.java @@ -23,16 +23,19 @@ import org.jetbrains.annotations.NotNull; public class TodoCommentInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("todo.comment.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("todo.comment.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassWithoutToStringVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/memory/StaticCollectionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/memory/StaticCollectionInspection.java index b74c5124d4c3..ccb874ecc685 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/memory/StaticCollectionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/memory/StaticCollectionInspection.java @@ -15,10 +15,10 @@ */ package com.siyeh.ig.memory; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.psi.PsiField; import com.intellij.psi.PsiModifier; import com.intellij.psi.PsiType; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -34,24 +34,28 @@ public class StaticCollectionInspection extends BaseInspection { */ public boolean m_ignoreWeakCollections = false; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "static.collection.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "static.collection.problem.descriptor"); } + @Override public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message( "static.collection.ignore.option"), this, "m_ignoreWeakCollections"); } + @Override public BaseInspectionVisitor buildVisitor() { return new StaticCollectionVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/memory/SystemGCInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/memory/SystemGCInspection.java index d2e0b1b03c09..79b98e698516 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/memory/SystemGCInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/memory/SystemGCInspection.java @@ -24,21 +24,25 @@ import org.jetbrains.annotations.NotNull; public class SystemGCInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToSystemGC"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("gc.call.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("gc.call.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SystemGCVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/CyclomaticComplexityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/CyclomaticComplexityInspection.java index 5930187bdf53..9c49f1587d80 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/CyclomaticComplexityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/CyclomaticComplexityInspection.java @@ -22,26 +22,31 @@ import org.jetbrains.annotations.NotNull; public class CyclomaticComplexityInspection extends MethodMetricInspection { + @Override @NotNull public String getID() { return "OverlyComplexMethod"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "cyclomatic.complexity.display.name"); } + @Override protected int getDefaultLimit() { return 10; } + @Override protected String getConfigurationLabel() { return InspectionGadgetsBundle.message( "method.complexity.limit.option"); } + @Override @NotNull public String buildErrorString(Object... infos) { final Integer complexity = (Integer)infos[0]; @@ -49,6 +54,7 @@ public class CyclomaticComplexityInspection extends MethodMetricInspection { "cyclomatic.complexity.problem.descriptor", complexity); } + @Override public BaseInspectionVisitor buildVisitor() { return new MethodComplexityVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/MethodWithMultipleLoopsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/MethodWithMultipleLoopsInspection.java index 15c4932b83a8..5158028669da 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/MethodWithMultipleLoopsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/MethodWithMultipleLoopsInspection.java @@ -23,12 +23,14 @@ import org.jetbrains.annotations.NotNull; public class MethodWithMultipleLoopsInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "method.with.multiple.loops.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final Integer negationCount = (Integer)infos[0]; @@ -36,6 +38,7 @@ public class MethodWithMultipleLoopsInspection extends BaseInspection { "method.with.multiple.loops.problem.descriptor", negationCount); } + @Override public BaseInspectionVisitor buildVisitor() { return new MethodWithMultipleLoopsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NestingDepthInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NestingDepthInspection.java index 834dad86463e..a2066acaa31d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NestingDepthInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NestingDepthInspection.java @@ -22,24 +22,29 @@ import org.jetbrains.annotations.NotNull; public class NestingDepthInspection extends MethodMetricInspection { + @Override @NotNull public String getID() { return "OverlyNestedMethod"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("nesting.depth.display.name"); } + @Override protected int getDefaultLimit() { return 5; } + @Override protected String getConfigurationLabel() { return InspectionGadgetsBundle.message("nesting.depth.limit.option"); } + @Override @NotNull public String buildErrorString(Object... infos) { final Integer nestingDepth = (Integer)infos[0]; @@ -47,6 +52,7 @@ public class NestingDepthInspection extends MethodMetricInspection { "nesting.depth.problem.descriptor", nestingDepth); } + @Override public BaseInspectionVisitor buildVisitor() { return new NestingDepthMethodVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NonCommentSourceStatementsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NonCommentSourceStatementsInspection.java index 6063aca9469f..46553da74771 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NonCommentSourceStatementsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/NonCommentSourceStatementsInspection.java @@ -25,26 +25,31 @@ public class NonCommentSourceStatementsInspection private static final int DEFAULT_LIMIT = 30; + @Override @NotNull public String getID() { return "OverlyLongMethod"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "non.comment.source.statements.display.name"); } + @Override protected int getDefaultLimit() { return DEFAULT_LIMIT; } + @Override protected String getConfigurationLabel() { return InspectionGadgetsBundle.message( "non.comment.source.statements.limit.option"); } + @Override @NotNull public String buildErrorString(Object... infos) { final Integer statementCount = (Integer)infos[0]; @@ -53,6 +58,7 @@ public class NonCommentSourceStatementsInspection statementCount); } + @Override public BaseInspectionVisitor buildVisitor() { return new NonCommentSourceStatementsMethodVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/ParametersPerMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/ParametersPerMethodInspection.java index 94c5276350f0..b760b1ec3936 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/ParametersPerMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/ParametersPerMethodInspection.java @@ -24,17 +24,20 @@ import org.jetbrains.annotations.NotNull; public class ParametersPerMethodInspection extends MethodMetricInspection { + @Override @NotNull public String getID() { return "MethodWithTooManyParameters"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "parameters.per.method.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final Integer parameterCount = (Integer)infos[0]; @@ -42,14 +45,17 @@ public class ParametersPerMethodInspection extends MethodMetricInspection { "parameters.per.method.problem.descriptor", parameterCount); } + @Override protected int getDefaultLimit() { return 5; } + @Override protected String getConfigurationLabel() { return InspectionGadgetsBundle.message("parameter.limit.option"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ParametersPerMethodVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/ThrownExceptionsPerMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/ThrownExceptionsPerMethodInspection.java index 2ea848f4e7e3..8ebd31a2a503 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/ThrownExceptionsPerMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/methodmetrics/ThrownExceptionsPerMethodInspection.java @@ -25,17 +25,20 @@ import org.jetbrains.annotations.NotNull; public class ThrownExceptionsPerMethodInspection extends MethodMetricInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "thrown.exceptions.per.method.display.name"); } + @Override @NotNull public String getID() { return "MethodWithTooExceptionsDeclared"; } + @Override @NotNull public String buildErrorString(Object... infos) { final Integer exceptionCount = (Integer)infos[0]; @@ -44,15 +47,18 @@ public class ThrownExceptionsPerMethodInspection exceptionCount); } + @Override protected int getDefaultLimit() { return 3; } + @Override protected String getConfigurationLabel() { return InspectionGadgetsBundle.message( "thrown.exceptions.per.method.limit.option"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ThrownExceptionsPerMethodVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java index b33ada0ce1ef..bae94a9d9e9c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/CollectionsFieldAccessReplaceableByMethodCallInspection.java @@ -69,6 +69,7 @@ public class CollectionsFieldAccessReplaceableByMethodCallInspection replacementText = getCollectionsMethodCallText(referenceName); } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java index 23be7eea8a96..c2f2797068e8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/EnumerationCanBeIterationInspection.java @@ -79,6 +79,7 @@ public class EnumerationCanBeIterationInspection extends BaseInspection { private static class EnumerationCanBeIterationFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java index f5df0e53e208..19a68a9692fa 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/ForCanBeForeachInspection.java @@ -35,7 +35,7 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import javax.swing.JComponent; +import javax.swing.*; public class ForCanBeForeachInspection extends BaseInspection { @@ -88,6 +88,7 @@ public class ForCanBeForeachInspection extends BaseInspection { private class ForCanBeForeachFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("foreach.replace.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java index c5a57122701d..53103044ffa7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IfCanBeSwitchInspection.java @@ -123,6 +123,7 @@ public class IfCanBeSwitchInspection extends BaseInspection { final JCheckBox checkBox1 = new JCheckBox(InspectionGadgetsBundle.message("if.can.be.switch.int.option"), suggestIntSwitches); final ButtonModel model1 = checkBox1.getModel(); model1.addChangeListener(new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { suggestIntSwitches = model1.isSelected(); } @@ -133,6 +134,7 @@ public class IfCanBeSwitchInspection extends BaseInspection { final JCheckBox checkBox2 = new JCheckBox(InspectionGadgetsBundle.message("if.can.be.switch.enum.option"), suggestEnumSwitches); final ButtonModel model2 = checkBox2.getModel(); model2.addChangeListener(new ChangeListener() { + @Override public void stateChanged(ChangeEvent e) { suggestEnumSwitches = model2.isSelected(); } @@ -148,6 +150,7 @@ public class IfCanBeSwitchInspection extends BaseInspection { myMinimumBranches = minimumBranches; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("if.can.be.switch.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IndexOfReplaceableByContainsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IndexOfReplaceableByContainsInspection.java index bccd7b1cee2a..0b7d10c99e63 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IndexOfReplaceableByContainsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/IndexOfReplaceableByContainsInspection.java @@ -112,6 +112,7 @@ public class IndexOfReplaceableByContainsInspection replaceExpression(expression, newExpressionText); } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java index c3b617ce18bf..d5a3e81ecead 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/StringBufferReplaceableByStringBuilderInspection.java @@ -31,7 +31,9 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.*; +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; public class StringBufferReplaceableByStringBuilderInspection extends BaseInspection { @@ -86,6 +88,7 @@ public class StringBufferReplaceableByStringBuilderInspection extends BaseInspec private static class StringBufferMayBeStringBuilderFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("string.buffer.replaceable.by.string.builder.replace.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java index f4bddcd25294..f7691a004ac5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/TryFinallyCanBeTryWithResourcesInspection.java @@ -67,6 +67,7 @@ public class TryFinallyCanBeTryWithResourcesInspection extends BaseInspection { public TryFinallyCanBeTryWithResourcesFix() {} + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("try.finally.can.be.try.with.resources.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java index 3a5b31e2b69e..62cfc32ed5aa 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/UnnecessaryBoxingInspection.java @@ -73,6 +73,7 @@ public class UnnecessaryBoxingInspection extends BaseInspection { private static class UnnecessaryBoxingFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("unnecessary.boxing.remove.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java index 70efd8b7f596..47f47e9adb30 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/UnnecessaryUnboxingInspection.java @@ -18,8 +18,8 @@ package com.siyeh.ig.migration; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; import com.intellij.psi.*; -import com.intellij.psi.util.PsiUtil; import com.intellij.psi.util.PsiTreeUtil; +import com.intellij.psi.util.PsiUtil; import com.intellij.util.IncorrectOperationException; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; @@ -82,6 +82,7 @@ public class UnnecessaryUnboxingInspection extends BaseInspection { private static class UnnecessaryUnboxingFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java index a2907b363187..b2feda02fc0e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/migration/WhileCanBeForeachInspection.java @@ -25,7 +25,6 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.psi.util.PsiUtil; import com.intellij.psi.util.TypeConversionUtil; import com.intellij.util.ArrayUtil; -import com.intellij.util.IncorrectOperationException; import com.intellij.util.Query; import com.siyeh.HardcodedMethodConstants; import com.siyeh.InspectionGadgetsBundle; @@ -71,6 +70,7 @@ public class WhileCanBeForeachInspection extends BaseInspection { private static class WhileCanBeForeachFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("foreach.replace.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/AnnotationNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/AnnotationNamingConventionInspection.java index cba43dc7feb3..d3855f70d6e1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/AnnotationNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/AnnotationNamingConventionInspection.java @@ -27,20 +27,24 @@ public class AnnotationNamingConventionInspection extends ConventionInspection { private static final int DEFAULT_MIN_LENGTH = 8; private static final int DEFAULT_MAX_LENGTH = 64; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "annotation.naming.convention.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { final String annotationName = (String)infos[0]; @@ -57,18 +61,22 @@ public class AnnotationNamingConventionInspection extends ConventionInspection { getRegex()); } + @Override protected String getDefaultRegex() { return "[A-Z][A-Za-z\\d]*"; } + @Override protected int getDefaultMinLength() { return DEFAULT_MIN_LENGTH; } + @Override protected int getDefaultMaxLength() { return DEFAULT_MAX_LENGTH; } + @Override public BaseInspectionVisitor buildVisitor() { return new NamingConventionsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNamePrefixedWithPackageNameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNamePrefixedWithPackageNameInspection.java index 75cade24d6a0..c54616c590ba 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNamePrefixedWithPackageNameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNamePrefixedWithPackageNameInspection.java @@ -29,26 +29,31 @@ import java.util.StringTokenizer; public class ClassNamePrefixedWithPackageNameInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "class.name.prefixed.with.package.name.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "class.name.prefixed.with.package.name.problem.descriptor"); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassNameBePrefixedWithPackageNameVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNameSameAsAncestorNameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNameSameAsAncestorNameInspection.java index 87aed676aec0..b65ea158494c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNameSameAsAncestorNameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNameSameAsAncestorNameInspection.java @@ -28,26 +28,31 @@ import java.util.Set; public class ClassNameSameAsAncestorNameInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "class.name.same.as.ancestor.name.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "class.name.same.as.ancestor.name.problem.descriptor"); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassNameSameAsAncestorNameVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNamingConventionInspection.java index a8b12e5bdf34..6a5c5d232956 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ClassNamingConventionInspection.java @@ -28,20 +28,24 @@ public class ClassNamingConventionInspection extends ConventionInspection { private static final int DEFAULT_MIN_LENGTH = 8; private static final int DEFAULT_MAX_LENGTH = 64; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "class.naming.convention.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { final String className = (String)infos[0]; @@ -58,18 +62,22 @@ public class ClassNamingConventionInspection extends ConventionInspection { getRegex()); } + @Override protected String getDefaultRegex() { return "[A-Z][A-Za-z\\d]*"; } + @Override protected int getDefaultMinLength() { return DEFAULT_MIN_LENGTH; } + @Override protected int getDefaultMaxLength() { return DEFAULT_MAX_LENGTH; } + @Override public BaseInspectionVisitor buildVisitor() { return new NamingConventionsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/DollarSignInNameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/DollarSignInNameInspection.java index c6897604b639..6d5a1401827d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/DollarSignInNameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/DollarSignInNameInspection.java @@ -27,26 +27,31 @@ import org.jetbrains.annotations.NotNull; public class DollarSignInNameInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "dollar.sign.in.name.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "dollar.sign.in.name.problem.descriptor"); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new DollarSignInNameVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/EnumeratedClassNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/EnumeratedClassNamingConventionInspection.java index 44cfa79883bf..8a7b5402ceba 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/EnumeratedClassNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/EnumeratedClassNamingConventionInspection.java @@ -28,20 +28,24 @@ public class EnumeratedClassNamingConventionInspection private static final int DEFAULT_MIN_LENGTH = 8; private static final int DEFAULT_MAX_LENGTH = 64; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "enumerated.class.naming.convention.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { final String className = (String)infos[0]; @@ -58,18 +62,22 @@ public class EnumeratedClassNamingConventionInspection getRegex()); } + @Override protected String getDefaultRegex() { return "[A-Z][A-Za-z\\d]*"; } + @Override protected int getDefaultMinLength() { return DEFAULT_MIN_LENGTH; } + @Override protected int getDefaultMaxLength() { return DEFAULT_MAX_LENGTH; } + @Override public BaseInspectionVisitor buildVisitor() { return new NamingConventionsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/InstanceVariableNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/InstanceVariableNamingConventionInspection.java index 6c4bb5054dc8..5425bc5d39f9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/InstanceVariableNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/InstanceVariableNamingConventionInspection.java @@ -29,20 +29,24 @@ public class InstanceVariableNamingConventionInspection private static final int DEFAULT_MIN_LENGTH = 5; private static final int DEFAULT_MAX_LENGTH = 32; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "instance.variable.naming.convention.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { final String fieldName = (String)infos[0]; @@ -59,18 +63,22 @@ public class InstanceVariableNamingConventionInspection getRegex()); } + @Override protected String getDefaultRegex() { return "m_[a-z][A-Za-z\\d]*"; } + @Override protected int getDefaultMinLength() { return DEFAULT_MIN_LENGTH; } + @Override protected int getDefaultMaxLength() { return DEFAULT_MAX_LENGTH; } + @Override public BaseInspectionVisitor buildVisitor() { return new NamingConventionsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/InterfaceNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/InterfaceNamingConventionInspection.java index 4b55268df26a..072adef08ed1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/InterfaceNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/InterfaceNamingConventionInspection.java @@ -27,20 +27,24 @@ public class InterfaceNamingConventionInspection extends ConventionInspection { private static final int DEFAULT_MIN_LENGTH = 8; private static final int DEFAULT_MAX_LENGTH = 64; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "interface.naming.convention.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { final String interfaceName = (String)infos[0]; @@ -57,18 +61,22 @@ public class InterfaceNamingConventionInspection extends ConventionInspection { getRegex()); } + @Override protected String getDefaultRegex() { return "[A-Z][A-Za-z\\d]*"; } + @Override protected int getDefaultMinLength() { return DEFAULT_MIN_LENGTH; } + @Override protected int getDefaultMaxLength() { return DEFAULT_MAX_LENGTH; } + @Override public BaseInspectionVisitor buildVisitor() { return new NamingConventionsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsClassNameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsClassNameInspection.java index 8ab5308c13bd..b3a17c10f3bb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsClassNameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsClassNameInspection.java @@ -68,6 +68,7 @@ public class MethodNameSameAsClassNameInspection extends BaseInspection { private static class MethodNameSameAsClassNameFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("make.method.ctr.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsParentNameInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsParentNameInspection.java index fd71bf16b5be..76b7845b3d05 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsParentNameInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/MethodNameSameAsParentNameInspection.java @@ -26,26 +26,31 @@ import org.jetbrains.annotations.NotNull; public class MethodNameSameAsParentNameInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "method.name.same.as.parent.name.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "method.name.same.as.parent.name.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new MethodNameSameAsParentClassNameVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonExceptionNameEndsWithExceptionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonExceptionNameEndsWithExceptionInspection.java index e76e54b6fb5e..76586bb45f26 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonExceptionNameEndsWithExceptionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/NonExceptionNameEndsWithExceptionInspection.java @@ -69,6 +69,7 @@ public class NonExceptionNameEndsWithExceptionInspection this.name = name; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/OverloadedVarargsMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/OverloadedVarargsMethodInspection.java index 23516ef3ff47..8be3f7e20d3f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/OverloadedVarargsMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/OverloadedVarargsMethodInspection.java @@ -24,12 +24,14 @@ import org.jetbrains.annotations.NotNull; public class OverloadedVarargsMethodInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "overloaded.vararg.method.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiMethod element = (PsiMethod)infos[0]; @@ -43,6 +45,7 @@ public class OverloadedVarargsMethodInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new OverloadedVarargMethodVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspection.java index fed67bfddd4f..c255d33c0f89 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ParameterNameDiffersFromOverriddenParameterInspection.java @@ -16,7 +16,10 @@ package com.siyeh.ig.naming; import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel; -import com.intellij.psi.*; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiMethod; +import com.intellij.psi.PsiParameter; +import com.intellij.psi.PsiParameterList; import com.intellij.psi.search.searches.SuperMethodsSearch; import com.intellij.psi.util.MethodSignatureBackedByPsiMethod; import com.intellij.util.Query; @@ -44,12 +47,14 @@ public class ParameterNameDiffersFromOverriddenParameterInspection */ public boolean m_ignoreOverridesOfLibraryMethods = false; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "parameter.name.differs.from.overridden.parameter.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( @@ -57,6 +62,7 @@ public class ParameterNameDiffersFromOverriddenParameterInspection infos[0]); } + @Override public JComponent createOptionsPanel() { final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this); @@ -69,11 +75,13 @@ public class ParameterNameDiffersFromOverriddenParameterInspection return optionsPanel; } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameParameterFix((String)infos[0]); } + @Override public BaseInspectionVisitor buildVisitor() { return new ParameterNameDiffersFromOverriddenParameterVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ParameterNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ParameterNamingConventionInspection.java index f5646b8cf2d3..1dd07564c972 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ParameterNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/ParameterNamingConventionInspection.java @@ -30,25 +30,30 @@ public class ParameterNamingConventionInspection extends ConventionInspection { private static final int DEFAULT_MIN_LENGTH = 1; private static final int DEFAULT_MAX_LENGTH = 20; + @Override @NotNull public String getID() { return "MethodParameterNamingConvention"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "parameter.naming.convention.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { final String parametername = (String)infos[0]; @@ -67,18 +72,22 @@ public class ParameterNamingConventionInspection extends ConventionInspection { } } + @Override protected String getDefaultRegex() { return "[a-z][A-Za-z\\d]*"; } + @Override protected int getDefaultMinLength() { return DEFAULT_MIN_LENGTH; } + @Override protected int getDefaultMaxLength() { return DEFAULT_MAX_LENGTH; } + @Override public BaseInspectionVisitor buildVisitor() { return new NamingConventionsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/StaticMethodNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/StaticMethodNamingConventionInspection.java index d3a21fed9016..8b646b95b94e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/StaticMethodNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/StaticMethodNamingConventionInspection.java @@ -29,20 +29,24 @@ public class StaticMethodNamingConventionInspection private static final int DEFAULT_MIN_LENGTH = 4; private static final int DEFAULT_MAX_LENGTH = 32; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "static.method.naming.convention.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { final String methodName = (String)infos[0]; @@ -59,18 +63,22 @@ public class StaticMethodNamingConventionInspection getRegex()); } + @Override protected String getDefaultRegex() { return "[a-z][A-Za-z\\d]*"; } + @Override protected int getDefaultMinLength() { return DEFAULT_MIN_LENGTH; } + @Override protected int getDefaultMaxLength() { return DEFAULT_MAX_LENGTH; } + @Override public BaseInspectionVisitor buildVisitor() { return new NamingConventionsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/TypeParameterNamingConventionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/TypeParameterNamingConventionInspection.java index 431b434b209c..76d878ff3fd8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/naming/TypeParameterNamingConventionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/naming/TypeParameterNamingConventionInspection.java @@ -29,20 +29,24 @@ public class TypeParameterNamingConventionInspection private static final int DEFAULT_MIN_LENGTH = 1; private static final int DEFAULT_MAX_LENGTH = 1; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "type.parameter.naming.convention.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { final String parameterName = (String)infos[0]; @@ -59,18 +63,22 @@ public class TypeParameterNamingConventionInspection getRegex()); } + @Override protected String getDefaultRegex() { return "[A-Z][A-Za-z\\d]*"; } + @Override protected int getDefaultMinLength() { return DEFAULT_MIN_LENGTH; } + @Override protected int getDefaultMaxLength() { return DEFAULT_MAX_LENGTH; } + @Override public BaseInspectionVisitor buildVisitor() { return new NamingConventionsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/BadOddnessInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/BadOddnessInspection.java index 538ffeca06c5..69b2fc573aed 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/BadOddnessInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/BadOddnessInspection.java @@ -15,7 +15,10 @@ */ package com.siyeh.ig.numeric; -import com.intellij.psi.*; +import com.intellij.psi.JavaTokenType; +import com.intellij.psi.PsiBinaryExpression; +import com.intellij.psi.PsiExpression; +import com.intellij.psi.PsiType; import com.intellij.psi.tree.IElementType; import com.intellij.psi.util.ConstantExpressionUtil; import com.siyeh.InspectionGadgetsBundle; @@ -26,17 +29,20 @@ import org.jetbrains.annotations.NotNull; public class BadOddnessInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("bad.oddness.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "bad.oddness.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new BadOddnessVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/BigDecimalEqualsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/BigDecimalEqualsInspection.java index 5097fc4a137b..253b5803b886 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/BigDecimalEqualsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/BigDecimalEqualsInspection.java @@ -47,6 +47,7 @@ public class BigDecimalEqualsInspection extends BaseInspection { } private static class BigDecimalEqualsFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("big.decimal.equals.replace.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/CachedNumberConstructorCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/CachedNumberConstructorCallInspection.java index 47ad3c4de00a..355a086739ca 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/CachedNumberConstructorCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/CachedNumberConstructorCallInspection.java @@ -80,12 +80,14 @@ public class CachedNumberConstructorCallInspection this.className = className; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "cached.number.constructor.call.quickfix", className); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiNewExpression expression = diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/CharUsedInArithmeticContextInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/CharUsedInArithmeticContextInspection.java index ec511ec71d36..0ff6016057fd 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/CharUsedInArithmeticContextInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/CharUsedInArithmeticContextInspection.java @@ -79,6 +79,7 @@ public class CharUsedInArithmeticContextInspection extends BaseInspection { private static class CharUsedInArithmeticContentFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("char.used.in.arithmetic.context.quickfix"); @@ -108,6 +109,7 @@ public class CharUsedInArithmeticContextInspection extends BaseInspection { this.typeText = typeText; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("char.used.in.arithmetic.context.cast.quickfix", typeText); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ComparisonOfShortAndCharInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ComparisonOfShortAndCharInspection.java index 44f8b92fdf26..3d60cdfc9ec5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ComparisonOfShortAndCharInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ComparisonOfShortAndCharInspection.java @@ -26,16 +26,19 @@ import org.jetbrains.annotations.NotNull; public class ComparisonOfShortAndCharInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("comparison.of.short.and.char.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("comparison.of.short.and.char.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ComparisonOfShortAndCharVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java index b8ab455042d3..33b67a8fa125 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ComparisonToNaNInspection.java @@ -31,11 +31,13 @@ import org.jetbrains.annotations.NotNull; public class ComparisonToNaNInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("comparison.to.nan.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiBinaryExpression comparison = (PsiBinaryExpression)infos[0]; @@ -48,21 +50,25 @@ public class ComparisonToNaNInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new ComparisonToNaNVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new ComparisonToNaNFix(); } private static class ComparisonToNaNFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("comparison.to.nan.replace.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiReferenceExpression nanExpression = (PsiReferenceExpression)descriptor.getPsiElement(); final PsiElement target = nanExpression.resolve(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ConfusingFloatingPointLiteralInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ConfusingFloatingPointLiteralInspection.java index e17185d3a9c8..7cc272915f61 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ConfusingFloatingPointLiteralInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ConfusingFloatingPointLiteralInspection.java @@ -53,6 +53,7 @@ public class ConfusingFloatingPointLiteralInspection private static class ConfusingFloatingPointLiteralFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ConstantMathCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ConstantMathCallInspection.java index 69ec7a5d25dd..f94adebe9260 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ConstantMathCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ConstantMathCallInspection.java @@ -84,6 +84,7 @@ public class ConstantMathCallInspection extends BaseInspection { private static class MakeStrictFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ConvertOctalLiteralToDecimalFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ConvertOctalLiteralToDecimalFix.java index f5b52b648fdb..a552caff1683 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ConvertOctalLiteralToDecimalFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ConvertOctalLiteralToDecimalFix.java @@ -26,6 +26,7 @@ import org.jetbrains.annotations.NotNull; class ConvertOctalLiteralToDecimalFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/DivideByZeroInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/DivideByZeroInspection.java index 4745746b8474..f17827941594 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/DivideByZeroInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/DivideByZeroInspection.java @@ -25,22 +25,26 @@ import org.jetbrains.annotations.NotNull; public class DivideByZeroInspection extends BaseInspection { + @Override @NotNull public String getID() { return "divzero"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("divide.by.zero.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "divide.by.zero.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new DivisionByZeroVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/DoubleLiteralMayBeFloatLiteralInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/DoubleLiteralMayBeFloatLiteralInspection.java index 5412ffee7a7c..ab41e96c9935 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/DoubleLiteralMayBeFloatLiteralInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/DoubleLiteralMayBeFloatLiteralInspection.java @@ -99,6 +99,7 @@ public class DoubleLiteralMayBeFloatLiteralInspection extends BaseInspection { this.replacementString = replacementString; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/FloatingPointEqualityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/FloatingPointEqualityInspection.java index 3b0a32d94094..6e0d8e81b0c2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/FloatingPointEqualityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/FloatingPointEqualityInspection.java @@ -27,16 +27,19 @@ import org.jetbrains.annotations.NotNull; public class FloatingPointEqualityInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("floating.point.equality.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("floating.point.equality.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new FloatingPointEqualityComparisonVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ImplicitNumericConversionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ImplicitNumericConversionInspection.java index c8271b32f46d..5d401d2cbf1e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ImplicitNumericConversionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/ImplicitNumericConversionInspection.java @@ -112,6 +112,7 @@ public class ImplicitNumericConversionInspection extends BaseInspection { } } + @Override @NotNull public String getName() { return m_name; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/IntLiteralMayBeLongLiteralInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/IntLiteralMayBeLongLiteralInspection.java index 188f97f8a5e7..8b5368a9fb74 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/IntLiteralMayBeLongLiteralInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/IntLiteralMayBeLongLiteralInspection.java @@ -99,6 +99,7 @@ public class IntLiteralMayBeLongLiteralInspection extends BaseInspection { this.replacementString = replacementString; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/LongLiteralsEndingWithLowercaseLInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/LongLiteralsEndingWithLowercaseLInspection.java index c4983320bd47..a503387e7438 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/LongLiteralsEndingWithLowercaseLInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/LongLiteralsEndingWithLowercaseLInspection.java @@ -30,39 +30,46 @@ import org.jetbrains.annotations.NotNull; public class LongLiteralsEndingWithLowercaseLInspection extends BaseInspection { + @Override @NotNull public String getID() { return "LongLiteralEndingWithLowercaseL"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "long.literals.ending.with.lowercase.l.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "long.literals.ending.with.lowercase.l.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new LongLiteralWithLowercaseLVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new LongLiteralFix(); } private static class LongLiteralFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "long.literals.ending.with.lowercase.l.replace.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiExpression literal = diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/NonReproducibleMathCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/NonReproducibleMathCallInspection.java index 5211d2e2725a..f6cd53cd1fdf 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/NonReproducibleMathCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/NonReproducibleMathCallInspection.java @@ -57,30 +57,35 @@ public class NonReproducibleMathCallInspection extends BaseInspection { } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "non.reproducible.math.call.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "non.reproducible.math.call.problem.descriptor"); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new MakeStrictFix(); } private static class MakeStrictFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "non.reproducible.math.call.replace.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiIdentifier nameIdentifier = @@ -93,6 +98,7 @@ public class NonReproducibleMathCallInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new BigDecimalEqualsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java index e0a1540787be..beb78694f681 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/PointlessArithmeticExpressionInspection.java @@ -16,6 +16,7 @@ package com.siyeh.ig.numeric; import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; @@ -26,7 +27,6 @@ import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.ExpressionUtils; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -141,6 +141,7 @@ public class PointlessArithmeticExpressionInspection private class PointlessArithmeticFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/RemoveLeadingZeroFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/RemoveLeadingZeroFix.java index 9b4c1c5dd0c6..b080a5dd9bc2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/RemoveLeadingZeroFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/RemoveLeadingZeroFix.java @@ -28,6 +28,7 @@ import org.jetbrains.annotations.NotNull; class RemoveLeadingZeroFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnaryPlusInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnaryPlusInspection.java index 9b457647f7cc..9d7ad81d72d6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnaryPlusInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnaryPlusInspection.java @@ -26,17 +26,20 @@ import org.jetbrains.annotations.NotNull; public class UnaryPlusInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("unary.plus.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "unary.plus.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new UnaryPlusVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnnecessaryUnaryMinusInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnnecessaryUnaryMinusInspection.java index 0ed196417cfd..8ab4cf67b6d1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnnecessaryUnaryMinusInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnnecessaryUnaryMinusInspection.java @@ -30,18 +30,21 @@ import org.jetbrains.annotations.Nullable; public class UnnecessaryUnaryMinusInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "unnecessary.unary.minus.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "unnecessary.unary.minus.problem.descriptor"); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { return new UnnecessaryUnaryMinusFix(); @@ -49,12 +52,14 @@ public class UnnecessaryUnaryMinusInspection extends BaseInspection { private static class UnnecessaryUnaryMinusFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "unnecessary.unary.minus.quickfix"); } + @Override protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement element = descriptor.getPsiElement(); @@ -100,6 +105,7 @@ public class UnnecessaryUnaryMinusInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new UnnecessaryUnaryMinusVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnpredictableBigDecimalConstructorCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnpredictableBigDecimalConstructorCallInspection.java index ab052f8a6bb8..d41663d5aa70 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnpredictableBigDecimalConstructorCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/numeric/UnpredictableBigDecimalConstructorCallInspection.java @@ -35,12 +35,14 @@ public class UnpredictableBigDecimalConstructorCallInspection public boolean ignoreReferences = true; public boolean ignoreComplexLiterals = false; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "unpredictable.big.decimal.constructor.call.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( @@ -87,6 +89,7 @@ public class UnpredictableBigDecimalConstructorCallInspection this.argumentText = argumentText; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( @@ -115,6 +118,7 @@ public class UnpredictableBigDecimalConstructorCallInspection } } + @Override public BaseInspectionVisitor buildVisitor() { return new UnpredictableBigDecimalConstructorCallVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/BoxingBoxedValueInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/BoxingBoxedValueInspection.java index 3388dcfe82c5..e7ee81d06c66 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/BoxingBoxedValueInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/BoxingBoxedValueInspection.java @@ -76,6 +76,7 @@ public class BoxingBoxedValueInspection extends BaseInspection { private static class BoxingBoxedValueFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CallToSimpleGetterInClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CallToSimpleGetterInClassInspection.java index 493225a8e64e..a3174129f95d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CallToSimpleGetterInClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CallToSimpleGetterInClassInspection.java @@ -77,6 +77,7 @@ public class CallToSimpleGetterInClassInspection extends BaseInspection { private static class InlineCallFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("call.to.simple.getter.in.class.inline.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CallToSimpleSetterInClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CallToSimpleSetterInClassInspection.java index 0d04a16e68d1..6c5b9b6c6751 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CallToSimpleSetterInClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CallToSimpleSetterInClassInspection.java @@ -42,21 +42,25 @@ public class CallToSimpleSetterInClassInspection extends BaseInspection { @SuppressWarnings("UnusedDeclaration") public boolean onlyReportPrivateSetter = false; + @Override @NotNull public String getID() { return "CallToSimpleSetterFromWithinClass"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("call.to.simple.setter.in.class.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("call.to.simple.setter.in.class.problem.descriptor"); } + @Override @Nullable public JComponent createOptionsPanel() { final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this); @@ -67,17 +71,20 @@ public class CallToSimpleSetterInClassInspection extends BaseInspection { return optionsPanel; } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new InlineCallFix(); } private static class InlineCallFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("call.to.simple.setter.in.class.inline.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement methodIdentifier = descriptor.getPsiElement(); @@ -133,6 +140,7 @@ public class CallToSimpleSetterInClassInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new CallToSimpleSetterInClassVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ClassInitializerMayBeStaticInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ClassInitializerMayBeStaticInspection.java index 85c44b545bef..e43f6a8fde71 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ClassInitializerMayBeStaticInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ClassInitializerMayBeStaticInspection.java @@ -39,6 +39,7 @@ public class ClassInitializerMayBeStaticInspection extends BaseInspection { return true; } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( @@ -50,6 +51,7 @@ public class ClassInitializerMayBeStaticInspection extends BaseInspection { return new ChangeModifierFix(PsiModifier.STATIC); } + @Override @Nls @NotNull public String getDisplayName() { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CollectionsMustHaveInitialCapacityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CollectionsMustHaveInitialCapacityInspection.java index 10b73ab2fdbd..0010383f99a5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CollectionsMustHaveInitialCapacityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/CollectionsMustHaveInitialCapacityInspection.java @@ -28,23 +28,27 @@ import org.jetbrains.annotations.NotNull; public class CollectionsMustHaveInitialCapacityInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CollectionWithoutInitialCapacity"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "collections.must.have.initial.capacity.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "collections.must.have.initial.capacity.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new CollectionInitialCapacityVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ConstantStringInternInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ConstantStringInternInspection.java index 181d089c205f..ea205c23d20d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ConstantStringInternInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ConstantStringInternInspection.java @@ -55,6 +55,7 @@ public class ConstantStringInternInspection extends BaseInspection { private static class ConstantStringInternFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java index cbb11ead2be1..fd0059d250a5 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/DynamicRegexReplaceableByCompiledPatternInspection.java @@ -73,6 +73,7 @@ public class DynamicRegexReplaceableByCompiledPatternInspection extends BaseInsp private static class DynamicRegexReplaceableByCompiledPatternFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/FieldMayBeStaticInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/FieldMayBeStaticInspection.java index 297e0862c562..65a352df62e1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/FieldMayBeStaticInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/FieldMayBeStaticInspection.java @@ -28,22 +28,26 @@ import org.jetbrains.annotations.NotNull; public class FieldMayBeStaticInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "field.may.be.static.display.name"); } + @Override public BaseInspectionVisitor buildVisitor() { return new FieldMayBeStaticVisitor(); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "field.may.be.static.problem.descriptor"); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new ChangeModifierFix(PsiModifier.STATIC); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/InnerClassMayBeStaticInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/InnerClassMayBeStaticInspection.java index 08ed2db48c6c..b175055b51f6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/InnerClassMayBeStaticInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/InnerClassMayBeStaticInspection.java @@ -58,6 +58,7 @@ public class InnerClassMayBeStaticInspection extends BaseInspection { private static class InnerClassMayBeStaticFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("make.static.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/InstantiatingObjectToGetClassObjectInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/InstantiatingObjectToGetClassObjectInspection.java index a47eeb730b7f..e5a462324fb9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/InstantiatingObjectToGetClassObjectInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/InstantiatingObjectToGetClassObjectInspection.java @@ -57,6 +57,7 @@ public class InstantiatingObjectToGetClassObjectInspection private static class InstantiatingObjectToGetClassObjectFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/JavaLangReflectInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/JavaLangReflectInspection.java index d447bc180cec..352695a317ff 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/JavaLangReflectInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/JavaLangReflectInspection.java @@ -27,18 +27,21 @@ import org.jetbrains.annotations.NotNull; public class JavaLangReflectInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "java.lang.reflect.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "java.lang.reflect.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new JavaLangReflectVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java index f69c297cdcbb..5cd9e7651393 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/KeySetIterationMayUseEntrySetInspection.java @@ -63,6 +63,7 @@ public class KeySetIterationMayUseEntrySetInspection extends BaseInspection { private static class KeySetIterationMapUseEntrySetFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java index c0800761c80f..28c12bf3fc3d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/LengthOneStringInIndexOfInspection.java @@ -68,6 +68,7 @@ public class LengthOneStringInIndexOfInspection private static class ReplaceStringsWithCharsFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/LengthOneStringsInConcatenationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/LengthOneStringsInConcatenationInspection.java index ea1e398a3c61..ecd919314034 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/LengthOneStringsInConcatenationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/LengthOneStringsInConcatenationInspection.java @@ -63,6 +63,7 @@ public class LengthOneStringsInConcatenationInspection private static class ReplaceStringsWithCharsFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ManualArrayToCollectionCopyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ManualArrayToCollectionCopyInspection.java index 53001321d211..98b77797591d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ManualArrayToCollectionCopyInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ManualArrayToCollectionCopyInspection.java @@ -63,6 +63,7 @@ public class ManualArrayToCollectionCopyInspection extends BaseInspection { private static class ManualArrayToCollectionCopyFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ObjectAllocationInLoopInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ObjectAllocationInLoopInspection.java index 7c9b291c2eae..15919d42b791 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ObjectAllocationInLoopInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ObjectAllocationInLoopInspection.java @@ -25,18 +25,21 @@ import org.jetbrains.annotations.NotNull; public class ObjectAllocationInLoopInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "object.allocation.in.loop.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "object.allocation.in.loop.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ObjectAllocationInLoopsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/RandomDoubleForRandomIntegerInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/RandomDoubleForRandomIntegerInspection.java index fc55cbd49e12..5cc2ec902c4a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/RandomDoubleForRandomIntegerInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/RandomDoubleForRandomIntegerInspection.java @@ -60,6 +60,7 @@ public class RandomDoubleForRandomIntegerInspection private static class RandomDoubleForRandomIntegerFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java index 7dc4948bfcf4..693bb9e85135 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringBufferToStringInConcatenationInspection.java @@ -56,6 +56,7 @@ public class StringBufferToStringInConcatenationInspection private static class StringBufferToStringFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java index 5ff455099758..88b9e9392f0e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringConcatenationInsideStringBufferAppendInspection.java @@ -63,6 +63,7 @@ public class StringConcatenationInsideStringBufferAppendInspection extends BaseI private static class ReplaceWithChainedAppendFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringConstructorInspection.java index c55ebeb325ba..9ab5e744cac1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringConstructorInspection.java @@ -16,6 +16,7 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.util.IncorrectOperationException; @@ -24,7 +25,6 @@ import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.TypeUtils; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -97,6 +97,7 @@ public class StringConstructorInspection extends BaseInspection { } } + @Override @NotNull public String getName() { return m_name; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java index 9d239902e2c8..ab59be4d9ea0 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringEqualsEmptyStringInspection.java @@ -64,6 +64,7 @@ public class StringEqualsEmptyStringInspection extends BaseInspection { this.useIsEmpty = useIsEmpty; } + @Override @NotNull public String getName() { if (useIsEmpty) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringToStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringToStringInspection.java index 9f4d9a086811..d955fd2b99bb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringToStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/StringToStringInspection.java @@ -64,6 +64,7 @@ public class StringToStringInspection extends BaseInspection { private static class StringToStringFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/SubstringZeroInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/SubstringZeroInspection.java index cde2b44e94cb..2707170e7d38 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/SubstringZeroInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/SubstringZeroInspection.java @@ -55,6 +55,7 @@ public class SubstringZeroInspection extends BaseInspection { private static class SubstringZeroFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TailRecursionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TailRecursionInspection.java index 5d70f17aebd4..58f0b894c39e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TailRecursionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TailRecursionInspection.java @@ -71,6 +71,7 @@ public class TailRecursionInspection extends BaseInspection { private static class RemoveTailRecursionFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspection.java index 2c11b7b6da41..ed3f5bf0a6ca 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/ToArrayCallWithZeroLengthArrayArgumentInspection.java @@ -66,6 +66,7 @@ public class ToArrayCallWithZeroLengthArrayArgumentInspection extends BaseInspec private static class ToArrayCallWithZeroLengthArrayArgumentFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("to.array.call.with.zero.length.array.argument.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TrivialStringConcatenationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TrivialStringConcatenationInspection.java index e1a42d5a5b1a..4b72244ed687 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TrivialStringConcatenationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/TrivialStringConcatenationInspection.java @@ -142,6 +142,7 @@ public class TrivialStringConcatenationInspection extends BaseInspection { m_name = InspectionGadgetsBundle.message("string.replace.quickfix", calculateReplacementExpression(expression)); } + @Override @NotNull public String getName() { return m_name; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java index 7e820b8d7725..f37ccc774bc3 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionFromStringInspection.java @@ -141,6 +141,7 @@ public class UnnecessaryTemporaryOnConversionFromStringInspection m_name = name; } + @Override @NotNull public String getName() { return m_name; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java index 84f2e4cb7aa9..7e8a4afa4f32 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/performance/UnnecessaryTemporaryOnConversionToStringInspection.java @@ -106,6 +106,7 @@ public class UnnecessaryTemporaryOnConversionToStringInspection m_name = name; } + @Override @NotNull public String getName() { return m_name; diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java index 3a8f3358b2d9..af83e7c7e4de 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedFileSeparatorsInspection.java @@ -110,23 +110,27 @@ public class HardcodedFileSeparatorsInspection extends BaseInspection { */ public boolean m_recognizeExampleMediaType = false; + @Override @NotNull public String getID() { return "HardcodedFileSeparator"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "hardcoded.file.separator.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "hardcoded.file.separator.problem.descriptor"); } + @Override public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel( InspectionGadgetsBundle.message( @@ -134,6 +138,7 @@ public class HardcodedFileSeparatorsInspection extends BaseInspection { this, "m_recognizeExampleMediaType"); } + @Override public BaseInspectionVisitor buildVisitor() { return new HardcodedFileSeparatorsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedLineSeparatorsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedLineSeparatorsInspection.java index 73958d7b4eec..646fd2a8bc0b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedLineSeparatorsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/HardcodedLineSeparatorsInspection.java @@ -30,21 +30,25 @@ public class HardcodedLineSeparatorsInspection extends BaseInspection { private static final Pattern newlines = Pattern.compile("\\\\n|\\\\r|\\\\0{0,1}12|\\\\0{0,1}15"); + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("hardcoded.line.separator.display.name"); } + @Override @NotNull public String getID() { return "HardcodedLineSeparator"; } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("hardcoded.line.separator.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new HardcodedLineSeparatorsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/NativeMethodsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/NativeMethodsInspection.java index e74c686e67f5..9e8e669676fa 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/NativeMethodsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/NativeMethodsInspection.java @@ -24,22 +24,26 @@ import org.jetbrains.annotations.NotNull; public class NativeMethodsInspection extends BaseInspection { + @Override @NotNull public String getID() { return "NativeMethod"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("native.method.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "native.method.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NativeMethodVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/RuntimeExecInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/RuntimeExecInspection.java index 532641b8095e..4333d6523d5b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/RuntimeExecInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/RuntimeExecInspection.java @@ -27,23 +27,27 @@ import org.jetbrains.annotations.NotNull; public class RuntimeExecInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToRuntimeExec"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "runtime.exec.call.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "runtime.exec.call.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new RuntimeExecVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/SystemExitInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/SystemExitInspection.java index 6ea41ef70caf..cf6455a286ae 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/SystemExitInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/SystemExitInspection.java @@ -33,16 +33,19 @@ public class SystemExitInspection extends BaseInspection { @SuppressWarnings("PublicField") public boolean ignoreInMainMethod = false; + @Override @NotNull public String getID() { return "CallToSystemExit"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("system.exit.call.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final String className = (String)infos[0]; @@ -55,6 +58,7 @@ public class SystemExitInspection extends BaseInspection { return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message("system.exit.call.ignore.option"), this, "ignoreInMainMethod"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SystemExitVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/SystemGetenvInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/SystemGetenvInspection.java index 5c8962d42d1a..88e57c31d44c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/SystemGetenvInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/SystemGetenvInspection.java @@ -25,23 +25,27 @@ import org.jetbrains.annotations.NotNull; public class SystemGetenvInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToSystemGetenv"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "system.getenv.call.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "system.getenv.call.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SystemGetenvVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/UseOfProcessBuilderInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/UseOfProcessBuilderInspection.java index 263a0d72ee47..4e39351122b6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/UseOfProcessBuilderInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/UseOfProcessBuilderInspection.java @@ -27,18 +27,21 @@ import org.jetbrains.annotations.NotNull; public class UseOfProcessBuilderInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "use.processbuilder.class.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "use.processbuilder.class.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ProcessBuilderVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/UseOfSunClassesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/UseOfSunClassesInspection.java index 8fe9ab9f931a..c72d10938eff 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/portability/UseOfSunClassesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/portability/UseOfSunClassesInspection.java @@ -24,17 +24,20 @@ import org.jetbrains.annotations.NotNull; public class UseOfSunClassesInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("use.sun.classes.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "use.sun.classes.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new UseOfSunClassesVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/HighlightUtils.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/HighlightUtils.java index 4041867deaa5..294d5fded923 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/HighlightUtils.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/HighlightUtils.java @@ -63,6 +63,7 @@ public class HighlightUtils { } final Application application = ApplicationManager.getApplication(); application.invokeLater(new Runnable() { + @Override public void run() { final PsiElement[] elements = PsiUtilCore.toPsiElementArray(elementCollection); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/InheritanceUtil.java b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/InheritanceUtil.java index 0abfe864a7c6..0c726ab14734 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/InheritanceUtil.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/psiutils/InheritanceUtil.java @@ -61,6 +61,7 @@ public class InheritanceUtil { final SearchScope scope = GlobalSearchScope.allScope(class1.getProject()); final Query search = ClassInheritorsSearch.search(class1, scope, true, true); return !search.forEach(new Processor() { + @Override public boolean process(PsiClass inheritor) { return !inheritor.equals(class2) && !inheritor.isInheritor(class2, true); } @@ -81,6 +82,7 @@ public class InheritanceUtil { public static boolean hasOneInheritor(final PsiClass aClass) { final CountingProcessor processor = new CountingProcessor(2); ProgressManager.getInstance().runProcess(new Runnable() { + @Override public void run() { ClassInheritorsSearch.search(aClass, aClass.getUseScope(), false).forEach(processor); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/DriverManagerGetConnectionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/DriverManagerGetConnectionInspection.java index 9ea2911f5861..1f8e73a4e070 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/resources/DriverManagerGetConnectionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/resources/DriverManagerGetConnectionInspection.java @@ -27,23 +27,27 @@ import org.jetbrains.annotations.NotNull; public class DriverManagerGetConnectionInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToDriverManagerGetConnection"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "drivermanager.call.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "drivermanager.call.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new DriverManagerGetConnectionVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/security/ClassLoaderInstantiationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/security/ClassLoaderInstantiationInspection.java index 3d016f58f6c5..0fdfef95244c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/security/ClassLoaderInstantiationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/security/ClassLoaderInstantiationInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class ClassLoaderInstantiationInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "class.loader.instantiation.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "class.loader.instantiation.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassLoaderInstantiationVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/security/CloneableClassInSecureContextInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/security/CloneableClassInSecureContextInspection.java index 45cd5366c400..e404aca6f60a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/security/CloneableClassInSecureContextInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/security/CloneableClassInSecureContextInspection.java @@ -27,16 +27,19 @@ import org.jetbrains.annotations.NotNull; public class CloneableClassInSecureContextInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("cloneable.class.in.secure.context.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("cloneable.class.in.secure.context.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new CloneableClassInSecureContextVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/security/DesignForExtensionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/security/DesignForExtensionInspection.java index 63d6d5005e7b..c0e6d9773b38 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/security/DesignForExtensionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/security/DesignForExtensionInspection.java @@ -24,17 +24,20 @@ import org.jetbrains.annotations.NotNull; public class DesignForExtensionInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("design.for.extension.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "design.for.extension.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new DesignForExtensionVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/security/NonFinalCloneInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/security/NonFinalCloneInspection.java index 656a2d40855a..170f4a689c56 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/security/NonFinalCloneInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/security/NonFinalCloneInspection.java @@ -27,17 +27,20 @@ import org.jetbrains.annotations.NotNull; public class NonFinalCloneInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("non.final.clone.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "non.final.clone.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NonFinalCloneVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/security/NonStaticInnerClassInSecureContextInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/security/NonStaticInnerClassInSecureContextInspection.java index f066bd4ff218..b1235b821c86 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/security/NonStaticInnerClassInSecureContextInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/security/NonStaticInnerClassInSecureContextInspection.java @@ -25,18 +25,21 @@ import org.jetbrains.annotations.NotNull; public class NonStaticInnerClassInSecureContextInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "non.static.inner.class.in.secure.context.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "non.static.inner.class.in.secure.context.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NonStaticInnerClassInSecureContextVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/security/PublicStaticArrayFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/security/PublicStaticArrayFieldInspection.java index aae0ed39cbc3..86f18a66c137 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/security/PublicStaticArrayFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/security/PublicStaticArrayFieldInspection.java @@ -27,18 +27,21 @@ import org.jetbrains.annotations.NotNull; public class PublicStaticArrayFieldInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "public.static.array.field.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "public.static.array.field.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new PublicStaticArrayFieldVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/security/PublicStaticCollectionFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/security/PublicStaticCollectionFieldInspection.java index 5e3166f4b3f4..9c7902a8f55a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/security/PublicStaticCollectionFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/security/PublicStaticCollectionFieldInspection.java @@ -26,18 +26,21 @@ import org.jetbrains.annotations.NotNull; public class PublicStaticCollectionFieldInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "public.static.collection.field.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "public.static.collection.field.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new PublicStaticCollectionFieldVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/security/SystemSetSecurityManagerInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/security/SystemSetSecurityManagerInspection.java index 7ba5a1cfac8b..f4ee0a6cd6ea 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/security/SystemSetSecurityManagerInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/security/SystemSetSecurityManagerInspection.java @@ -27,23 +27,27 @@ import org.jetbrains.annotations.NotNull; public class SystemSetSecurityManagerInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToSystemSetSecurityManager"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "system.set.security.manager.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "system.set.security.manager.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SystemSetSecurityManagerVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ExternalizableWithSerializationMethodsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ExternalizableWithSerializationMethodsInspection.java index 6339a46c47a7..5030c1379cda 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ExternalizableWithSerializationMethodsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ExternalizableWithSerializationMethodsInspection.java @@ -25,17 +25,20 @@ import org.jetbrains.annotations.NotNull; public class ExternalizableWithSerializationMethodsInspection extends BaseInspection { + @Override @NotNull public String getID() { return "ExternalizableClassWithSerializationMethods"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "externalizable.with.serialization.methods.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final boolean hasReadObject = ((Boolean)infos[0]).booleanValue(); @@ -54,6 +57,7 @@ public class ExternalizableWithSerializationMethodsInspection } } + @Override public BaseInspectionVisitor buildVisitor() { return new ExternalizableDefinesSerializationMethodsVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/NonSerializableWithSerialVersionUIDFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/NonSerializableWithSerialVersionUIDFieldInspection.java index 7dbdc71a9cc9..b6f45ec00828 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/NonSerializableWithSerialVersionUIDFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/NonSerializableWithSerialVersionUIDFieldInspection.java @@ -17,10 +17,10 @@ package com.siyeh.ig.serialization; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; +import com.intellij.psi.PsiAnonymousClass; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiField; -import com.intellij.psi.PsiAnonymousClass; import com.intellij.util.IncorrectOperationException; import com.siyeh.HardcodedMethodConstants; import com.siyeh.InspectionGadgetsBundle; @@ -83,6 +83,7 @@ public class NonSerializableWithSerialVersionUIDFieldInspection private static class RemoveSerialVersionUIDFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ReadObjectAndWriteObjectPrivateInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ReadObjectAndWriteObjectPrivateInspection.java index e1c855014ed5..b078633ee408 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ReadObjectAndWriteObjectPrivateInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ReadObjectAndWriteObjectPrivateInspection.java @@ -29,27 +29,32 @@ import org.jetbrains.annotations.NotNull; public class ReadObjectAndWriteObjectPrivateInspection extends BaseInspection { + @Override @NotNull public String getID() { return "NonPrivateSerializationMethod"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "readwriteobject.private.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "readwriteobject.private.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ReadObjectWriteObjectPrivateVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new ChangeModifierFix(PsiModifier.PRIVATE); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ReadObjectInitializationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ReadObjectInitializationInspection.java index 5f2bf93604f6..628baa6e6cc7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ReadObjectInitializationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ReadObjectInitializationInspection.java @@ -26,23 +26,27 @@ import org.jetbrains.annotations.NotNull; public class ReadObjectInitializationInspection extends BaseInspection { + @Override @NotNull public String getID() { return "InstanceVariableMayNotBeInitializedByReadObject"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "readobject.initialization.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "readobject.initialization.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ReadObjectInitializationVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ReadResolveAndWriteReplaceProtectedInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ReadResolveAndWriteReplaceProtectedInspection.java index a98f953dbe43..1aa6168ec1d6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ReadResolveAndWriteReplaceProtectedInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/ReadResolveAndWriteReplaceProtectedInspection.java @@ -29,22 +29,26 @@ import org.jetbrains.annotations.NotNull; public class ReadResolveAndWriteReplaceProtectedInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "readresolve.writereplace.protected.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "readresolve.writereplace.protected.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ReadResolveWriteReplaceProtectedVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new ChangeModifierFix(PsiModifier.PROTECTED); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerialPersistentFieldsWithWrongSignatureInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerialPersistentFieldsWithWrongSignatureInspection.java index 08931cae61d7..42b0ce8c2bb2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerialPersistentFieldsWithWrongSignatureInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerialPersistentFieldsWithWrongSignatureInspection.java @@ -29,18 +29,21 @@ import org.jetbrains.annotations.NotNull; public class SerialPersistentFieldsWithWrongSignatureInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "serialpersistentfields.with.wrong.signature.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "serialpersistentfields.with.wrong.signature.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SerialPersistentFieldsWithWrongSignatureVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java index a7e25e325771..481f6a02f7bc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerialVersionUIDNotStaticFinalInspection.java @@ -60,6 +60,7 @@ public class SerialVersionUIDNotStaticFinalInspection extends BaseInspection { private static class SerialVersionUIDNotStaticFinalFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableInnerClassHasSerialVersionUIDFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableInnerClassHasSerialVersionUIDFieldInspection.java index 591467106b01..858fade2a039 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableInnerClassHasSerialVersionUIDFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableInnerClassHasSerialVersionUIDFieldInspection.java @@ -24,27 +24,32 @@ import org.jetbrains.annotations.NotNull; public class SerializableInnerClassHasSerialVersionUIDFieldInspection extends SerializableInspection { + @Override @NotNull public String getID() { return "SerializableNonStaticInnerClassWithoutSerialVersionUID"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "serializable.inner.class.has.serial.version.uid.field.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "serializable.inner.class.has.serial.version.uid.field.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new AddSerialVersionUIDFix(); } + @Override public BaseInspectionVisitor buildVisitor() { return new SerializableInnerClassHasSerialVersionUIDFieldVisitor(this); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableInnerClassWithNonSerializableOuterClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableInnerClassWithNonSerializableOuterClassInspection.java index 636c3e36e65c..e956a21aa351 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableInnerClassWithNonSerializableOuterClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/SerializableInnerClassWithNonSerializableOuterClassInspection.java @@ -22,18 +22,21 @@ import org.jetbrains.annotations.NotNull; public class SerializableInnerClassWithNonSerializableOuterClassInspection extends SerializableInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "serializable.inner.class.with.non.serializable.outer.class.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "serializable.inner.class.with.non.serializable.outer.class.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SerializableInnerClassWithNonSerializableOuterClassVisitor(this); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/TransientFieldInNonSerializableClassInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/TransientFieldInNonSerializableClassInspection.java index 3f238967d721..c593463cf4d6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/TransientFieldInNonSerializableClassInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/TransientFieldInNonSerializableClassInspection.java @@ -32,12 +32,14 @@ import org.jetbrains.annotations.NotNull; public class TransientFieldInNonSerializableClassInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "transient.field.in.non.serializable.class.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiField field = (PsiField)infos[0]; @@ -46,6 +48,7 @@ public class TransientFieldInNonSerializableClassInspection field.getName()); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new TransientFieldInNonSerializableClassFix(); } @@ -54,12 +57,14 @@ public class TransientFieldInNonSerializableClassInspection private static class TransientFieldInNonSerializableClassFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "transient.field.in.non.serializable.class.remove.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement transientModifier = descriptor.getPsiElement(); @@ -67,6 +72,7 @@ public class TransientFieldInNonSerializableClassInspection } } + @Override public BaseInspectionVisitor buildVisitor() { return new TransientFieldInNonSerializableClassVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/TransientFieldNotInitializedInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/TransientFieldNotInitializedInspection.java index d3ee372b5f9e..d9f1ea685914 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/TransientFieldNotInitializedInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/serialization/TransientFieldNotInitializedInspection.java @@ -25,18 +25,21 @@ import org.jetbrains.annotations.NotNull; public class TransientFieldNotInitializedInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "transient.field.not.initialized.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "transient.field.not.initialized.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ReadObjectInitializationVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java index 6ed647975de2..1e3498d3d48a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/CStyleArrayDeclarationInspection.java @@ -30,18 +30,21 @@ import org.jetbrains.annotations.NotNull; public class CStyleArrayDeclarationInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "c.style.array.declaration.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "c.style.array.declaration.problem.descriptor"); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new CStyleArrayDeclarationFix(); } @@ -49,12 +52,14 @@ public class CStyleArrayDeclarationInspection extends BaseInspection { private static class CStyleArrayDeclarationFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "c.style.array.declaration.replace.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement nameElement = descriptor.getPsiElement(); @@ -64,6 +69,7 @@ public class CStyleArrayDeclarationInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new CStyleArrayDeclarationVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java index b70c3c13ba69..f5ed627d2145 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/CallToStringConcatCanBeReplacedByOperatorInspection.java @@ -61,6 +61,7 @@ public class CallToStringConcatCanBeReplacedByOperatorInspection private static class CallToStringConcatCanBeReplacedByOperatorFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("call.to.string.concat.can.be.replaced.by.operator.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ChainedEqualityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ChainedEqualityInspection.java index 440aefef4c82..cd7844fd3f99 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ChainedEqualityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ChainedEqualityInspection.java @@ -26,21 +26,25 @@ import org.jetbrains.annotations.NotNull; public class ChainedEqualityInspection extends BaseInspection { + @Override @NotNull public String getID() { return "ChainedEqualityComparisons"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("chained.equality.comparisons.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("chained.equality.comparisons.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ChainedEqualityVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ConstantOnLHSOfComparisonInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ConstantOnLHSOfComparisonInspection.java index f92d2dac79f1..858d5a8dd0ff 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ConstantOnLHSOfComparisonInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ConstantOnLHSOfComparisonInspection.java @@ -61,6 +61,7 @@ public class ConstantOnLHSOfComparisonInspection extends BaseInspection { private static class SwapComparisonFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("flip.comparison.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ConstantOnRHSOfComparisonInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ConstantOnRHSOfComparisonInspection.java index 1194dae6e33d..4528fef2e23e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ConstantOnRHSOfComparisonInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ConstantOnRHSOfComparisonInspection.java @@ -61,6 +61,7 @@ public class ConstantOnRHSOfComparisonInspection extends BaseInspection { private static class SwapComparisonFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("flip.comparison.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ControlFlowStatementWithoutBracesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ControlFlowStatementWithoutBracesInspection.java index 61abb7b1a644..605430ce4d87 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ControlFlowStatementWithoutBracesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ControlFlowStatementWithoutBracesInspection.java @@ -50,6 +50,7 @@ public class ControlFlowStatementWithoutBracesInspection private static class ControlFlowStatementFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/EqualsCalledOnEnumConstantInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/EqualsCalledOnEnumConstantInspection.java index 42fd5607b1d4..08adf0c66e43 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/EqualsCalledOnEnumConstantInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/EqualsCalledOnEnumConstantInspection.java @@ -15,17 +15,17 @@ */ package com.siyeh.ig.style; +import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; -import com.intellij.openapi.project.Project; -import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.util.IncorrectOperationException; +import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.MethodCallUtils; import com.siyeh.ig.psiutils.TypeUtils; -import com.siyeh.InspectionGadgetsBundle; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -59,6 +59,7 @@ public class EqualsCalledOnEnumConstantInspection extends BaseInspection { private static class EqualsCalledOnEnumValueFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ExtendsObjectInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ExtendsObjectInspection.java index 6effd8546a21..c3c5955860cc 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ExtendsObjectInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ExtendsObjectInspection.java @@ -58,6 +58,7 @@ public class ExtendsObjectInspection extends BaseInspection { private static class ExtendsObjectFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ImplicitCallToSuperInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ImplicitCallToSuperInspection.java index 2b4d7efb2cbd..f89babe7b08d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ImplicitCallToSuperInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ImplicitCallToSuperInspection.java @@ -28,7 +28,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.ExpressionUtils; import org.jetbrains.annotations.NotNull; -import javax.swing.JComponent; +import javax.swing.*; public class ImplicitCallToSuperInspection extends BaseInspection { @@ -63,6 +63,7 @@ public class ImplicitCallToSuperInspection extends BaseInspection { private static class AddExplicitSuperCall extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ListIndexOfReplaceableByContainsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ListIndexOfReplaceableByContainsInspection.java index a847f30bf819..63db6c4c1ce7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ListIndexOfReplaceableByContainsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ListIndexOfReplaceableByContainsInspection.java @@ -100,6 +100,7 @@ public class ListIndexOfReplaceableByContainsInspection replaceExpression(expression, newExpressionText); } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/LiteralAsArgToStringEqualsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/LiteralAsArgToStringEqualsInspection.java index a403122398d7..04a654b4b609 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/LiteralAsArgToStringEqualsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/LiteralAsArgToStringEqualsInspection.java @@ -32,12 +32,14 @@ import org.jetbrains.annotations.NotNull; public class LiteralAsArgToStringEqualsInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "literal.as.arg.to.string.equals.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final String methodName = (String)infos[0]; @@ -46,22 +48,26 @@ public class LiteralAsArgToStringEqualsInspection methodName); } + @Override public BaseInspectionVisitor buildVisitor() { return new LiteralAsArgToEqualsVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new SwapEqualsFix(); } private static class SwapEqualsFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "literal.as.arg.to.string.equals.flip.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiExpression argument = diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/MissortedModifiersInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/MissortedModifiersInspection.java index 49049a216f94..37a7698966d4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/MissortedModifiersInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/MissortedModifiersInspection.java @@ -16,6 +16,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.tree.IElementType; @@ -24,7 +25,6 @@ import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -38,26 +38,31 @@ public class MissortedModifiersInspection extends BaseInspection { */ public boolean m_requireAnnotationsFirst = true; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "missorted.modifiers.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "missorted.modifiers.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new MissortedModifiersVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new SortModifiersFix(); } + @Override public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel( InspectionGadgetsBundle.message( @@ -67,12 +72,14 @@ public class MissortedModifiersInspection extends BaseInspection { private static class SortModifiersFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "missorted.modifiers.sort.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { @@ -217,6 +224,7 @@ public class MissortedModifiersInspection extends BaseInspection { s_modifierOrder.put(PsiModifier.STRICTFP, Integer.valueOf(10)); } + @Override public int compare(String modifier1, String modifier2) { final Integer ordinal1 = s_modifierOrder.get(modifier1); if (ordinal1 == null) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/MultipleTypedDeclarationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/MultipleTypedDeclarationInspection.java index 7ab333475786..d75b8ae3441a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/MultipleTypedDeclarationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/MultipleTypedDeclarationInspection.java @@ -29,27 +29,32 @@ import java.util.List; public class MultipleTypedDeclarationInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "multiple.typed.declaration.display.name"); } + @Override @NotNull public String getID() { return "VariablesOfDifferentTypesInDeclaration"; } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "multiple.typed.declaration.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new MultiplyTypedDeclarationVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new NormalizeDeclarationFix(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/RedundantImplementsInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/RedundantImplementsInspection.java index 8134aa06edc0..a54717a4624f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/RedundantImplementsInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/RedundantImplementsInspection.java @@ -73,6 +73,7 @@ public class RedundantImplementsInspection extends BaseInspection { private static class RedundantImplementsFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ReturnThisInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ReturnThisInspection.java index 7c8d265b872e..62c411f1fb0e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/ReturnThisInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/ReturnThisInspection.java @@ -23,22 +23,26 @@ import org.jetbrains.annotations.NotNull; public class ReturnThisInspection extends BaseInspection { + @Override @NotNull public String getID() { return "ReturnOfThis"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("return.this.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "return.this.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ReturnThisVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/SimplifiableAnnotationInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/SimplifiableAnnotationInspection.java index 348e4e0bbc98..8028686bd0f4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/SimplifiableAnnotationInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/SimplifiableAnnotationInspection.java @@ -57,6 +57,7 @@ public class SimplifiableAnnotationInspection extends BaseInspection { this.replacement = replacement; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java index 0ae7b1cdeb1d..2a0ff2c0d0bd 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/SizeReplaceableByIsEmptyInspection.java @@ -85,6 +85,7 @@ public class SizeReplaceableByIsEmptyInspection extends BaseInspection { private static class SizeReplaceableByIsEmptyFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("size.replaceable.by.isempty.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/TypeParameterExtendsObjectInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/TypeParameterExtendsObjectInspection.java index 7388d9d7b3ee..58e0661111ab 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/TypeParameterExtendsObjectInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/TypeParameterExtendsObjectInspection.java @@ -68,6 +68,7 @@ public class TypeParameterExtendsObjectInspection extends BaseInspection { private static class ExtendsObjectFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( @@ -110,6 +111,7 @@ public class TypeParameterExtendsObjectInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new ExtendsObjectVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java index fa9b0bafa7e6..dfa79a4e7032 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedInnerClassAccessInspection.java @@ -71,6 +71,7 @@ public class UnnecessarilyQualifiedInnerClassAccessInspection private static class UnnecessarilyQualifiedInnerClassAccessFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java index f83d8b3c24ad..a103093468c2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticUsageInspection.java @@ -87,6 +87,7 @@ public class UnnecessarilyQualifiedStaticUsageInspection extends BaseInspection private static class UnnecessarilyQualifiedStaticUsageFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("unnecessary.qualifier.for.this.remove.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticallyImportedElementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticallyImportedElementInspection.java index 4b7109f08b2c..8f6f9e73f52f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticallyImportedElementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarilyQualifiedStaticallyImportedElementInspection.java @@ -53,6 +53,7 @@ public class UnnecessarilyQualifiedStaticallyImportedElementInspection extends B private static class UnnecessarilyQualifiedStaticallyImportedElementFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("unnecessarily.qualified.statically.imported.element.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryBlockStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryBlockStatementInspection.java index 8a91b6d3a984..5af4d229a630 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryBlockStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryBlockStatementInspection.java @@ -74,6 +74,7 @@ public class UnnecessaryBlockStatementInspection extends BaseInspection { private static class UnnecessaryBlockFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryCallToStringValueOfInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryCallToStringValueOfInspection.java index 45fdfb5146b9..b8c0394d0640 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryCallToStringValueOfInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryCallToStringValueOfInspection.java @@ -72,6 +72,7 @@ public class UnnecessaryCallToStringValueOfInspection extends BaseInspection { this.replacementText = replacementText; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("unnecessary.call.to.string.valueof.quickfix", replacementText); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryConstantArrayCreationExpressionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryConstantArrayCreationExpressionInspection.java index 6917dbedda19..3051092fea09 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryConstantArrayCreationExpressionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryConstantArrayCreationExpressionInspection.java @@ -15,14 +15,14 @@ */ package com.siyeh.ig.style; +import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.openapi.project.Project; import com.intellij.psi.*; +import com.intellij.util.IncorrectOperationException; +import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.siyeh.InspectionGadgetsBundle; -import com.intellij.openapi.project.Project; -import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -52,6 +52,7 @@ public class UnnecessaryConstantArrayCreationExpressionInspection private static class UnnecessaryConstantArrayCreationExpressionFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java index 7b29d4941c2e..615195a671e1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryConstructorInspection.java @@ -27,7 +27,7 @@ import com.siyeh.ig.InspectionGadgetsFix; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; -import javax.swing.JComponent; +import javax.swing.*; public class UnnecessaryConstructorInspection extends BaseInspection { @@ -77,6 +77,7 @@ public class UnnecessaryConstructorInspection extends BaseInspection { private static class UnnecessaryConstructorFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryInterfaceModifierInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryInterfaceModifierInspection.java index cfa66387b071..0b905ee3e7f4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryInterfaceModifierInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryInterfaceModifierInspection.java @@ -94,6 +94,7 @@ public class UnnecessaryInterfaceModifierInspection extends BaseInspection { this.modifiersText = modifiersText; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("smth.unnecessary.remove.quickfix", modifiersText); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryParenthesesInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryParenthesesInspection.java index 42e901e7c434..2d31641c3f7b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryParenthesesInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryParenthesesInspection.java @@ -68,6 +68,7 @@ public class UnnecessaryParenthesesInspection extends BaseInspection { private class UnnecessaryParenthesesFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("unnecessary.parentheses.remove.quickfix"); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryQualifierForThisInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryQualifierForThisInspection.java index f26ed5da9691..75abe2ad6bc6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryQualifierForThisInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryQualifierForThisInspection.java @@ -30,22 +30,26 @@ import org.jetbrains.annotations.NotNull; public class UnnecessaryQualifierForThisInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "unnecessary.qualifier.for.this.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "unnecessary.qualifier.for.this.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new UnnecessaryQualifierForThisVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new UnnecessaryQualifierForThisFix(); } @@ -53,12 +57,14 @@ public class UnnecessaryQualifierForThisInspection private static class UnnecessaryQualifierForThisFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "unnecessary.qualifier.for.this.remove.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement qualifier = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarySemicolonInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarySemicolonInspection.java index ad2633ee8a2b..9612996f581b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarySemicolonInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarySemicolonInspection.java @@ -61,6 +61,7 @@ public class UnnecessarySemicolonInspection extends BaseInspection { private static class UnnecessarySemicolonFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarySuperConstructorInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarySuperConstructorInspection.java index 9c25e8b236cf..8cfac9272302 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarySuperConstructorInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarySuperConstructorInspection.java @@ -29,23 +29,27 @@ import org.jetbrains.annotations.NotNull; public class UnnecessarySuperConstructorInspection extends BaseInspection { + @Override @NotNull public String getID() { return "UnnecessaryCallToSuper"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "unnecessary.super.constructor.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "unnecessary.super.constructor.problem.descriptor"); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new UnnecessarySuperConstructorFix(); } @@ -53,12 +57,14 @@ public class UnnecessarySuperConstructorInspection private static class UnnecessarySuperConstructorFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "unnecessary.super.constructor.remove.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement superCall = descriptor.getPsiElement(); @@ -68,6 +74,7 @@ public class UnnecessarySuperConstructorInspection } } + @Override public BaseInspectionVisitor buildVisitor() { return new UnnecessarySuperConstructorVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java index b5a1bcc02c32..1a8698516be9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessarySuperQualifierInspection.java @@ -55,6 +55,7 @@ public class UnnecessarySuperQualifierInspection extends BaseInspection { private static class UnnecessarySuperQualifierFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryThisInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryThisInspection.java index d1c9742e323f..cec80b21318f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryThisInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryThisInspection.java @@ -65,11 +65,13 @@ public class UnnecessaryThisInspection extends BaseInspection { private static class UnnecessaryThisFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("unnecessary.this.remove.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement thisToken = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryToStringCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryToStringCallInspection.java index d7cad4ef4f13..d5e333e0804c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryToStringCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnnecessaryToStringCallInspection.java @@ -67,6 +67,7 @@ public class UnnecessaryToStringCallInspection extends BaseInspection { this.replacementText = replacementText; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("unnecessary.call.to.string.valueof.quickfix", replacementText); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java index 608de25da3ed..f005ed019e2c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedInnerClassAccessInspection.java @@ -65,6 +65,7 @@ public class UnqualifiedInnerClassAccessInspection extends BaseInspection { private static class UnqualifiedInnerClassAccessFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedStaticUsageInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedStaticUsageInspection.java index ea599149a44c..65b863d3ea67 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedStaticUsageInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/style/UnqualifiedStaticUsageInspection.java @@ -16,6 +16,7 @@ package com.siyeh.ig.style; import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel; import com.intellij.openapi.project.Project; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; @@ -25,7 +26,6 @@ import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; -import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -45,12 +45,14 @@ public class UnqualifiedStaticUsageInspection extends BaseInspection { */ public boolean m_ignoreStaticAccessFromStaticContext = false; + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "unqualified.static.usage.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { if (infos[0] instanceof PsiMethodCallExpression) { @@ -63,6 +65,7 @@ public class UnqualifiedStaticUsageInspection extends BaseInspection { } } + @Override public JComponent createOptionsPanel() { final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this); @@ -78,10 +81,12 @@ public class UnqualifiedStaticUsageInspection extends BaseInspection { return optionsPanel; } + @Override public BaseInspectionVisitor buildVisitor() { return new UnqualifiedStaticCallVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { if (infos[0] instanceof PsiMethodCallExpression) { return new UnqualifiedStaticAccessFix(false); @@ -100,6 +105,7 @@ public class UnqualifiedStaticUsageInspection extends BaseInspection { m_fixField = fixField; } + @Override @NotNull public String getName() { if (m_fixField) { @@ -112,6 +118,7 @@ public class UnqualifiedStaticUsageInspection extends BaseInspection { } } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiReferenceExpression expression = diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplay.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplay.java index 12675c489e74..562fecfee3db 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplay.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/TelemetryDisplay.java @@ -44,6 +44,7 @@ class TelemetryDisplay { final Comparator nameComparator = new Comparator() { + @Override public int compare(InspectionRunTime runTime1, InspectionRunTime runTime2) { return runTime1.getInspectionName().compareToIgnoreCase( @@ -53,6 +54,7 @@ class TelemetryDisplay { final Comparator runCountComparator = new Comparator() { + @Override public int compare(InspectionRunTime runTime1, InspectionRunTime runTime2) { return runTime1.getRunCount() - runTime2.getRunCount(); @@ -61,6 +63,7 @@ class TelemetryDisplay { final Comparator totalRunTimeComparator = new Comparator() { + @Override public int compare(InspectionRunTime runTime1, InspectionRunTime runTime2) { final long totalRunTime1 = runTime1.getTotalRunTime(); @@ -79,6 +82,7 @@ class TelemetryDisplay { final Comparator averageRunTimeComparator = new Comparator() { + @Override public int compare(InspectionRunTime runTime1, InspectionRunTime runTime2) { final double averageRunTime1 = diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AwaitNotInLoopInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AwaitNotInLoopInspection.java index 23e66cf56cba..048c4dd1a9a6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AwaitNotInLoopInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AwaitNotInLoopInspection.java @@ -26,18 +26,21 @@ import org.jetbrains.annotations.NotNull; public class AwaitNotInLoopInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "await.not.in.loop.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "await.not.in.loop.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new AwaitNotInLoopVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AwaitWithoutCorrespondingSignalInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AwaitWithoutCorrespondingSignalInspection.java index c9e027281dfe..48ca04ba3cf1 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AwaitWithoutCorrespondingSignalInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/AwaitWithoutCorrespondingSignalInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class AwaitWithoutCorrespondingSignalInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "await.without.corresponding.signal.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "await.without.corresponding.signal.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new AwaitWithoutCorrespondingSignalVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/BusyWaitInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/BusyWaitInspection.java index 8fd55dbcc1d8..6004133e41be 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/BusyWaitInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/BusyWaitInspection.java @@ -26,16 +26,19 @@ import org.jetbrains.annotations.NotNull; public class BusyWaitInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("busy.wait.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("busy.wait.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new BusyWaitVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ConditionSignalInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ConditionSignalInspection.java index 4949fa2d52b8..ebef2309612c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ConditionSignalInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ConditionSignalInspection.java @@ -60,6 +60,7 @@ public class ConditionSignalInspection extends BaseInspection { private static class ConditionSignalFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/DoubleCheckedLockingInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/DoubleCheckedLockingInspection.java index abade40b620d..f65b1762da15 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/DoubleCheckedLockingInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/DoubleCheckedLockingInspection.java @@ -80,6 +80,7 @@ public class DoubleCheckedLockingInspection extends BaseInspection { this.field = field; } + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/EmptySynchronizedStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/EmptySynchronizedStatementInspection.java index 889c0e4207ea..a2c7f7b3632e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/EmptySynchronizedStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/EmptySynchronizedStatementInspection.java @@ -15,10 +15,10 @@ */ package com.siyeh.ig.threading; +import com.intellij.psi.JspPsiUtil; import com.intellij.psi.PsiCodeBlock; import com.intellij.psi.PsiStatement; import com.intellij.psi.PsiSynchronizedStatement; -import com.intellij.psi.JspPsiUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; @@ -26,18 +26,21 @@ import org.jetbrains.annotations.NotNull; public class EmptySynchronizedStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "empty.synchronized.statement.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "empty.synchronized.statement.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new EmptySynchronizedStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/MethodMayBeSynchronizedInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/MethodMayBeSynchronizedInspection.java index f5196b66c2b3..a8846a77872c 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/MethodMayBeSynchronizedInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/MethodMayBeSynchronizedInspection.java @@ -29,23 +29,27 @@ import org.jetbrains.annotations.Nullable; public class MethodMayBeSynchronizedInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "method.may.be.synchronized.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "method.may.be.synchronized.problem.descriptor"); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { return new MethodMayBeSynchronizedQuickFix(); } + @Override public BaseInspectionVisitor buildVisitor() { return new MethodMayBeSynchronizedVisitor(); } @@ -53,12 +57,14 @@ public class MethodMayBeSynchronizedInspection extends BaseInspection { private static class MethodMayBeSynchronizedQuickFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "method.may.be.synchronized.quickfix"); } + @Override protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement identifier = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NakedNotifyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NakedNotifyInspection.java index cb29886318e9..494128282094 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NakedNotifyInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NakedNotifyInspection.java @@ -25,17 +25,20 @@ import org.jetbrains.annotations.NotNull; public class NakedNotifyInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("naked.notify.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "naked.notify.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NakedNotifyVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NestedSynchronizedStatementInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NestedSynchronizedStatementInspection.java index 32848768e638..3a6ed172a8cb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NestedSynchronizedStatementInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NestedSynchronizedStatementInspection.java @@ -26,18 +26,21 @@ import org.jetbrains.annotations.NotNull; public class NestedSynchronizedStatementInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "nested.synchronized.statement.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "nested.synchronized.statement.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NestedSynchronizedStatementVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NonSynchronizedMethodOverridesSynchronizedMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NonSynchronizedMethodOverridesSynchronizedMethodInspection.java index 5b344ab02610..5a6ee229c1c9 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NonSynchronizedMethodOverridesSynchronizedMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NonSynchronizedMethodOverridesSynchronizedMethodInspection.java @@ -15,23 +15,25 @@ */ package com.siyeh.ig.threading; +import com.intellij.psi.PsiModifier; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.fixes.ChangeModifierFix; -import com.intellij.psi.PsiModifier; import org.jetbrains.annotations.NotNull; public class NonSynchronizedMethodOverridesSynchronizedMethodInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "non.synchronized.method.overrides.synchronized.method.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( @@ -43,6 +45,7 @@ public class NonSynchronizedMethodOverridesSynchronizedMethodInspection return new ChangeModifierFix(PsiModifier.SYNCHRONIZED); } + @Override public BaseInspectionVisitor buildVisitor() { return new NonSynchronizedMethodOverridesSynchronizedMethodVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NotifyCalledOnConditionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NotifyCalledOnConditionInspection.java index 46e57f125fd7..51f54fd0f1e4 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NotifyCalledOnConditionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NotifyCalledOnConditionInspection.java @@ -26,18 +26,21 @@ import org.jetbrains.annotations.NotNull; public class NotifyCalledOnConditionInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "notify.called.on.condition.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "notify.called.on.condition.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NotifyCalledOnConditionVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NotifyNotInSynchronizedContextInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NotifyNotInSynchronizedContextInspection.java index a7cbc59d02f8..a985ff911ef6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NotifyNotInSynchronizedContextInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NotifyNotInSynchronizedContextInspection.java @@ -29,18 +29,21 @@ import org.jetbrains.annotations.NotNull; public class NotifyNotInSynchronizedContextInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "notify.not.in.synchronized.context.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "notify.not.in.synchronized.context.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new NotifyNotInSynchronizedContextVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NotifyWithoutCorrespondingWaitInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NotifyWithoutCorrespondingWaitInspection.java index 0931de3368a5..2decdc02dee7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NotifyWithoutCorrespondingWaitInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/NotifyWithoutCorrespondingWaitInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class NotifyWithoutCorrespondingWaitInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "notify.without.corresponding.wait.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "notify.without.corresponding.wait.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new WaitWithoutCorrespondingNotifyVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ObjectNotifyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ObjectNotifyInspection.java index fc14ffc27806..3468a3a99f64 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ObjectNotifyInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ObjectNotifyInspection.java @@ -28,38 +28,45 @@ import org.jetbrains.annotations.NotNull; public class ObjectNotifyInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToNotifyInsteadOfNotifyAll"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("object.notify.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "object.notify.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ObjectNotifyVisitor(); } + @Override public InspectionGadgetsFix buildFix(Object... infos) { return new ObjectNotifyFix(); } private static class ObjectNotifyFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( "object.notify.replace.quickfix"); } + @Override public void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement methodNameElement = descriptor.getPsiElement(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspection.java index 653c0986c627..d12e82fb8c90 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/PublicFieldAccessedInSynchronizedContextInspection.java @@ -24,21 +24,25 @@ import org.jetbrains.annotations.NotNull; public class PublicFieldAccessedInSynchronizedContextInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("public.field.accessed.in.synchronized.context.display.name"); } + @Override @NotNull public String getID() { return "NonPrivateFieldAccessedInSynchronizedContext"; } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message("public.field.accessed.in.synchronized.context.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new PublicFieldAccessedInSynchronizedContextVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SignalWithoutCorrespondingAwaitInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SignalWithoutCorrespondingAwaitInspection.java index 10f8dcdf5557..2480af1bb384 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SignalWithoutCorrespondingAwaitInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SignalWithoutCorrespondingAwaitInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class SignalWithoutCorrespondingAwaitInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "signal.without.corresponding.await.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "signal.without.corresponding.await.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SignalWithoutCorrespondingAwaitVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SynchronizationOnLocalVariableOrMethodParameterInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SynchronizationOnLocalVariableOrMethodParameterInspection.java index 4d17db337536..973a25b97634 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SynchronizationOnLocalVariableOrMethodParameterInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SynchronizationOnLocalVariableOrMethodParameterInspection.java @@ -17,9 +17,9 @@ package com.siyeh.ig.threading; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; +import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; -import com.siyeh.InspectionGadgetsBundle; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -30,16 +30,19 @@ public class SynchronizationOnLocalVariableOrMethodParameterInspection extends B @SuppressWarnings({"PublicField"}) public boolean reportMethodParameters = true; + @Override @Nls @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("synchronization.on.local.variable.or.method.parameter.display.name"); } + @Override public boolean isEnabledByDefault() { return true; } + @Override @NotNull protected String buildErrorString(Object... infos) { final Boolean localVariable = (Boolean)infos[0]; @@ -51,12 +54,14 @@ public class SynchronizationOnLocalVariableOrMethodParameterInspection extends B } } + @Override public BaseInspectionVisitor buildVisitor() { return new SynchronizationOnLocalVariableVisitor(); } private class SynchronizationOnLocalVariableVisitor extends BaseInspectionVisitor { + @Override public void visitSynchronizedStatement(PsiSynchronizedStatement statement) { super.visitSynchronizedStatement(statement); if (!reportLocalVariables && !reportMethodParameters) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SynchronizeOnThisInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SynchronizeOnThisInspection.java index 7108e10fff2f..cfda8e8b6c82 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SynchronizeOnThisInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SynchronizeOnThisInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class SynchronizeOnThisInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "synchronize.on.this.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "synchronize.on.this.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SynchronizeOnThisVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SystemRunFinalizersOnExitInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SystemRunFinalizersOnExitInspection.java index d6ffd7d5bd4c..c26cd8c03e90 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SystemRunFinalizersOnExitInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/SystemRunFinalizersOnExitInspection.java @@ -27,23 +27,27 @@ import org.jetbrains.annotations.NotNull; public class SystemRunFinalizersOnExitInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToSystemRunFinalizersOnExit"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "system.run.finalizers.on.exit.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "system.run.finalizers.on.exit.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new SystemRunFinalizersOnExitVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadPriorityInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadPriorityInspection.java index a6bf3c3891cf..956ba6fe5438 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadPriorityInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadPriorityInspection.java @@ -24,22 +24,26 @@ import org.jetbrains.annotations.NotNull; public class ThreadPriorityInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToThreadSetPriority"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("thread.priority.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "thread.priority.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ThreadSetPriorityVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadRunInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadRunInspection.java index 5856bbb42f83..47707b43fc8a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadRunInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadRunInspection.java @@ -55,6 +55,7 @@ public class ThreadRunInspection extends BaseInspection { private static class ThreadRunFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message( @@ -80,6 +81,7 @@ public class ThreadRunInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new ThreadRunVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadStopSuspendResumeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadStopSuspendResumeInspection.java index 324e545c0b72..38c2ce526516 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadStopSuspendResumeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadStopSuspendResumeInspection.java @@ -27,23 +27,27 @@ import org.jetbrains.annotations.NotNull; public class ThreadStopSuspendResumeInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToThreadStopSuspendOrResumeManager"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "thread.stop.suspend.resume.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "thread.stop.suspend.resume.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ThreadStopSuspendVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadWithDefaultRunMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadWithDefaultRunMethodInspection.java index 4f8d1e560d47..92e207373cac 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadWithDefaultRunMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadWithDefaultRunMethodInspection.java @@ -25,23 +25,27 @@ import org.jetbrains.annotations.NotNull; public class ThreadWithDefaultRunMethodInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "thread.with.default.run.method.display.name"); } + @Override @NotNull public String getID() { return "InstantiatingAThreadWithDefaultRunMethod"; } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "thread.with.default.run.method.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ThreadWithDefaultRunMethodVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadYieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadYieldInspection.java index 1f380ba2b12a..065a691f48bb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadYieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/ThreadYieldInspection.java @@ -27,22 +27,26 @@ import org.jetbrains.annotations.NotNull; public class ThreadYieldInspection extends BaseInspection { + @Override @NotNull public String getID() { return "CallToThreadYield"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("thread.yield.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "thread.yield.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ThreadYieldVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/UnconditionalWaitInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/UnconditionalWaitInspection.java index 2ad1fd2dcc69..7f64d655888d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/UnconditionalWaitInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/UnconditionalWaitInspection.java @@ -25,18 +25,21 @@ import org.jetbrains.annotations.NotNull; public class UnconditionalWaitInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "unconditional.wait.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "unconditional.wait.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new UnconditionalWaitVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/VolatileArrayFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/VolatileArrayFieldInspection.java index 9a27c236e99d..48964590d65e 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/VolatileArrayFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/VolatileArrayFieldInspection.java @@ -25,12 +25,14 @@ import org.jetbrains.annotations.NotNull; public class VolatileArrayFieldInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "volatile.array.field.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiType type = (PsiType)infos[0]; @@ -39,6 +41,7 @@ public class VolatileArrayFieldInspection extends BaseInspection { "volatile.field.problem.descriptor", typeString); } + @Override public BaseInspectionVisitor buildVisitor() { return new VolatileArrayFieldVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/VolatileLongOrDoubleFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/VolatileLongOrDoubleFieldInspection.java index faa43d16e0bd..266086306b99 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/VolatileLongOrDoubleFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/VolatileLongOrDoubleFieldInspection.java @@ -25,12 +25,14 @@ import org.jetbrains.annotations.NotNull; public class VolatileLongOrDoubleFieldInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "volatile.long.or.double.field.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiType type = (PsiType)infos[0]; @@ -39,6 +41,7 @@ public class VolatileLongOrDoubleFieldInspection extends BaseInspection { "volatile.field.problem.descriptor", typeString); } + @Override public BaseInspectionVisitor buildVisitor() { return new VolatileLongOrDoubleFieldVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitCalledOnConditionInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitCalledOnConditionInspection.java index 44a05541bac8..3efc381108d6 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitCalledOnConditionInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitCalledOnConditionInspection.java @@ -26,18 +26,21 @@ import org.jetbrains.annotations.NotNull; public class WaitCalledOnConditionInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "wait.called.on.condition.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "wait.called.on.condition.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new WaitCalledOnConditionVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitNotInLoopInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitNotInLoopInspection.java index aca556c1d339..229349d4367b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitNotInLoopInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitNotInLoopInspection.java @@ -26,17 +26,20 @@ import org.jetbrains.annotations.NotNull; public class WaitNotInLoopInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("wait.not.in.loop.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "wait.not.in.loop.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new WaitNotInLoopVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitOrAwaitWithoutTimeoutInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitOrAwaitWithoutTimeoutInspection.java index dfd48339f242..fed2fd21223a 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitOrAwaitWithoutTimeoutInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitOrAwaitWithoutTimeoutInspection.java @@ -23,18 +23,21 @@ import org.jetbrains.annotations.NotNull; public class WaitOrAwaitWithoutTimeoutInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "wait.or.await.without.timeout.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "wait.or.await.without.timeout.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new WaitWithoutTimeoutVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitWhileHoldingTwoLocksInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitWhileHoldingTwoLocksInspection.java index d61b913aba0d..f5625b5165be 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitWhileHoldingTwoLocksInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitWhileHoldingTwoLocksInspection.java @@ -25,18 +25,21 @@ import org.jetbrains.annotations.NotNull; public class WaitWhileHoldingTwoLocksInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "wait.while.holding.two.locks.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "wait.while.holding.two.locks.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new WaitWhileHoldingTwoLocksVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitWithoutCorrespondingNotifyInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitWithoutCorrespondingNotifyInspection.java index 322251e8689b..0cbb5f4a1dd8 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitWithoutCorrespondingNotifyInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/threading/WaitWithoutCorrespondingNotifyInspection.java @@ -24,18 +24,21 @@ import org.jetbrains.annotations.NotNull; public class WaitWithoutCorrespondingNotifyInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "wait.without.corresponding.notify.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "wait.without.corresponding.notify.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new WaitWithoutCorrespondingNotifyVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/ui/TextField.java b/plugins/InspectionGadgets/src/com/siyeh/ig/ui/TextField.java index 44655be6c292..47344f5cc861 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/ui/TextField.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/ui/TextField.java @@ -78,14 +78,17 @@ public class TextField extends JTextField { this.property = property; } + @Override public void insertUpdate(DocumentEvent documentEvent) { textChanged(); } + @Override public void removeUpdate(DocumentEvent documentEvent) { textChanged(); } + @Override public void changedUpdate(DocumentEvent documentEvent) { textChanged(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/AmbiguousFieldAccessInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/AmbiguousFieldAccessInspection.java index 8538178c465c..504f71dff0af 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/AmbiguousFieldAccessInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/AmbiguousFieldAccessInspection.java @@ -54,6 +54,7 @@ public class AmbiguousFieldAccessInspection extends BaseInspection { } } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { return new AmbiguousMethodCallFix(); @@ -61,11 +62,13 @@ public class AmbiguousFieldAccessInspection extends BaseInspection { private static class AmbiguousMethodCallFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("ambiguous.field.access.quickfix"); } + @Override protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement element = descriptor.getPsiElement(); if (!(element instanceof PsiReferenceExpression)) { diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/AmbiguousMethodCallInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/AmbiguousMethodCallInspection.java index 5ed8ce043830..5e072c3eb740 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/AmbiguousMethodCallInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/AmbiguousMethodCallInspection.java @@ -15,25 +15,27 @@ */ package com.siyeh.ig.visibility; +import com.intellij.codeInspection.ProblemDescriptor; +import com.intellij.openapi.project.Project; +import com.intellij.psi.*; +import com.intellij.util.IncorrectOperationException; +import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.psiutils.ClassUtils; -import com.siyeh.InspectionGadgetsBundle; -import com.intellij.psi.*; -import com.intellij.openapi.project.Project; -import com.intellij.codeInspection.ProblemDescriptor; -import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public class AmbiguousMethodCallInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("ambiguous.method.call.display.name"); } + @Override @NotNull protected String buildErrorString(Object... infos) { final PsiClass superClass = (PsiClass)infos[0]; @@ -41,6 +43,7 @@ public class AmbiguousMethodCallInspection extends BaseInspection { return InspectionGadgetsBundle.message("ambiguous.method.call.problem.descriptor", superClass.getName(), outerClass.getName()); } + @Override @Nullable protected InspectionGadgetsFix buildFix(Object... infos) { return new AmbiguousMethodCallFix(); @@ -48,11 +51,13 @@ public class AmbiguousMethodCallInspection extends BaseInspection { private static class AmbiguousMethodCallFix extends InspectionGadgetsFix { + @Override @NotNull public String getName() { return InspectionGadgetsBundle.message("ambiguous.method.call.quickfix"); } + @Override protected void doFix(Project project, ProblemDescriptor descriptor) throws IncorrectOperationException { final PsiElement element = descriptor.getPsiElement(); final PsiElement parent = element.getParent(); @@ -62,12 +67,14 @@ public class AmbiguousMethodCallInspection extends BaseInspection { } } + @Override public BaseInspectionVisitor buildVisitor() { return new AmbiguousMethodCallVisitor(); } private static class AmbiguousMethodCallVisitor extends BaseInspectionVisitor { + @Override public void visitMethodCallExpression(PsiMethodCallExpression expression) { super.visitMethodCallExpression(expression); final PsiReferenceExpression methodExpression = expression.getMethodExpression(); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/AnonymousClassVariableHidesContainingMethodVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/AnonymousClassVariableHidesContainingMethodVariableInspection.java index 25e05ab90887..724bf957ee5f 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/AnonymousClassVariableHidesContainingMethodVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/AnonymousClassVariableHidesContainingMethodVariableInspection.java @@ -27,12 +27,14 @@ import org.jetbrains.annotations.NotNull; public class AnonymousClassVariableHidesContainingMethodVariableInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "anonymous.class.variable.hides.containing.method.variable.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { final Object info = infos[0]; @@ -48,14 +50,17 @@ public class AnonymousClassVariableHidesContainingMethodVariableInspection "anonymous.class.variable.hides.containing.method.variable.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new AnonymousClassVariableHidesOuterClassVariableVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/ClassEscapesItsScopeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/ClassEscapesItsScopeInspection.java index 9244c27b5ffb..66e8945f62e2 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/ClassEscapesItsScopeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/ClassEscapesItsScopeInspection.java @@ -23,23 +23,27 @@ import org.jetbrains.annotations.NotNull; public class ClassEscapesItsScopeInspection extends BaseInspection { + @Override @NotNull public String getID() { return "ClassEscapesDefinedScope"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "class.escapes.defined.scope.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "class.escapes.defined.scope.problem.descriptor"); } + @Override public BaseInspectionVisitor buildVisitor() { return new ClassEscapesItsScopeVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/FieldHidesSuperclassFieldInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/FieldHidesSuperclassFieldInspection.java index 48e492d1832c..f1de8aa32e43 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/FieldHidesSuperclassFieldInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/FieldHidesSuperclassFieldInspection.java @@ -15,9 +15,9 @@ */ package com.siyeh.ig.visibility; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiField; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.siyeh.HardcodedMethodConstants; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; @@ -38,37 +38,44 @@ public class FieldHidesSuperclassFieldInspection extends BaseInspection { */ public boolean m_ignoreInvisibleFields = true; + @Override @NotNull public String getID() { return "FieldNameHidesFieldInSuperclass"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "field.name.hides.in.superclass.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "field.name.hides.in.superclass.problem.descriptor"); } + @Override public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message( "field.name.hides.in.superclass.ignore.option"), this, "m_ignoreInvisibleFields"); } + @Override public BaseInspectionVisitor buildVisitor() { return new FieldHidesSuperclassFieldVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/InnerClassVariableHidesOuterClassVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/InnerClassVariableHidesOuterClassVariableInspection.java index 4809de98ca74..7ee55fdf55ac 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/InnerClassVariableHidesOuterClassVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/InnerClassVariableHidesOuterClassVariableInspection.java @@ -15,6 +15,7 @@ */ package com.siyeh.ig.visibility; +import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import com.intellij.psi.PsiClass; import com.intellij.psi.PsiField; import com.intellij.psi.PsiModifier; @@ -25,7 +26,6 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.fixes.RenameFix; import com.siyeh.ig.psiutils.ClassUtils; -import com.intellij.codeInspection.ui.SingleCheckboxOptionsPanel; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -38,37 +38,44 @@ public class InnerClassVariableHidesOuterClassVariableInspection */ public boolean m_ignoreInvisibleFields = true; + @Override @NotNull public String getID() { return "InnerClassFieldHidesOuterClassField"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "inner.class.field.hides.outer.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "inner.class.field.hides.outer.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override public JComponent createOptionsPanel() { return new SingleCheckboxOptionsPanel(InspectionGadgetsBundle.message( "inner.class.field.hides.outer.ignore.option"), this, "m_ignoreInvisibleFields"); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new InnerClassVariableHidesOuterClassVariableVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/LocalVariableHidingMemberVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/LocalVariableHidingMemberVariableInspection.java index 68b0ce5a49b6..125d0702d2c7 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/LocalVariableHidingMemberVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/LocalVariableHidingMemberVariableInspection.java @@ -15,6 +15,7 @@ */ package com.siyeh.ig.visibility; +import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel; import com.intellij.psi.*; import com.intellij.psi.util.PsiTreeUtil; import com.siyeh.InspectionGadgetsBundle; @@ -23,7 +24,6 @@ import com.siyeh.ig.BaseInspectionVisitor; import com.siyeh.ig.InspectionGadgetsFix; import com.siyeh.ig.fixes.RenameFix; import com.siyeh.ig.psiutils.ClassUtils; -import com.intellij.codeInspection.ui.MultipleCheckboxOptionsPanel; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -37,30 +37,36 @@ public class LocalVariableHidingMemberVariableInspection extends BaseInspection @SuppressWarnings("PublicField") public boolean m_ignoreStaticMethods = true; + @Override @NotNull public String getID() { return "LocalVariableHidesMemberVariable"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("local.variable.hides.member.variable.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiClass aClass = (PsiClass)infos[0]; return InspectionGadgetsBundle.message("local.variable.hides.member.variable.problem.descriptor", aClass.getName()); } + @Override public JComponent createOptionsPanel() { final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this); optionsPanel.addCheckbox(InspectionGadgetsBundle.message("field.name.hides.in.superclass.ignore.option"), "m_ignoreInvisibleFields"); @@ -68,6 +74,7 @@ public class LocalVariableHidingMemberVariableInspection extends BaseInspection return optionsPanel; } + @Override public BaseInspectionVisitor buildVisitor() { return new LocalVariableHidingMemberVariableVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesPackageLocalMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesPackageLocalMethodInspection.java index 79ebd713daed..7e4f4b5a186d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesPackageLocalMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesPackageLocalMethodInspection.java @@ -15,7 +15,10 @@ */ package com.siyeh.ig.visibility; -import com.intellij.psi.*; +import com.intellij.psi.PsiClass; +import com.intellij.psi.PsiJavaFile; +import com.intellij.psi.PsiMethod; +import com.intellij.psi.PsiModifier; import com.intellij.psi.util.PsiTreeUtil; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.BaseInspection; @@ -30,31 +33,37 @@ import java.util.Set; public class MethodOverridesPackageLocalMethodInspection extends BaseInspection { + @Override @NotNull public String getID() { return "MethodOverridesPrivateMethodOfSuperclass"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "method.overrides.package.local.method.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "method.overrides.package.local.method.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new MethodOverridesPrivateMethodVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspection.java index d235f804d7b6..1cfd2dad4bdb 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesPrivateMethodInspection.java @@ -30,31 +30,37 @@ import java.util.Set; public class MethodOverridesPrivateMethodInspection extends BaseInspection { + @Override @NotNull public String getID() { return "MethodOverridesPrivateMethodOfSuperclass"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "method.overrides.private.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "method.overrides.private.display.name.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new MethodOverridesPrivateMethodVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesStaticMethodInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesStaticMethodInspection.java index 6652d6560a5a..241423c0370b 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesStaticMethodInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/MethodOverridesStaticMethodInspection.java @@ -32,31 +32,37 @@ import java.util.Set; public class MethodOverridesStaticMethodInspection extends BaseInspection { + @Override @NotNull public String getID() { return "MethodOverridesStaticMethodOfSuperclass"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "method.overrides.static.display.name"); } + @Override @NotNull public String buildErrorString(Object... infos) { return InspectionGadgetsBundle.message( "method.overrides.static.problem.descriptor"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override public BaseInspectionVisitor buildVisitor() { return new MethodOverridesStaticMethodVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/ParameterHidingMemberVariableInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/ParameterHidingMemberVariableInspection.java index 113794cfd4a0..0d376d06804d 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/ParameterHidingMemberVariableInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/ParameterHidingMemberVariableInspection.java @@ -46,30 +46,36 @@ public class ParameterHidingMemberVariableInspection extends BaseInspection { @SuppressWarnings("PublicField") public boolean m_ignoreForAbstractMethods = false; + @Override @NotNull public String getID() { return "ParameterHidesMemberVariable"; } + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message("parameter.hides.member.variable.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiClass aClass = (PsiClass)infos[0]; return InspectionGadgetsBundle.message("parameter.hides.member.variable.problem.descriptor", aClass.getName()); } + @Override public JComponent createOptionsPanel() { final MultipleCheckboxOptionsPanel optionsPanel = new MultipleCheckboxOptionsPanel(this); optionsPanel.addCheckbox(InspectionGadgetsBundle.message("parameter.hides.member.variable.ignore.setters.option"), @@ -85,6 +91,7 @@ public class ParameterHidingMemberVariableInspection extends BaseInspection { return optionsPanel; } + @Override public BaseInspectionVisitor buildVisitor() { return new ParameterHidingMemberVariableVisitor(); } diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/TypeParameterHidesVisibleTypeInspection.java b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/TypeParameterHidesVisibleTypeInspection.java index 78ddfe837114..e8e4a5662a06 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/TypeParameterHidesVisibleTypeInspection.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/visibility/TypeParameterHidesVisibleTypeInspection.java @@ -25,20 +25,24 @@ import org.jetbrains.annotations.NotNull; public class TypeParameterHidesVisibleTypeInspection extends BaseInspection { + @Override @NotNull public String getDisplayName() { return InspectionGadgetsBundle.message( "type.parameter.hides.visible.type.display.name"); } + @Override protected InspectionGadgetsFix buildFix(Object... infos) { return new RenameFix(); } + @Override protected boolean buildQuickFixesOnlyForOnTheFlyErrors() { return true; } + @Override @NotNull public String buildErrorString(Object... infos) { final PsiClass aClass = (PsiClass)infos[0]; @@ -47,6 +51,7 @@ public class TypeParameterHidesVisibleTypeInspection extends BaseInspection { aClass.getQualifiedName()); } + @Override public BaseInspectionVisitor buildVisitor() { return new TypeParameterHidesVisibleTypeVisitor(); }