Merge remote-tracking branch 'origin/master' into IDEA-CR-10038
authorVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 29 Apr 2016 10:54:16 +0000 (12:54 +0200)
committerVladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Fri, 29 Apr 2016 10:54:16 +0000 (12:54 +0200)
540 files changed:
build/scripts/unpackJdks.gant
build/scripts/utils.gant
java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
java/compiler/impl/src/com/intellij/compiler/impl/packagingCompiler/IgnoredFileFilter.java
java/compiler/impl/src/com/intellij/openapi/projectRoots/impl/MockJdkWrapper.java
java/compiler/impl/src/com/intellij/packaging/impl/ui/actions/PackageFileAction.java
java/compiler/openapi/src/com/intellij/openapi/compiler/options/ExcludeEntryDescription.java
java/debugger/impl/src/com/intellij/debugger/actions/ExportThreadsAction.java
java/debugger/impl/src/com/intellij/debugger/actions/ThreadDumpAction.java
java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/ArrayInitializerEvaluator.java
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewArrayInstanceEvaluator.java
java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewClassInstanceEvaluator.java
java/debugger/impl/src/com/intellij/debugger/jdi/Bytecodes.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointPropertiesPanel.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FilteredRequestorImpl.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointPropertiesPanel.java
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/SourceRootFinder.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CastMethodArgumentFix.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ConstructorParametersFixer.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifySuperArgumentFix.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisArgumentFix.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/QualifyThisOrSuperArgumentFix.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SimplifyBooleanExpressionFix.java
java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/VariableArrayTypeFix.java
java/java-analysis-impl/src/com/intellij/codeInspection/RedundantSuppressInspectionBase.java
java/java-analysis-impl/src/com/intellij/codeInspection/StreamApiMigrationInspection.java
java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Analysis.java
java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Contracts.java
java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/NullableMethodAnalysis.java
java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Parameters.java
java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/asm/LeakingParameters.java
java/java-analysis-impl/src/com/intellij/codeInspection/canBeFinal/CanBeFinalInspection.java
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/ContractInference.java
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/DataFlowInspectionBase.java
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/NullityInference.java
java/java-analysis-impl/src/com/intellij/codeInspection/dataFlow/PurityInference.java
java/java-analysis-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspectionBase.java
java/java-analysis-impl/src/com/intellij/codeInspection/defUse/DefUseInspectionBase.java
java/java-analysis-impl/src/com/intellij/codeInspection/deprecation/DeprecationInspection.java
java/java-analysis-impl/src/com/intellij/codeInspection/duplicateThrows/DuplicateThrowsInspection.java
java/java-analysis-impl/src/com/intellij/codeInspection/ex/EntryPointsManagerBase.java
java/java-analysis-impl/src/com/intellij/codeInspection/inheritance/search/InheritorsStatisticalDataSearch.java
java/java-analysis-impl/src/com/intellij/codeInspection/java15api/Java15APIUsageInspectionBase.java
java/java-analysis-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspectionBase.java
java/java-analysis-impl/src/com/intellij/codeInspection/nullable/NullableStuffInspectionBase.java
java/java-analysis-impl/src/com/intellij/codeInspection/redundantCast/RedundantCastInspection.java
java/java-analysis-impl/src/com/intellij/codeInspection/uncheckedWarnings/UncheckedWarningLocalInspectionBase.java
java/java-analysis-impl/src/com/intellij/codeInspection/visibility/VisibilityInspection.java
java/java-analysis-impl/src/com/intellij/find/findUsages/JavaClassFindUsagesOptions.java
java/java-analysis-impl/src/com/intellij/find/findUsages/JavaFindUsagesOptions.java
java/java-analysis-impl/src/com/intellij/find/findUsages/JavaMethodFindUsagesOptions.java
java/java-analysis-impl/src/com/intellij/find/findUsages/JavaPackageFindUsagesOptions.java
java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/InputVariables.java
java/java-analysis-impl/src/com/intellij/refactoring/extractMethod/ParametersFolder.java
java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesFinder.java
java/java-analysis-impl/src/com/intellij/refactoring/util/duplicates/Match.java
java/java-analysis-impl/src/org/jetbrains/java/generate/config/Config.java
java/java-analysis-impl/src/org/jetbrains/java/generate/config/FilterPattern.java
java/java-analysis-impl/src/org/jetbrains/java/generate/inspection/ClassHasNoToStringMethodInspection.java
java/java-impl/src/com/intellij/codeEditor/printing/HyperlinksToClassesOption.java
java/java-impl/src/com/intellij/codeInsight/completion/AllClassesGetter.java
java/java-impl/src/com/intellij/codeInsight/completion/MemberLookupHelper.java
java/java-impl/src/com/intellij/codeInsight/completion/StaticMemberProcessor.java
java/java-impl/src/com/intellij/codeInsight/completion/scope/JavaCompletionProcessor.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/AddMethodQualifierFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeExtendsToImplementsFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeMethodSignatureFromUsageFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/ChangeParameterClassFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/CreateConstructorParameterFromFieldFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DeferFinalAssignmentFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/InsertNewFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SurroundWithTryCatchFix.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/SwitchStatementBranch.java
java/java-impl/src/com/intellij/codeInsight/editorActions/AutoFormatTypedHandler.java
java/java-impl/src/com/intellij/codeInsight/editorActions/moveUpDown/DeclarationMover.java
java/java-impl/src/com/intellij/codeInsight/generation/GenerateDelegateHandler.java
java/java-impl/src/com/intellij/codeInsight/generation/GenerateEqualsHandler.java
java/java-impl/src/com/intellij/codeInsight/generation/GenerateMembersHandlerBase.java
java/java-impl/src/com/intellij/codeInsight/generation/actions/GenerateSuperMethodCallHandler.java
java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaExpressionSurroundDescriptor.java
java/java-impl/src/com/intellij/codeInsight/generation/surroundWith/JavaWithTryCatchSurrounder.java
java/java-impl/src/com/intellij/codeInsight/highlighting/HighlightImportedElementsHandler.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/AddOnDemandStaticImportAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/DeannotateIntentionAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/ReplaceCastWithVariableAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/SimplifyBooleanExpressionAction.java
java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationPresentation.java
java/java-impl/src/com/intellij/codeInspection/inferNullity/InferNullityAnnotationsAction.java
java/java-impl/src/com/intellij/codeInspection/magicConstant/MagicConstantInspection.java
java/java-impl/src/com/intellij/codeInspection/unusedReturnValue/UnusedReturnValue.java
java/java-impl/src/com/intellij/cyclicDependencies/CyclicDependenciesBuilder.java
java/java-impl/src/com/intellij/cyclicDependencies/CyclicDependenciesUtil.java
java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java
java/java-impl/src/com/intellij/ide/util/treeView/TreeViewUtil.java
java/java-impl/src/com/intellij/internal/DupIconsFinder.java
java/java-impl/src/com/intellij/internal/statistic/libraryJar/LibraryJarDescriptors.java
java/java-impl/src/com/intellij/internal/statistic/libraryJar/LibraryJarUsagesCollector.java
java/java-impl/src/com/intellij/javadoc/EnterInJavadocParamDescriptionHandler.java
java/java-impl/src/com/intellij/javadoc/JavadocConfiguration.java
java/java-impl/src/com/intellij/lang/java/JavaImportOptimizer.java
java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java
java/java-impl/src/com/intellij/psi/AbstractQualifiedReference.java
java/java-impl/src/com/intellij/psi/codeStyle/JavaCodeStyleSettings.java
java/java-impl/src/com/intellij/psi/filters/types/AssignableFromFilter.java
java/java-impl/src/com/intellij/psi/formatter/java/AbstractJavaBlock.java
java/java-impl/src/com/intellij/psi/formatter/java/SyntheticCodeBlock.java
java/java-impl/src/com/intellij/psi/impl/cache/SmartIntToIntArrayMap.java
java/java-impl/src/com/intellij/psi/impl/migration/PsiMigrationManager.java
java/java-impl/src/com/intellij/psi/impl/source/PsiCodeFragmentImpl.java
java/java-impl/src/com/intellij/psi/impl/source/codeStyle/javadoc/JDComment.java
java/java-impl/src/com/intellij/psi/stubsHierarchy/impl/SingleClassHierarchyBuilder.java
java/java-impl/src/com/intellij/refactoring/JavaRefactoringSettings.java
java/java-impl/src/com/intellij/refactoring/anonymousToInner/AnonymousToInnerHandler.java
java/java-impl/src/com/intellij/refactoring/anonymousToInner/VariableInfo.java
java/java-impl/src/com/intellij/refactoring/changeSignature/ChangeSignatureViewDescriptor.java
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeInfoImpl.java
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaChangeSignatureUsageProcessor.java
java/java-impl/src/com/intellij/refactoring/changeSignature/JavaParameterInfo.java
java/java-impl/src/com/intellij/refactoring/changeSignature/MethodReferenceUsageInfo.java
java/java-impl/src/com/intellij/refactoring/changeSignature/ParameterInfoImpl.java
java/java-impl/src/com/intellij/refactoring/extractMethod/ExtractMethodProcessor.java
java/java-impl/src/com/intellij/refactoring/extractMethodObject/ExtractMethodObjectProcessor.java
java/java-impl/src/com/intellij/refactoring/extractSuperclass/ExtractSuperclassHandler.java
java/java-impl/src/com/intellij/refactoring/extractclass/BackpointerUsageVisitor.java
java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java
java/java-impl/src/com/intellij/refactoring/extractclass/ExtractedClassBuilder.java
java/java-impl/src/com/intellij/refactoring/introduceField/IntroduceConstantHandler.java
java/java-impl/src/com/intellij/refactoring/introduceParameter/EnclosingMethodSelectionDialog.java
java/java-impl/src/com/intellij/refactoring/introduceParameter/InplaceIntroduceParameterUI.java
java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java
java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterProcessor.java
java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterSettingsUI.java
java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableDialog.java
java/java-impl/src/com/intellij/refactoring/introduceVariable/IntroduceVariableSettings.java
java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectClassDescriptor.java
java/java-impl/src/com/intellij/refactoring/introduceparameterobject/JavaIntroduceParameterObjectDelegate.java
java/java-impl/src/com/intellij/refactoring/introduceparameterobject/ParameterObjectBuilder.java
java/java-impl/src/com/intellij/refactoring/memberPullUp/JavaPullUpHelper.java
java/java-impl/src/com/intellij/refactoring/memberPullUp/PullUpProcessor.java
java/java-impl/src/com/intellij/refactoring/migration/MigrationMapSet.java
java/java-impl/src/com/intellij/refactoring/migration/MigrationUsagesViewDescriptor.java
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/AutocreatingSingleSourceRootMoveDestination.java
java/java-impl/src/com/intellij/refactoring/move/moveClassesOrPackages/MoveClassesOrPackagesImpl.java
java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerDialog.java
java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerImpl.java
java/java-impl/src/com/intellij/refactoring/move/moveInner/MoveInnerViewDescriptor.java
java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersDialog.java
java/java-impl/src/com/intellij/refactoring/move/moveMembers/MoveMembersImpl.java
java/java-impl/src/com/intellij/refactoring/psi/ArrayIterator.java
java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticUsageRenamer.java
java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java
java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperHandler.java
java/java-impl/src/com/intellij/refactoring/typeCook/deductive/PsiTypeVariableFactory.java
java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/BindingFactory.java
java/java-impl/src/com/intellij/refactoring/typeCook/deductive/resolver/ResolverTree.java
java/java-impl/src/com/intellij/refactoring/typeMigration/TypeMigrationLabeler.java
java/java-impl/src/com/intellij/refactoring/ui/YesNoPreviewUsagesDialog.java
java/java-impl/src/com/intellij/refactoring/util/ConflictsUtil.java
java/java-impl/src/com/intellij/refactoring/util/RefactoringUtil.java
java/java-impl/src/com/intellij/refactoring/util/classMembers/ElementNeedsThis.java
java/java-impl/src/com/intellij/refactoring/util/classMembers/InterfaceMemberDependencyGraph.java
java/java-impl/src/com/intellij/refactoring/util/classRefs/ClassReferenceScanner.java
java/java-impl/src/com/intellij/refactoring/util/duplicates/MethodDuplicatesHandler.java
java/java-impl/src/com/intellij/refactoring/util/occurrences/BaseOccurrenceManager.java
java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/ReturnValueBeanBuilder.java
java/java-impl/src/com/intellij/slicer/SliceNullnessAnalyzer.java
java/java-impl/src/com/intellij/unscramble/ThreadState.java
java/java-impl/src/com/intellij/unscramble/UnscrambleListener.java
java/java-indexing-api/src/com/intellij/psi/search/searches/ClassInheritorsSearch.java
java/java-indexing-impl/src/com/intellij/codeInsight/ReadableExternalAnnotationsManager.java
java/java-indexing-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java
java/java-indexing-impl/src/com/intellij/psi/impl/search/AllClassesSearchExecutor.java
java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
java/java-psi-api/src/com/intellij/codeInsight/ClassUtil.java
java/java-psi-api/src/com/intellij/ide/util/JavaAnonymousClassesHelper.java
java/java-psi-api/src/com/intellij/psi/PsiDiamondType.java
java/java-psi-api/src/com/intellij/psi/infos/MethodCandidateInfo.java
java/java-psi-api/src/com/intellij/psi/util/ClassUtil.java
java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocUtil.java
java/java-psi-impl/src/com/intellij/psi/PsiDiamondTypeImpl.java
java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeEx.java
java/java-psi-impl/src/com/intellij/psi/impl/JavaPsiFacadeImpl.java
java/java-psi-impl/src/com/intellij/refactoring/util/CanonicalTypes.java
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/changeSignature/AddExceptionToCatchInOneLineLambda.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/changeSignature/AddExceptionToCatchInOneLineLambda_after.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/changeSignature/AddUncheckedExceptionInMethodRef.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/changeSignature/AddUncheckedExceptionInMethodRef_after.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/daemonCodeAnalyzer/lambda/expressions/ObjectOverloadsWithDiamondsOverMultipleConstructors.java [new file with mode: 0644]
java/java-tests/testData/codeInsight/javadocIG/documentationForJdkClassWhenExternalDocIsNotAvailable.html
java/java-tests/testData/codeInsight/javadocIG/documentationForJdkClassWithReferencesToClassesFromJavaLang.html [new file with mode: 0644]
java/java-tests/testData/codeInsight/javadocIG/documentationForJdkClassWithReferencesToClassesFromJavaLang.java [new file with mode: 0644]
java/java-tests/testData/inspection/magic/withLibrary/expected.xml [new file with mode: 0644]
java/java-tests/testData/inspection/magic/withLibrary/src/X.java [moved from platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/TornLineParams.java with 62% similarity]
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/ChangeSignatureTouchLambdaTest.java
java/java-tests/testSrc/com/intellij/codeInsight/daemon/lambda/Java8ExpressionsCheckTest.java
java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
java/java-tests/testSrc/com/intellij/codeInspection/MagicConstantInspectionTest.java
java/java-tests/testSrc/com/intellij/codeInspection/NullableStuffInspectionAncientTest.java
java/java-tests/testSrc/com/intellij/codeInspection/TestOnlyInspectionTest.java
java/java-tests/testSrc/com/intellij/codeInspection/UnknownGuardInspectionTest.java
java/java-tests/testSrc/com/intellij/codeInspection/UnusedLibraryInspectionTest.java
java/java-tests/testSrc/com/intellij/psi/ModifyAnnotationsTest.java
java/java-tests/testSrc/com/intellij/psi/PsiModificationTrackerTest.java
java/java-tests/testSrc/com/intellij/psi/Src15RepositoryUseTest.java
java/java-tests/testSrc/com/intellij/psi/SrcRepositoryUseTest.java
java/java-tests/testSrc/com/intellij/psi/search/ClassInheritorsTest.java [new file with mode: 0644]
java/java-tests/testSrc/com/intellij/refactoring/MakeClassStaticTest.java
java/java-tests/testSrc/com/intellij/refactoring/MoveClassAndFileTest.java
java/testFramework/src/com/intellij/codeInsight/daemon/DaemonAnalyzerTestCase.java
java/testFramework/src/com/intellij/codeInsight/daemon/LightDaemonAnalyzerTestCase.java
java/testFramework/src/com/intellij/testFramework/InspectionTestCase.java
java/testFramework/src/com/intellij/testFramework/fixtures/JavaCodeInsightFixtureTestCase.java
platform/analysis-api/src/com/intellij/codeInspection/InspectionManager.java
platform/analysis-api/src/com/intellij/codeInspection/ProblemHighlightType.java
platform/analysis-api/src/com/intellij/profile/Profile.java
platform/boot/src/com/intellij/lang/properties/charset/Native2AsciiCharsetDecoder.java
platform/boot/src/com/intellij/lang/properties/charset/Native2AsciiCharsetEncoder.java
platform/built-in-server-api/src/org/jetbrains/ide/BinaryRequestHandler.java
platform/built-in-server/src/org/jetbrains/ide/RestService.java
platform/core-api/src/com/intellij/ide/util/PropertiesComponent.java
platform/core-api/src/com/intellij/openapi/components/RoamingType.java
platform/core-api/src/com/intellij/openapi/options/SchemeProcessor.java
platform/core-api/src/com/intellij/openapi/util/ActionCallback.java
platform/core-api/src/com/intellij/openapi/util/AsyncResult.java
platform/core-api/src/com/intellij/psi/PsiTreeChangeEvent.java
platform/core-impl/src/com/intellij/extapi/psi/ASTDelegatePsiElement.java
platform/core-impl/src/com/intellij/extapi/psi/StubBasedPsiElementBase.java
platform/core-impl/src/com/intellij/lang/impl/PsiBuilderImpl.java
platform/core-impl/src/com/intellij/psi/impl/PsiManagerEx.java
platform/core-impl/src/com/intellij/psi/impl/PsiManagerImpl.java
platform/core-impl/src/com/intellij/psi/impl/smartPointers/SmartPsiElementPointerImpl.java
platform/core-impl/src/com/intellij/psi/impl/source/tree/TreeElement.java
platform/diff-api/src/com/intellij/ide/diff/DirDiffSettings.java
platform/diff-impl/src/com/intellij/diff/DiffManagerImpl.java
platform/diff-impl/src/com/intellij/diff/DiffRequestFactoryImpl.java
platform/diff-impl/src/com/intellij/diff/actions/AllLinesIterator.java [new file with mode: 0644]
platform/diff-impl/src/com/intellij/diff/actions/BufferedLineIterator.java
platform/diff-impl/src/com/intellij/diff/actions/DocumentsSynchronizer.java
platform/diff-impl/src/com/intellij/diff/actions/impl/GoToChangePopupBuilder.java
platform/diff-impl/src/com/intellij/diff/actions/impl/SetEditorSettingsAction.java
platform/diff-impl/src/com/intellij/diff/applications/ApplicationStarterBase.java
platform/diff-impl/src/com/intellij/diff/comparison/ByChar.java
platform/diff-impl/src/com/intellij/diff/comparison/ByLine.java
platform/diff-impl/src/com/intellij/diff/comparison/ByWord.java
platform/diff-impl/src/com/intellij/diff/comparison/ChunkOptimizer.java
platform/diff-impl/src/com/intellij/diff/comparison/ComparisonManagerImpl.java
platform/diff-impl/src/com/intellij/diff/comparison/ComparisonMergeUtil.java
platform/diff-impl/src/com/intellij/diff/comparison/LineFragmentSplitter.java
platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableBase.java
platform/diff-impl/src/com/intellij/diff/comparison/iterables/DiffIterableUtil.java
platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestChainProcessor.java
platform/diff-impl/src/com/intellij/diff/impl/CacheDiffRequestProcessor.java
platform/diff-impl/src/com/intellij/diff/impl/DiffRequestPanelImpl.java
platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java
platform/diff-impl/src/com/intellij/diff/impl/DiffSettingsHolder.java
platform/diff-impl/src/com/intellij/diff/impl/DiffWindowBase.java
platform/diff-impl/src/com/intellij/diff/merge/BinaryMergeTool.java
platform/diff-impl/src/com/intellij/diff/merge/MergeRequestProcessor.java
platform/diff-impl/src/com/intellij/diff/merge/MergeUtil.java
platform/diff-impl/src/com/intellij/diff/merge/TextMergeChange.java
platform/diff-impl/src/com/intellij/diff/merge/TextMergeViewer.java
platform/diff-impl/src/com/intellij/diff/requests/TextMergeRequestImpl.java
platform/diff-impl/src/com/intellij/diff/requests/UnknownFileTypeDiffRequest.java
platform/diff-impl/src/com/intellij/diff/settings/DiffSettingsPanel.java
platform/diff-impl/src/com/intellij/diff/settings/ExternalDiffSettingsPanel.java
platform/diff-impl/src/com/intellij/diff/tools/ErrorDiffTool.java
platform/diff-impl/src/com/intellij/diff/tools/binary/OnesideBinaryDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/binary/ThreesideBinaryDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/binary/TwosideBinaryDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/dir/DirDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffTool.java
platform/diff-impl/src/com/intellij/diff/tools/external/ExternalDiffToolUtil.java
platform/diff-impl/src/com/intellij/diff/tools/fragmented/LineNumberConvertor.java
platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffChange.java
platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedEditorHighlighter.java
platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedEditorRangeHighlighter.java
platform/diff-impl/src/com/intellij/diff/tools/fragmented/UnifiedFragmentBuilder.java
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffChange.java
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleOnesideDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/simple/SimpleThreesideDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideDiffChangeBase.java
platform/diff-impl/src/com/intellij/diff/tools/simple/ThreesideTextDiffViewerEx.java
platform/diff-impl/src/com/intellij/diff/tools/util/DiffNotifications.java
platform/diff-impl/src/com/intellij/diff/tools/util/FoldingModelSupport.java
platform/diff-impl/src/com/intellij/diff/tools/util/KeyboardModifierListener.java
platform/diff-impl/src/com/intellij/diff/tools/util/SoftHardCacheMap.java
platform/diff-impl/src/com/intellij/diff/tools/util/SyncScrollSupport.java
platform/diff-impl/src/com/intellij/diff/tools/util/TransferableFileEditorStateSupport.java
platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffPanelBase.java
platform/diff-impl/src/com/intellij/diff/tools/util/base/DiffViewerBase.java
platform/diff-impl/src/com/intellij/diff/tools/util/base/HighlightingLevel.java
platform/diff-impl/src/com/intellij/diff/tools/util/base/ListenerDiffViewerBase.java
platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffSettingsHolder.java
platform/diff-impl/src/com/intellij/diff/tools/util/base/TextDiffViewerUtil.java
platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideContentPanel.java
platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/util/side/ThreesideTextDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/util/side/TwosideDiffViewer.java
platform/diff-impl/src/com/intellij/diff/tools/util/side/TwosideTextDiffViewer.java
platform/diff-impl/src/com/intellij/diff/util/DiffDividerDrawUtil.java
platform/diff-impl/src/com/intellij/diff/util/DiffUtil.java
platform/diff-impl/src/com/intellij/diff/util/TextDiffTypeFactory.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DTree.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffPanel.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffTableModel.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/ChangeCompareModeGroup.java
platform/diff-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffToolbarActions.java
platform/dvcs-impl/src/com/intellij/dvcs/push/ui/PushLog.java
platform/editor-ui-api/src/com/intellij/ide/ui/UISettingsListener.java
platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/AbstractColorsScheme.java
platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/DefaultColorsScheme.java
platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImpl.java
platform/indexing-api/src/com/intellij/psi/search/SearchRequestCollector.java
platform/lang-api/src/com/intellij/execution/runners/GenericProgramRunner.java
platform/lang-api/src/com/intellij/facet/FacetTypeId.java
platform/lang-api/src/com/intellij/ide/util/frameworkSupport/FrameworkRole.java
platform/lang-api/src/com/intellij/openapi/module/ModuleUtil.java
platform/lang-api/src/com/intellij/openapi/project/ProjectUtil.java
platform/lang-api/src/com/intellij/refactoring/rename/RenameInputValidatorRegistry.java
platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java
platform/lang-impl/src/com/intellij/application/options/colors/ClickNavigator.java
platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java
platform/lang-impl/src/com/intellij/application/options/colors/TailPanel.java
platform/lang-impl/src/com/intellij/application/options/colors/TextAttributesDescription.java
platform/lang-impl/src/com/intellij/application/options/colors/highlighting/HighlightData.java
platform/lang-impl/src/com/intellij/application/options/colors/highlighting/HighlightsExtractor.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfoComposite.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/analysis/DefaultHighlightingSettingProvider.java
platform/lang-impl/src/com/intellij/codeInsight/documentation/AbstractExternalFilter.java
platform/lang-impl/src/com/intellij/codeInsight/documentation/QuickDocOnMouseOverManager.java
platform/lang-impl/src/com/intellij/codeInsight/editorActions/moveUpDown/MoveStatementHandler.java
platform/lang-impl/src/com/intellij/codeInsight/generation/CommentByBlockCommentHandler.java
platform/lang-impl/src/com/intellij/codeInsight/highlighting/HighlightUsagesHandler.java
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionActionMetaData.java
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionDescriptionPanel.java
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsTree.java
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionUsagePanel.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/TableMap.java
platform/lang-impl/src/com/intellij/codeInsight/template/postfix/completion/PostfixTemplatesCompletionProvider.java
platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java
platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionRVContentProviderImpl.java
platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java
platform/lang-impl/src/com/intellij/codeInspection/offlineViewer/OfflineInspectionRVContentProvider.java
platform/lang-impl/src/com/intellij/codeInspection/ui/DefaultInspectionToolPresentation.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsViewUtil.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionToolPresentation.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTreeCellRenderer.java
platform/lang-impl/src/com/intellij/diagnostic/logging/DebuggerLogConsoleManager.java
platform/lang-impl/src/com/intellij/execution/TerminateRemoteProcessDialog.java
platform/lang-impl/src/com/intellij/execution/impl/MyDiffContainer.java
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationBeforeRunProvider.java
platform/lang-impl/src/com/intellij/find/findUsages/FindUsagesManager.java
platform/lang-impl/src/com/intellij/ide/actions/TogglePopupHintsAction.java
platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/BookmarksAction.java
platform/lang-impl/src/com/intellij/ide/fileTemplates/FileTemplateManager.java
platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesOutsideGroupAction.java
platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesToGroupAction.java
platform/lang-impl/src/com/intellij/ide/projectView/actions/MoveModulesToSubGroupAction.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPSIPane.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/AbstractProjectViewPane.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/ModuleGroup.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroup.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/MoveModuleToGroupTopLevel.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewPane.java
platform/lang-impl/src/com/intellij/ide/structureView/newStructureView/StructureTreeBuilder.java
platform/lang-impl/src/com/intellij/ide/todo/AllTodosTreeBuilder.java
platform/lang-impl/src/com/intellij/ide/todo/ChangeListTodosTreeBuilder.java
platform/lang-impl/src/com/intellij/ide/todo/ScopeBasedTodosTreeBuilder.java
platform/lang-impl/src/com/intellij/ide/todo/TodoFileDirAndModuleComparator.java
platform/lang-impl/src/com/intellij/internal/psiView/ViewerNodeDescriptor.java
platform/lang-impl/src/com/intellij/internal/psiView/ViewerTreeBuilder.java
platform/lang-impl/src/com/intellij/internal/psiView/ViewerTreeStructure.java
platform/lang-impl/src/com/intellij/mock/MockPsiManager.java
platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/filter/InspectionFilterAction.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/filter/InspectionsFilter.java
platform/lang-impl/src/com/intellij/psi/stubs/StubTreeLoaderImpl.java
platform/lang-impl/src/com/intellij/refactoring/actions/InlineAction.java
platform/lang-impl/src/com/intellij/refactoring/inline/InlineRefactoringActionHandler.java
platform/lang-impl/src/com/intellij/refactoring/introduceParameterObject/IntroduceParameterObjectClassDescriptor.java
platform/lang-impl/src/com/intellij/refactoring/introduceParameterObject/IntroduceParameterObjectDelegate.java
platform/lang-impl/src/com/intellij/refactoring/introduceParameterObject/IntroduceParameterObjectProcessor.java
platform/lang-impl/src/com/intellij/refactoring/move/MoveCallback.java
platform/lang-impl/src/com/intellij/refactoring/move/MoveHandler.java
platform/lang-impl/src/com/intellij/refactoring/move/MoveMemberViewDescriptor.java
platform/lang-impl/src/com/intellij/refactoring/move/MoveMultipleElementsViewDescriptor.java
platform/lang-impl/src/com/intellij/refactoring/safeDelete/UnsafeUsagesDialog.java
platform/lang-impl/src/com/intellij/refactoring/ui/ConflictsDialog.java
platform/lang-impl/src/com/intellij/tools/FilterDialog.java
platform/lang-impl/src/com/intellij/tools/OutputFiltersDialog.java
platform/lang-impl/src/com/intellij/ui/popup/util/DetailViewImpl.java
platform/lang-impl/src/com/intellij/usageView/FindUsagesCommand.java
platform/platform-api/src/com/intellij/ide/BrowserUtil.java
platform/platform-api/src/com/intellij/ide/GeneralSettings.java
platform/platform-api/src/com/intellij/ide/ui/SplitterProportionsDataImpl.java
platform/platform-api/src/com/intellij/openapi/util/DimensionService.java
platform/platform-api/src/com/intellij/ui/ColorChooser.java
platform/platform-api/src/com/intellij/ui/ColorChooserService.java
platform/platform-api/src/com/intellij/ui/SimpleColoredComponent.java
platform/platform-api/src/com/intellij/ui/treeStructure/Tree.java
platform/platform-api/src/com/intellij/util/config/Storage.java
platform/platform-api/src/com/intellij/util/config/StorageAccessors.java
platform/platform-impl/src/com/intellij/application/options/SaveSchemeDialog.java
platform/platform-impl/src/com/intellij/codeInsight/hint/TooltipGroup.java
platform/platform-impl/src/com/intellij/execution/DelayedDocumentWatcher.java
platform/platform-impl/src/com/intellij/execution/process/OSProcessUtil.java
platform/platform-impl/src/com/intellij/ide/actions/RunGcAction.java
platform/platform-impl/src/com/intellij/ide/actions/ToggleReadOnlyAttributeAction.java
platform/platform-impl/src/com/intellij/ide/actions/ViewStatusBarAction.java
platform/platform-impl/src/com/intellij/ide/passwordSafe/config/PasswordSafeSettings.java
platform/platform-impl/src/com/intellij/internal/statistic/connect/StatisticsHttpClientSender.java
platform/platform-impl/src/com/intellij/openapi/application/PermanentInstallationID.java [new file with mode: 0644]
platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java
platform/platform-impl/src/com/intellij/openapi/components/impl/stores/IProjectStore.java
platform/platform-impl/src/com/intellij/openapi/diff/actions/ClipboardVsValueContents.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareClipboardWithSelection.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareDirectoriesAction.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareFileWithEditor.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/diff/actions/CompareJarsAction.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/diff/actions/DiffActions.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/diff/impl/CaptionIcon.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/diff/impl/FragmentNumberGutterIconRenderer.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/DiffMarkup.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/FragmentBoundRenderer.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/FragmentSeparatorsPositionConsumer.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/FragmentedDiffPanelState.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/NumberedFragmentHighlighter.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/diff/impl/highlighting/PresetBlocksDiffPolicy.java [deleted file]
platform/platform-impl/src/com/intellij/openapi/editor/actions/AbstractToggleUseSoftWrapsAction.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
platform/platform-impl/src/com/intellij/openapi/fileChooser/impl/FileComparator.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/fileTypes/ex/FileTypeChooser.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java
platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectManagerEx.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginDownloader.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateChecker.kt
platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32FsCache.java
platform/platform-impl/src/com/intellij/openapi/vfs/impl/win32/Win32LocalFileSystem.java
platform/platform-impl/src/com/intellij/openapi/wm/ex/IdeFocusTraversalPolicy.java
platform/platform-impl/src/com/intellij/openapi/wm/ex/ToolWindowManagerAdapter.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/StripeButtonUI.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeadlessManagerImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/commands/ApplyWindowInfoCmd.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/commands/RequestFocusInEditorComponentCmd.java
platform/platform-impl/src/com/intellij/remote/VagrantBasedCredentialsHolder.java
platform/platform-impl/src/com/intellij/ui/mac/MacMainFrameDecorator.java
platform/platform-impl/src/com/intellij/util/PsiErrorElementUtil.java
platform/platform-impl/src/com/intellij/util/Urls.java
platform/platform-impl/src/com/intellij/util/ui/CollectionItemEditor.java
platform/platform-impl/src/com/intellij/util/ui/CollectionModelEditor.java
platform/platform-impl/src/org/jetbrains/io/LocalFileFinder.java
platform/platform-resources-en/src/messages/InspectionsBundle.properties
platform/platform-resources/src/idea/PlatformActions.xml
platform/platform-tests/testSrc/com/intellij/openapi/editor/colors/impl/EditorColorsSchemeImplTest.java
platform/platform-tests/testSrc/com/intellij/openapi/fileTypes/impl/FileTypesTest.java
platform/projectModel-api/src/com/intellij/openapi/components/Storage.java
platform/projectModel-api/src/com/intellij/openapi/components/StoragePathMacros.java
platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java
platform/remote-servers/agent-rt/src/com/intellij/remoteServer/agent/annotation/FinalCall.java
platform/script-debugger/backend/src/org/jetbrains/debugger/Scope.java
platform/testFramework/src/com/intellij/testFramework/FileTreeAccessFilter.java
platform/testFramework/src/com/intellij/testFramework/LightPlatformCodeInsightTestCase.java
platform/testFramework/src/com/intellij/testFramework/fixtures/impl/CodeInsightTestFixtureImpl.java
platform/util/src/com/intellij/openapi/util/IconLoader.java
platform/util/src/com/intellij/openapi/util/JDOMUtil.java
platform/util/src/com/intellij/util/ConcurrencyUtil.java
platform/util/src/com/intellij/util/UniqueFileNamesProvider.java
platform/util/src/com/intellij/util/concurrency/AppDelayQueue.java
platform/util/src/com/intellij/util/concurrency/AppScheduledExecutorService.java
platform/util/src/com/intellij/util/containers/LongStack.java
platform/util/src/com/intellij/util/containers/MultiMap.java
platform/util/src/com/intellij/util/io/EqualityPolicy.java
platform/util/src/com/intellij/util/ui/ColumnInfo.java
platform/util/src/com/intellij/util/ui/ComboBoxTableCellEditor.java
platform/util/src/com/intellij/util/ui/UIUtil.java
platform/util/src/com/intellij/util/ui/tree/AbstractTreeModel.java [new file with mode: 0644]
platform/util/src/com/intellij/util/ui/tree/TreeModelListenerList.java
platform/util/src/com/intellij/util/xmlb/annotations/CollectionBean.java
platform/vcs-api/src/com/intellij/openapi/vcs/checkin/BeforeCheckinDialogHandler.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/patch/apply/GenericPatchApplier.java
platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RollbackLineStatusAction.java
platform/vcs-log/graph/src/com/intellij/vcs/log/graph/utils/impl/SmartDeltaCompressor.java
platform/xdebugger-api/src/com/intellij/xdebugger/XDebugProcess.java
platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSessionAdapter.java
platform/xdebugger-api/src/com/intellij/xdebugger/settings/XDebuggerSettings.java
platform/xdebugger-api/src/com/intellij/xdebugger/ui/DebuggerColors.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/frame/XWatchesViewImpl.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/TextViewer.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchNodeImpl.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchesRootNode.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/MethodMatcher.java
plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SharedThreadLocalRandomInspectionBase.java [moved from plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/threading/SharedThreadLocalRandomInspection.java with 70% similarity]
plugins/InspectionGadgets/src/com/siyeh/ig/threading/SharedThreadLocalRandomInspection.java [new file with mode: 0644]
plugins/InspectionGadgets/src/inspectionDescriptions/SharedThreadLocalRandom.html
plugins/InspectionGadgets/testsrc/com/siyeh/ig/IGInspectionTestCase.java
plugins/InspectionGadgets/testsrc/com/siyeh/ig/threading/SharedThreadLocalRandomInspectionTest.java
plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiManager.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeInfoImpl.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/changeSignature/GrChangeSignatureUsageProcessor.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/variable/GrInplaceVariableIntroducer.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduceParameterObject/GroovyIntroduceObjectClassDescriptor.java
plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduceParameterObject/GroovyIntroduceParameterObjectDelegate.java
plugins/hg4idea/src/org/zmlx/hg4idea/HgProjectSettings.java
plugins/hg4idea/testSrc/hg4idea/test/HgPlatformTest.java
plugins/javaFX/src/META-INF/common-javaFX-plugin.xml
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxMethodSearcher.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxScopeEnlarger.java
plugins/javaFX/src/org/jetbrains/plugins/javaFX/indexing/JavaFxImportsIndex.java [deleted file]
plugins/javaFX/testData/rename/staticPropertyMethod.fxml
plugins/javaFX/testData/rename/staticPropertyMethod_after.fxml
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomUtil.java
plugins/tasks/tasks-tests/test/com/intellij/tasks/vcs/HgTaskBranchesTest.java
python/helpers/pycharm/_jb_manage_tasks_provider.py
python/helpers/pycharm/django_manage_commands_provider/_parser/parser.py
python/ipnb/src/org/jetbrains/plugins/ipnb/psi/IpnbPyFragment.java
python/pydevSrc/com/jetbrains/python/debugger/PySignature.java
python/setup-test-environment/build.gradle
python/src/com/jetbrains/python/codeInsight/editorActions/smartEnter/fixers/PyFunctionFixer.java
python/src/com/jetbrains/python/debugger/PyDebugRunner.java
python/src/com/jetbrains/python/debugger/PyStepIntoMyCodeAction.java
python/src/com/jetbrains/python/psi/impl/PyExpressionCodeFragmentImpl.java
python/src/com/jetbrains/python/refactoring/changeSignature/PyExpressionCodeFragment.java
python/testData/codeInsight/smartEnter/colonAfterReturnTypeAnnotation.py [new file with mode: 0644]
python/testData/codeInsight/smartEnter/colonAfterReturnTypeAnnotation_after.py [new file with mode: 0644]
python/testSrc/com/jetbrains/python/PySmartEnterTest.java
python/testSrc/com/jetbrains/python/fixtures/PyMultiFileResolveTestCase.java
resources-en/src/inspectionDescriptions/MagicConstant.html
xml/dom-impl/src/com/intellij/util/xml/impl/DomManagerImpl.java
xml/dom-tests/tests/com/intellij/util/xml/stubs/DomStubUsingTest.java

index 3b71c7e0acda996858ba94f96bb46ca0f8f75fce..aace7a167f8e073bdf84a0357283639db5b17df4 100644 (file)
@@ -42,44 +42,48 @@ def unpackJdks() {
     return
   }
 
-  unpackJdk(osDir, jdkDir, "1.6")
-  unpackJdk(osDir, jdkDir, "1.8")
+  unpackJdk(osDir, jdkDir, "jre6", "1.6")
+  unpackJdk(osDir, jdkDir, "jbsdk8", "1.8")
 }
 
-private void unpackJdk(File osDir, File jdkDir, String majorVersion) {
-  def jdkFiles = osDir.listFiles().findAll { it.name.startsWith("jdk$majorVersion") }
+private void unpackJdk(File osDir, File jdkDir, String archiveFileNamePrefix, String targetDirectoryName) {
+  def jdkFiles = osDir.listFiles().findAll { it.name.startsWith(archiveFileNamePrefix) }
   if (SystemInfo.isWindows) {
-    def arch = System.getenv("ProgramFiles(x86)") != null ? "x64" : "x32"
-    jdkFiles = jdkFiles.findAll { it.name.endsWith("_${arch}.zip") }
+    def arch = System.getenv("ProgramFiles(x86)") != null ? "x64" : "x86"
+    jdkFiles = jdkFiles.findAll { it.name.endsWith("_${arch}.tar.gz") }
   }
   if (jdkFiles.empty) {
-    projectBuilder.error("Cannot unpack JDK: jdk$majorVersion* not found in $osDir")
+    projectBuilder.error("Cannot unpack JDK: $archiveFileNamePrefix not found in $osDir")
   }
   if (jdkFiles.size() > 1) {
     projectBuilder.error("Cannot unpack JDK: several matching files are found ($jdkFiles)")
   }
 
   File jdkFile = jdkFiles.first()
-  def destDir = new File(jdkDir, majorVersion)
+  def destDir = new File(jdkDir, targetDirectoryName)
   FileUtil.delete(destDir)
-  if (jdkFile.name.endsWith(".zip")) {
-    ant.unzip(src: jdkFile, dest: destDir)
-  }
-  else if (jdkFile.name.endsWith(".tar")) {
-    projectBuilder.info("Extracting $jdkFile to $destDir")
-    ant.mkdir(dir: destDir)
-    //'tar' and 'mv' commands are used instead of Ant tasks to ensure that executable flag and symlink will be preserved
-    ant.exec(executable: "tar", dir: jdkFile.getParent()) {
-      arg(value: "-xf")
-      arg(value: jdkFile.name)
-      arg(value: "--directory")
-      arg(value: destDir)
+  projectBuilder.info("Extracting $jdkFile to $destDir")
+  ant.mkdir(dir: destDir)
+
+  if (jdkFile.name.endsWith(".tar.gz")) {
+    if (SystemInfo.isWindows) {
+      ant.untar(src: jdkFile, dest: destDir, compression: 'gzip')
     }
-    if (SystemInfo.isMac && !jdkFile.name.contains("apple")) {
-      new File(destDir, "jre/jdk/Contents").listFiles().each { file ->
-        ant.exec(executable: "mv", dir: destDir) {
-          arg(value: file.absolutePath)
-          arg(value: destDir)
+    else {
+      //'tar' and 'mv' commands are used instead of Ant tasks to ensure that executable flag and symlink will be preserved
+      ant.exec(executable: "tar", dir: jdkFile.getParent()) {
+        arg(value: "-xf")
+        arg(value: jdkFile.name)
+        arg(value: "--directory")
+        arg(value: destDir)
+      }
+      def jdkContents = new File(destDir, "jdk/Contents")
+      if (SystemInfo.isMac && jdkContents.exists()) {
+        jdkContents.listFiles().each { file ->
+          ant.exec(executable: "mv", dir: destDir) {
+            arg(value: file.absolutePath)
+            arg(value: destDir)
+          }
         }
       }
     }
@@ -87,5 +91,4 @@ private void unpackJdk(File osDir, File jdkDir, String majorVersion) {
   else {
     projectBuilder.error("Cannot unpack JDK: unknown extension of file '${jdkFile.name}'")
   }
-}
-
+}
\ No newline at end of file
index be7aaa3be67c895ea51a4d33bf0b9880c98b7c07..0f2731489601d28c558f1cac73959de7ee3c4acb 100644 (file)
@@ -884,7 +884,7 @@ binding.setVariable("bundledJDK64s"){
 private bundledJDK(boolean win64) {
   requireProperty("artifact.linux.no.jdk", "true")
   requireProperty("artifact.mac.no.jdk", "true")
-  requireProperty("jdk.oracle.win", "jdk1.8")
+  requireProperty("jdk.oracle.win", "jdk8u")
   requireProperty("jdk.win",   "openjdk.1.8")
   requireProperty("jdk.mac",   "openjdk.1.8")
   requireProperty("jdk.linux", "openjdk.1.8")
@@ -892,19 +892,18 @@ private bundledJDK(boolean win64) {
   if (new File("${home}/build/jdk").exists()) {
     def jdkDir = new File("${home}/build/jdk/win")
     if (p("jdk.oracle.win") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) {
-      setProperty("winJDK", getPathToBundledJDK(jdkDir, p("jdk.oracle.win"), (win64 ? "x64.zip": "x32.zip")))
+      setProperty("winJDK", getPathToBundledJDK(jdkDir, p("jdk.oracle.win"), (win64 ? "x64.tar.gz": "x86.tar.gz")))
       extractRedistJre(winJDK, "${paths.sandbox}/jdk.oracle.win/jre")
     }
-    jdkDir = new File("${home}/build/jdk/win/custom")
     if (p("jdk.win") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) {
       setProperty("winCustomJDKx32", getPathToBundledJDK(jdkDir, p("jdk.win"), (win64 ? "x64.tar.gz": "x32.tar.gz")))
       extractRedistJre(winCustomJDKx32, "${paths.sandbox}/jdk.win")
     }
-    jdkDir = new File("${home}/build/jdk/mac/custom")
+    jdkDir = new File("${home}/build/jdk/mac")
     if (p("jdk.mac") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) {
       setProperty("macCustomJDK", getPathToBundledJDK(jdkDir, p("jdk.mac"), ".tar.gz"))
     }
-    jdkDir = new File("${home}/build/jdk/linux/custom")
+    jdkDir = new File("${home}/build/jdk/linux")
     if (p("jdk.linux") != "false" && (jdkDir.exists() && jdkDir.isDirectory())) {
       setProperty("linuxJDK", getPathToBundledJDK(jdkDir, p("jdk.linux"), ".tar.gz"))
       extractRedistJre(linuxJDK, "${paths.sandbox}/jdk.linux")
index 7fa8850faee92ef205f94176b6071747109f139a..4d8bd26f32eeebf4e4d846cd27f9dc7646679b83 100644 (file)
  * limitations under the License.
  */
 
-/**
- * created at Jan 3, 2002
- * @author Jeka
- */
 package com.intellij.compiler;
 
 import com.intellij.CommonBundle;
index 95c190743443488f8ae9979d813bc2ab1f9a55ae..deec5c2f92f5a2346451b7b2dc6a790b69d531b1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * @author: Eugene Zhuravlev
- * Date: Jan 17, 2003
- * Time: 1:42:26 PM
- */
 package com.intellij.compiler.impl;
 
 import com.intellij.CommonBundle;
index 5ad3f5a52c1346638d7d0f6c5eca3ba929394617..1522870cec67a9c51a70b3fe65c47de3bd1530ee 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.compiler.impl.packagingCompiler;
 
 import com.intellij.openapi.fileTypes.FileTypeManager;
index 779df52e49e305f0bf50d56a3c1ca1dd855245d6..5120843b4e8b540fc45be760d1af6c4a58d5d124 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.openapi.projectRoots.impl;
 
 import com.intellij.openapi.projectRoots.Sdk;
index cd3092fdb35f36d53d5197555862c5927288d330..9b4cca6aba01bf8964b6ec4c40863a064595555f 100644 (file)
@@ -1,5 +1,17 @@
-/**
- * @author cdr
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package com.intellij.packaging.impl.ui.actions;
 
index b752e8e84dae0654b5b6529667df95d3544ba83f..b52329c878e3254e6c061bb65d9964464f483078 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * created at Jan 3, 2002
- * @author Jeka
- */
 package com.intellij.openapi.compiler.options;
 
 import com.intellij.openapi.Disposable;
index 25d95ed8629200be91acccfa22b5f96d4c797534..da6c5fbe95538396a9445339a2c06d64d99302a1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * class ExportThreadsAction
- * @author Jeka
- */
 package com.intellij.debugger.actions;
 
 import com.intellij.debugger.DebuggerManagerEx;
index 1d9b0e2db55192c8d933bd12108e0c0db58fba05..df157425e2bb4a08cf499e11b52875b41e0078df 100644 (file)
  * limitations under the License.
  */
 
-/**
- * class ExportThreadsAction
- * @author Eugene Zhuravlev
- * @author Sascha Weinreuter
- */
 package com.intellij.debugger.actions;
 
 import com.intellij.debugger.DebuggerBundle;
index 7474f5a42b21a2ad72bccab6f5426445c4872f54..43836ac9549c55b831605603a48140ab3f576eef 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * class ToggleMethodBreakpointAction
- * @author Jeka
- */
 package com.intellij.debugger.actions;
 
 import com.intellij.debugger.DebuggerManagerEx;
index 0fe3395bae7ed6ed7eb9013b2ce105db295b17e3..786c64c4fa8d03edbcda6ee3dee62091a0971c1d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * class ArrayInitializerEvaluator
- * created Jun 28, 2001
- * @author Jeka
- */
 package com.intellij.debugger.engine.evaluation.expression;
 
-import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
 import com.intellij.debugger.engine.evaluation.EvaluateException;
 import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
-import com.intellij.debugger.engine.evaluation.EvaluateException;
 
 class ArrayInitializerEvaluator implements Evaluator{
   private final Evaluator[] myValueEvaluators;
index 6262165fc07d48aab00138698409e02c5cf4c3f3..5b7a731ca116c6cf95bb50ab911002d06aec1249 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * class NewArrayInstanceEvaluator
- * created Jun 27, 2001
- * @author Jeka
- */
 package com.intellij.debugger.engine.evaluation.expression;
 
 import com.intellij.debugger.DebuggerBundle;
index dd699cd7f11d3e6096b07d9ab09bda0d67b64127..c3d50109684241996ebf30a5935eb392163bc737 100644 (file)
  * limitations under the License.
  */
 
-/**
- * class NewArrayInstanceEvaluator
- * created Jun 27, 2001
- * @author Jeka
- */
 package com.intellij.debugger.engine.evaluation.expression;
 
 import com.intellij.debugger.DebuggerBundle;
index 9f82d74a37ddf6137bd829f472d2626b11ad7a5e..d6d86c12d32b42f219244ee233f4d3d8ad5cc407 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -226,8 +226,8 @@ class Bytecodes {
      */
     static final int BSM = 33;
 
-  /**
-     * Computes the instruction types of JVM opcodes.
+  /*
+      Computes the instruction types of JVM opcodes.
      */
     static {
         int i;
index 41f5417799b69e20d290c5efff75100f4b65eeb6..b81d81c688fe6e09247d8e97caf5c99002995863 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * class FieldBreakpointPropertiesPanel
- * @author Jeka
- */
 package com.intellij.debugger.ui.breakpoints;
 
 import com.intellij.debugger.DebuggerBundle;
index 4e25cf4ac7b16aedc8f25f5664d8064259b538d0..349396284cea8c348cdddb1fbc2af9e184d2f6d6 100644 (file)
  * limitations under the License.
  */
 
-/**
- * class FilteredRequestorImpl
- * @author Jeka
- */
 package com.intellij.debugger.ui.breakpoints;
 
 import com.intellij.debugger.InstanceFilter;
index c9026d152e99807eab1a09114dd7ca7917046e71..289d9d20a94e529399d3b0ba21e38c181bc4976c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * class MethodBreakpointPropertiesPanel
- * @author Jeka
- */
 package com.intellij.debugger.ui.breakpoints;
 
 import com.intellij.debugger.DebuggerBundle;
index c0a340ebe0ea087a3c8472823ebcab987ba93b37..c1bbd5adc9dc664a2d2a75d366048a85ce4d4dd6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2010 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,10 +21,6 @@ import com.intellij.openapi.util.Pair;
 import java.io.File;
 import java.util.List;
 
-/**
- * @author Maxim.Medvedev
- */
-
 /**
  * @deprecated use {@link com.intellij.ide.util.projectWizard.importSources.JavaSourceRootDetector} instead
  */
index 0bdc0a5f1c0395c5c57fe41e00347b7a540c04ad..2e6971a3ea9c6f8cb08a5f625ac275af36272cf2 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: cdr
- * Date: Nov 13, 2002
- * Time: 3:26:50 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.daemon.QuickFixBundle;
index 28acb28257a79413a8e690ec0bdc4dc327e1e4f2..327c54e59180328621c2bcac001cfdb9bc0d6fca 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
* Propose to cast one argument to corresponding type
*  in the constructor invocation
* E.g.
- *
* User: cdr
* Date: Nov 13, 2002
+/*
+  Propose to cast one argument to corresponding type
+   in the constructor invocation
+  E.g.
+
+  User: cdr
+  Date: Nov 13, 2002
  */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
+import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.infos.CandidateInfo;
-import com.intellij.openapi.util.TextRange;
 import org.jetbrains.annotations.NotNull;
 
 public class ConstructorParametersFixer {
index 0a3048f23273f04f649de32ba9079d6af5231ec6..6219d0e12fe38057bbc64c249213fdf1cbcc1ff5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: cdr
- * Date: Nov 13, 2002
- * Time: 3:26:50 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
-import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
-import com.intellij.psi.infos.CandidateInfo;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtil;
-import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.refactoring.util.RefactoringChangeUtil;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
-import java.util.Set;
-
 public class QualifySuperArgumentFix extends QualifyThisOrSuperArgumentFix {
   public QualifySuperArgumentFix(@NotNull PsiExpression expression, @NotNull PsiClass psiClass) {
     super(expression, psiClass);
index c5bba7888154266b9d50fb978c9edf29cd483be8..0375eb8344077318d814a3fab0ac13ef42792a4b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: cdr
- * Date: Nov 13, 2002
- * Time: 3:26:50 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.daemon.impl.HighlightInfo;
index 2ea59ccadb91dc2ef951cc534f7fa0db073583c3..9f3cae83b5e23cc269db56213032888b33090501 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: cdr
- * Date: Nov 13, 2002
- * Time: 3:26:50 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
-import com.intellij.codeInsight.daemon.impl.HighlightInfo;
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.TextRange;
-import com.intellij.psi.*;
-import com.intellij.psi.infos.CandidateInfo;
-import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.psi.util.PsiUtil;
-import com.intellij.psi.util.TypeConversionUtil;
-import com.intellij.refactoring.util.RefactoringChangeUtil;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiExpression;
+import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.HashSet;
-import java.util.Set;
-
 public abstract class QualifyThisOrSuperArgumentFix implements IntentionAction {
   protected static final Logger LOG = Logger.getInstance("#" + QualifyThisOrSuperArgumentFix.class.getName());
   protected final PsiExpression myExpression;
index 96d90b24c2564903e736cc3c35cf495d6170d4de..914cc34cfc4da9099ccabf76ebd96370fb60d63c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.FileModificationService;
index 1087e2ec29ef61f0ff329cdb16a242d2cad77c4e..c4257b06cdb2106fd911904f279c5cff3694d36e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -160,8 +160,8 @@ public class VariableArrayTypeFix extends LocalQuickFixOnPsiElement {
     final PsiArrayInitializerExpression myInitializer = (PsiArrayInitializerExpression)startElement;
     final PsiVariable myVariable = getVariableLocal(myInitializer);
     if (myVariable == null) return;
-    /**
-     * only for the case when in same statement with initialization
+    /*
+      only for the case when in same statement with initialization
      */
     final PsiNewExpression myNewExpression = getNewExpressionLocal(myInitializer);
 
index 388e66022cce5956e56e357bfc475b8be9473700..7304094495c699982559fe1cab702eaa2668710c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,10 +44,10 @@ import java.util.*;
  * @author cdr
  */
 public class RedundantSuppressInspectionBase extends GlobalInspectionTool {
-  private BidirectionalMap<String, QuickFix> myQuickFixes = null;
+  private BidirectionalMap<String, QuickFix> myQuickFixes;
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.RedundantSuppressInspection");
 
-  public boolean IGNORE_ALL = false;
+  public boolean IGNORE_ALL;
 
   @Override
   @NotNull
index 02d49d6cab9ae85f08bd969b344bc3a406fa3145..e868a10530a4e3e9ba24f88fe66b22f19664a666 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,7 +51,7 @@ import java.util.List;
 public class StreamApiMigrationInspection extends BaseJavaBatchLocalInspectionTool {
   private static final Logger LOG = Logger.getInstance("#" + StreamApiMigrationInspection.class.getName());
 
-  public boolean REPLACE_TRIVIAL_FOREACH = false;
+  public boolean REPLACE_TRIVIAL_FOREACH;
 
   @Nullable
   @Override
index 90ae880310bdcc95c511d4744379754b0074dd3e..f06b1bda7065c747afa8ccc82cf564b51b83a3a5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,12 @@ import org.jetbrains.org.objectweb.asm.tree.analysis.AnalyzerException;
 import org.jetbrains.org.objectweb.asm.tree.analysis.BasicValue;
 import org.jetbrains.org.objectweb.asm.tree.analysis.Frame;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
-import static com.intellij.codeInspection.bytecodeAnalysis.Direction.*;
+import static com.intellij.codeInspection.bytecodeAnalysis.Direction.In;
+import static com.intellij.codeInspection.bytecodeAnalysis.Direction.InOut;
 
 class AbstractValues {
   static final class ParamValue extends BasicValue {
@@ -213,7 +216,7 @@ abstract class Analysis<Res> {
   final protected List<State>[] computed;
   final Key aKey;
 
-  Res earlyResult = null;
+  Res earlyResult;
 
   protected Analysis(RichControlFlow richControlFlow, Direction direction, boolean stable) {
     this.richControlFlow = richControlFlow;
index 9d71d42189391786c4c0add1538dbf69e0ec755a..08a529c5a09870e29237c73b63683193418e17a8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,8 +34,9 @@ import java.util.List;
 import java.util.Set;
 
 import static com.intellij.codeInspection.bytecodeAnalysis.AbstractValues.*;
+import static com.intellij.codeInspection.bytecodeAnalysis.Direction.InOut;
+import static com.intellij.codeInspection.bytecodeAnalysis.Direction.Out;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
-import static com.intellij.codeInspection.bytecodeAnalysis.Direction.*;
 
 class InOutAnalysis extends Analysis<Result> {
 
@@ -47,8 +48,8 @@ class InOutAnalysis extends Analysis<Result> {
   private final Value inValue;
   private final int generalizeShift;
   private Result internalResult;
-  private int id = 0;
-  private int pendingTop = 0;
+  private int id;
+  private int pendingTop;
 
   protected InOutAnalysis(RichControlFlow richControlFlow, Direction direction, boolean[] resultOrigins, boolean stable, State[] pending) {
     super(richControlFlow, direction, stable);
@@ -273,7 +274,7 @@ class InOutInterpreter extends BasicInterpreter {
   final boolean[] resultOrigins;
   final boolean nullAnalysis;
 
-  boolean deReferenced = false;
+  boolean deReferenced;
 
   InOutInterpreter(Direction direction, InsnList insns, boolean[] resultOrigins) {
     this.direction = direction;
index 2e2924c044ede31dd244d790765412b9bc9b3702..b865a9a4af34d0349cfc6d3068575ad91b3df921 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -211,12 +211,12 @@ class NullableMethodInterpreter extends BasicInterpreter implements InterpreterE
   private final int[] originsMapping;
   final Key[] keys;
 
-  Constraint constraint = null;
-  int delta = 0;
-  int nullsDelta = 0;
+  Constraint constraint;
+  int delta;
+  int nullsDelta;
   int notNullInsn = -1;
-  int notNullCall = 0;
-  int notNullNull = 0;
+  int notNullCall;
+  int notNullNull;
 
   NullableMethodInterpreter(InsnList insns, boolean[] origins, int[] originsMapping) {
     this.insns = insns;
index 52106534d8a7734f026becf81a77283547c141ff..ad52d2f8a7bb804c099293b91661fa0ae5137e64 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,9 +34,9 @@ import java.util.List;
 import java.util.Set;
 
 import static com.intellij.codeInspection.bytecodeAnalysis.AbstractValues.*;
+import static com.intellij.codeInspection.bytecodeAnalysis.Direction.In;
 import static com.intellij.codeInspection.bytecodeAnalysis.PResults.*;
 import static org.jetbrains.org.objectweb.asm.Opcodes.*;
-import static com.intellij.codeInspection.bytecodeAnalysis.Direction.*;
 
 abstract class PResults {
   // SoP = sum of products
@@ -211,9 +211,9 @@ class NonNullInAnalysis extends Analysis<PResult> {
     }
   }
 
-  private int id = 0;
-  private Frame<BasicValue> nextFrame = null;
-  private PResult subResult = null;
+  private int id;
+  private Frame<BasicValue> nextFrame;
+  private PResult subResult;
 
   @NotNull
   protected Equation analyze() throws AnalyzerException {
@@ -383,7 +383,7 @@ class NonNullInAnalysis extends Analysis<PResult> {
 
   }
 
-  private int pendingTop = 0;
+  private int pendingTop;
 
   private void pendingPush(PendingAction action) throws AnalyzerException {
     if (pendingTop >= STEPS_LIMIT) {
@@ -437,11 +437,11 @@ class NullableInAnalysis extends Analysis<PResult> {
     }
   }
 
-  private int id = 0;
-  private Frame<BasicValue> nextFrame = null;
+  private int id;
+  private Frame<BasicValue> nextFrame;
   private PResult myResult = Identity;
   private PResult subResult = Identity;
-  private boolean top = false;
+  private boolean top;
 
   @NotNull
   protected Equation analyze() throws AnalyzerException {
@@ -573,7 +573,7 @@ class NullableInAnalysis extends Analysis<PResult> {
 
   }
 
-  private int pendingTop = 0;
+  private int pendingTop;
 
   private void pendingPush(State state) throws AnalyzerException {
     if (pendingTop >= STEPS_LIMIT) {
@@ -602,7 +602,7 @@ class NullableInAnalysis extends Analysis<PResult> {
 }
 
 abstract class NullityInterpreter extends BasicInterpreter {
-  boolean top = false;
+  boolean top;
   final boolean nullableAnalysis;
   final int nullityMask;
   private PResult subResult = Identity;
index 42ee796d4bcf8a2d1dd68696a21d1cd903739301..6b7ba379f7695e6d91a061532ad457f8160026ca 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -299,8 +299,8 @@ class ParametersUsage extends Interpreter<ParamsValue> {
 class IParametersUsage extends Interpreter<IParamsValue> {
   static final IParamsValue val1 = new IParamsValue(0, 1);
   static final IParamsValue val2 = new IParamsValue(0, 2);
-  int leaking = 0;
-  int nullableLeaking = 0;
+  int leaking;
+  int nullableLeaking;
   int called = -1;
   final int rangeStart;
   final int rangeEnd;
index 3582ce1a293c536955cf1c2acc9017724caac852..9ca3844e0987753a2b1d0e0b4ae6cb247ae64fbe 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,8 +47,8 @@ import java.awt.*;
 public class CanBeFinalInspection extends GlobalJavaBatchInspectionTool {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.canBeFinal.CanBeFinalInspection");
 
-  public boolean REPORT_CLASSES = false;
-  public boolean REPORT_METHODS = false;
+  public boolean REPORT_CLASSES;
+  public boolean REPORT_METHODS;
   public boolean REPORT_FIELDS = true;
   public static final String DISPLAY_NAME = InspectionsBundle.message("inspection.can.be.final.display.name");
   @NonNls public static final String SHORT_NAME = "CanBeFinal";
index 4fdc7f5842c0f0ea5999636858b3cc2b91d31a84..b05b41ce7211eede87c807a5684578c4541359b8 100644 (file)
@@ -19,8 +19,6 @@ import com.intellij.codeInsight.NullableNotNullManager;
 import com.intellij.codeInspection.dataFlow.MethodContract.ValueConstraint;
 import com.intellij.codeInspection.dataFlow.instructions.MethodCallInstruction;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.util.RecursionManager;
 import com.intellij.psi.*;
 import com.intellij.psi.tree.IElementType;
@@ -28,8 +26,6 @@ import com.intellij.psi.util.CachedValueProvider;
 import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.psi.util.PsiModificationTracker;
 import com.intellij.psi.util.PsiUtil;
-import com.intellij.util.Function;
-import com.intellij.util.NullableFunction;
 import com.intellij.util.containers.ContainerUtil;
 import com.siyeh.ig.psiutils.SideEffectChecker;
 import org.jetbrains.annotations.NotNull;
@@ -52,19 +48,11 @@ public class ContractInference {
       return Collections.emptyList();
     }
     
-    return CachedValuesManager.getCachedValue(method, new CachedValueProvider<List<MethodContract>>() {
-      @Nullable
-      @Override
-      public Result<List<MethodContract>> compute() {
-        List<MethodContract> result = RecursionManager.doPreventingRecursion(method, true, new Computable<List<MethodContract>>() {
-          @Override
-          public List<MethodContract> compute() {
-            return new ContractInferenceInterpreter(method).inferContracts();
-          }
-        });
-        if (result == null) result = Collections.emptyList();
-        return Result.create(result, method, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
-      }
+    return CachedValuesManager.getCachedValue(method, () -> {
+      List<MethodContract> result = RecursionManager.doPreventingRecursion(method, true, () ->
+        new ContractInferenceInterpreter(method).inferContracts());
+      if (result == null) result = Collections.emptyList();
+      return CachedValueProvider.Result.create(result, method, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
     });
   }
 }
@@ -91,14 +79,11 @@ class ContractInferenceInterpreter {
     if (referenceTypeReturned) {
       contracts = boxReturnValues(contracts);
     }
-    List<MethodContract> compatible = ContainerUtil.filter(contracts, new Condition<MethodContract>() {
-      @Override
-      public boolean value(MethodContract contract) {
-        if (notNull && contract.returnValue == NOT_NULL_VALUE) {
-          return false;
-        }
-        return InferenceFromSourceUtil.isReturnTypeCompatible(returnType, contract.returnValue);
+    List<MethodContract> compatible = ContainerUtil.filter(contracts, contract -> {
+      if (notNull && contract.returnValue == NOT_NULL_VALUE) {
+        return false;
       }
+      return InferenceFromSourceUtil.isReturnTypeCompatible(returnType, contract.returnValue);
     });
     if (compatible.size() > ContractInference.MAX_CONTRACT_COUNT) {
       LOG.debug("Too many contracts for " + PsiUtil.getMemberQualifiedName(myMethod) + ", shrinking the list");
@@ -109,14 +94,11 @@ class ContractInferenceInterpreter {
 
   @NotNull
   private static List<MethodContract> boxReturnValues(List<MethodContract> contracts) {
-    return ContainerUtil.mapNotNull(contracts, new Function<MethodContract, MethodContract>() {
-      @Override
-      public MethodContract fun(MethodContract contract) {
-        if (contract.returnValue == FALSE_VALUE || contract.returnValue == TRUE_VALUE) {
-          return new MethodContract(contract.arguments, NOT_NULL_VALUE);
-        }
-        return contract;
+    return ContainerUtil.mapNotNull(contracts, contract -> {
+      if (contract.returnValue == FALSE_VALUE || contract.returnValue == TRUE_VALUE) {
+        return new MethodContract(contract.arguments, NOT_NULL_VALUE);
       }
+      return contract;
     });
   }
 
@@ -168,42 +150,38 @@ class ContractInferenceInterpreter {
     final boolean varArgCall = MethodCallInstruction.isVarArgCall(targetMethod, result.getSubstitutor(), arguments, parameters);
 
     final boolean notNull = NullableNotNullManager.isNotNull(targetMethod);
-    List<MethodContract> fromDelegate = ContainerUtil.mapNotNull(ControlFlowAnalyzer.getMethodContracts(targetMethod), new NullableFunction<MethodContract, MethodContract>() {
-      @Nullable
-      @Override
-      public MethodContract fun(MethodContract delegateContract) {
-        ValueConstraint[] answer = myEmptyConstraints;
-        for (int i = 0; i < delegateContract.arguments.length; i++) {
-          if (i >= arguments.length) return null;
-          ValueConstraint argConstraint = delegateContract.arguments[i];
-          if (argConstraint != ANY_VALUE) {
-            if (varArgCall && i >= parameters.length - 1) {
-              if (argConstraint == NULL_VALUE) {
-                return null;
-              }
-              break;
+    List<MethodContract> fromDelegate = ContainerUtil.mapNotNull(ControlFlowAnalyzer.getMethodContracts(targetMethod), delegateContract -> {
+      ValueConstraint[] answer = myEmptyConstraints;
+      for (int i = 0; i < delegateContract.arguments.length; i++) {
+        if (i >= arguments.length) return null;
+        ValueConstraint argConstraint = delegateContract.arguments[i];
+        if (argConstraint != ANY_VALUE) {
+          if (varArgCall && i >= parameters.length - 1) {
+            if (argConstraint == NULL_VALUE) {
+              return null;
             }
+            break;
+          }
 
-            int paramIndex = resolveParameter(arguments[i]);
-            if (paramIndex < 0) {
-              if (argConstraint != getLiteralConstraint(arguments[i])) {
-                return null;
-              }
+          int paramIndex = resolveParameter(arguments[i]);
+          if (paramIndex < 0) {
+            if (argConstraint != getLiteralConstraint(arguments[i])) {
+              return null;
             }
-            else {
-              answer = withConstraint(answer, paramIndex, argConstraint);
-              if (answer == null) {
-                return null;
-              }
+          }
+          else {
+            answer = withConstraint(answer, paramIndex, argConstraint);
+            if (answer == null) {
+              return null;
             }
           }
         }
-        ValueConstraint returnValue = negated ? negateConstraint(delegateContract.returnValue) : delegateContract.returnValue;
-        if (notNull && returnValue != THROW_EXCEPTION) {
-          returnValue = NOT_NULL_VALUE;
-        }
-        return answer == null ? null : new MethodContract(answer, returnValue);
       }
+      ValueConstraint returnValue = negated ? negateConstraint(delegateContract.returnValue) : delegateContract.returnValue;
+      if (notNull && returnValue != THROW_EXCEPTION) {
+        returnValue = NOT_NULL_VALUE;
+      }
+      return answer == null ? null : new MethodContract(answer, returnValue);
     });
     if (notNull) {
       return ContainerUtil.concat(fromDelegate, Collections.singletonList(new MethodContract(myEmptyConstraints, NOT_NULL_VALUE)));
@@ -230,8 +208,8 @@ class ContractInferenceInterpreter {
     if (expr instanceof PsiConditionalExpression) {
       List<MethodContract> conditionResults = visitExpression(states, ((PsiConditionalExpression)expr).getCondition());
       return ContainerUtil.concat(
-        visitExpression(antecedentsOf(filterReturning(conditionResults, TRUE_VALUE)), ((PsiConditionalExpression)expr).getThenExpression()),
-        visitExpression(antecedentsOf(filterReturning(conditionResults, FALSE_VALUE)), ((PsiConditionalExpression)expr).getElseExpression()));
+        visitExpression(antecedentsReturning(conditionResults, TRUE_VALUE), ((PsiConditionalExpression)expr).getThenExpression()),
+        visitExpression(antecedentsReturning(conditionResults, FALSE_VALUE), ((PsiConditionalExpression)expr).getElseExpression()));
     }
 
 
@@ -255,14 +233,7 @@ class ContractInferenceInterpreter {
     if (expr instanceof PsiInstanceOfExpression) {
       final int parameter = resolveParameter(((PsiInstanceOfExpression)expr).getOperand());
       if (parameter >= 0) {
-        return ContainerUtil.mapNotNull(states, new Function<ValueConstraint[], MethodContract>() {
-          @Override
-          public MethodContract fun(ValueConstraint[] state) {
-            ValueConstraint paramConstraint = NULL_VALUE;
-            ValueConstraint returnValue = FALSE_VALUE;
-            return contractWithConstraint(state, parameter, paramConstraint, returnValue);
-          }
-        });
+        return ContainerUtil.mapNotNull(states, state -> contractWithConstraint(state, parameter, NULL_VALUE, FALSE_VALUE));
       }
     }
 
@@ -344,14 +315,8 @@ class ContractInferenceInterpreter {
     return myMethod.getParameterList().getParameters()[parameter];
   }
 
-  private static List<MethodContract> toContracts(List<ValueConstraint[]> states,
-                                                  final ValueConstraint constraint) {
-    return ContainerUtil.map(states, new Function<ValueConstraint[], MethodContract>() {
-      @Override
-      public MethodContract fun(ValueConstraint[] state) {
-        return new MethodContract(state, constraint);
-      }
-    });
+  private static List<MethodContract> toContracts(List<ValueConstraint[]> states, ValueConstraint constraint) {
+    return ContainerUtil.map(states, state -> new MethodContract(state, constraint));
   }
 
   private List<MethodContract> visitLogicalOperation(PsiExpression[] operands, boolean conjunction, List<ValueConstraint[]> states) {
@@ -359,29 +324,15 @@ class ContractInferenceInterpreter {
     List<MethodContract> finalStates = ContainerUtil.newArrayList();
     for (PsiExpression operand : operands) {
       List<MethodContract> opResults = visitExpression(states, operand);
-      finalStates.addAll(filterReturning(opResults, breakValue));
-      states = antecedentsOf(filterReturning(opResults, negateConstraint(breakValue)));
+      finalStates.addAll(ContainerUtil.filter(opResults, contract -> contract.returnValue == breakValue));
+      states = antecedentsReturning(opResults, negateConstraint(breakValue));
     }
     finalStates.addAll(toContracts(states, negateConstraint(breakValue)));
     return finalStates;
   }
 
-  private static List<ValueConstraint[]> antecedentsOf(List<MethodContract> values) {
-    return ContainerUtil.map(values, new Function<MethodContract, ValueConstraint[]>() {
-      @Override
-      public ValueConstraint[] fun(MethodContract contract) {
-        return contract.arguments;
-      }
-    });
-  }
-
-  private static List<MethodContract> filterReturning(List<MethodContract> values, final ValueConstraint result) {
-    return ContainerUtil.filter(values, new Condition<MethodContract>() {
-      @Override
-      public boolean value(MethodContract contract) {
-        return contract.returnValue == result;
-      }
-    });
+  private static List<ValueConstraint[]> antecedentsReturning(List<MethodContract> values, ValueConstraint result) {
+    return ContainerUtil.mapNotNull(values, contract -> contract.returnValue == result ? contract.arguments : null);
   }
 
   @NotNull
@@ -396,10 +347,10 @@ class ContractInferenceInterpreter {
 
         PsiStatement thenBranch = ((PsiIfStatement)statement).getThenBranch();
         if (thenBranch != null) {
-          result.addAll(visitStatements(antecedentsOf(filterReturning(conditionResults, TRUE_VALUE)), thenBranch));
+          result.addAll(visitStatements(antecedentsReturning(conditionResults, TRUE_VALUE), thenBranch));
         }
 
-        List<ValueConstraint[]> falseStates = antecedentsOf(filterReturning(conditionResults, FALSE_VALUE));
+        List<ValueConstraint[]> falseStates = antecedentsReturning(conditionResults, FALSE_VALUE);
         PsiStatement elseBranch = ((PsiIfStatement)statement).getElseBranch();
         if (elseBranch != null) {
           result.addAll(visitStatements(falseStates, elseBranch));
@@ -416,7 +367,7 @@ class ContractInferenceInterpreter {
       }
       else if (statement instanceof PsiAssertStatement) {
         List<MethodContract> conditionResults = visitExpression(states, ((PsiAssertStatement)statement).getAssertCondition());
-        result.addAll(toContracts(antecedentsOf(filterReturning(conditionResults, FALSE_VALUE)), THROW_EXCEPTION));
+        result.addAll(toContracts(antecedentsReturning(conditionResults, FALSE_VALUE), THROW_EXCEPTION));
       }
       else if (statement instanceof PsiDeclarationStatement && !mayHaveSideEffects((PsiDeclarationStatement)statement)) {
         continue;
index add2fbeced8d80825b0be7d7a466e57b6ee00c77..231fbebfbc53e8946cb8a0cdf44334f744f86e21 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -63,10 +63,10 @@ import java.util.*;
 public class DataFlowInspectionBase extends BaseJavaBatchLocalInspectionTool {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.dataFlow.DataFlowInspection");
   @NonNls private static final String SHORT_NAME = "ConstantConditions";
-  public boolean SUGGEST_NULLABLE_ANNOTATIONS = false;
-  public boolean DONT_REPORT_TRUE_ASSERT_STATEMENTS = false;
-  public boolean TREAT_UNKNOWN_MEMBERS_AS_NULLABLE = false;
-  public boolean IGNORE_ASSERT_STATEMENTS = false;
+  public boolean SUGGEST_NULLABLE_ANNOTATIONS;
+  public boolean DONT_REPORT_TRUE_ASSERT_STATEMENTS;
+  public boolean TREAT_UNKNOWN_MEMBERS_AS_NULLABLE;
+  public boolean IGNORE_ASSERT_STATEMENTS;
   public boolean REPORT_CONSTANT_REFERENCE_VALUES = true;
 
   @Override
index d7f265808af1c58b0045de322cacf8a5640feb44..e27fd76421f1083dd2dec1038c1232b2d63d1b28 100644 (file)
@@ -16,7 +16,6 @@
 package com.intellij.codeInspection.dataFlow;
 
 import com.intellij.codeInsight.NullableNotNullManager;
-import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.RecursionManager;
 import com.intellij.psi.*;
 import com.intellij.psi.util.CachedValueProvider;
@@ -24,7 +23,6 @@ import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.psi.util.PsiModificationTracker;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
@@ -44,19 +42,10 @@ public class NullityInference {
       return Nullness.UNKNOWN;
     }
 
-    return CachedValuesManager.getCachedValue(method, new CachedValueProvider<Nullness>() {
-      @Nullable
-      @Override
-      public Result<Nullness> compute() {
-        Nullness result = RecursionManager.doPreventingRecursion(method, true, new Computable<Nullness>() {
-          @Override
-          public Nullness compute() {
-            return doInferNullity(method);
-          }
-        });
-        if (result == null) result = Nullness.UNKNOWN;
-        return Result.create(result, method, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
-      }
+    return CachedValuesManager.getCachedValue(method, () -> {
+      Nullness result = RecursionManager.doPreventingRecursion(method, true, () -> doInferNullity(method));
+      if (result == null) result = Nullness.UNKNOWN;
+      return CachedValueProvider.Result.create(result, method, PsiModificationTracker.JAVA_STRUCTURE_MODIFICATION_COUNT);
     });
   }
 
index 38c9218254690f650be1d19d48b657eecb671506..c62feff2f812fbb7b8bdd40b853a3794c40f1eaf 100644 (file)
@@ -15,7 +15,6 @@
  */
 package com.intellij.codeInspection.dataFlow;
 
-import com.intellij.openapi.util.Computable;
 import com.intellij.openapi.util.RecursionManager;
 import com.intellij.openapi.util.Ref;
 import com.intellij.psi.*;
@@ -25,7 +24,6 @@ import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.psi.util.PropertyUtil;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.List;
 
@@ -43,18 +41,9 @@ public class PurityInference {
       return false;
     }
 
-    return CachedValuesManager.getCachedValue(method, new CachedValueProvider<Boolean>() {
-      @Nullable
-      @Override
-      public Result<Boolean> compute() {
-        boolean pure = RecursionManager.doPreventingRecursion(method, true, new Computable<Boolean>() {
-          @Override
-          public Boolean compute() {
-            return doInferPurity(method);
-          }
-        }) == Boolean.TRUE;
-        return Result.create(pure, method);
-      }
+    return CachedValuesManager.getCachedValue(method, () -> {
+      boolean pure = RecursionManager.doPreventingRecursion(method, true, () -> doInferPurity(method)) == Boolean.TRUE;
+      return CachedValueProvider.Result.create(pure, method);
     });
   }
 
index c253cb159aa86f5ff2d9538541470251278222ea..47fb7a64bca7d7eb0a5153dfd8e46e31eada56b9 100644 (file)
@@ -77,7 +77,7 @@ public class UnusedDeclarationInspectionBase extends GlobalInspectionTool {
   final List<EntryPoint> myExtensions = ContainerUtil.createLockFreeCopyOnWriteList();
   final UnusedSymbolLocalInspectionBase myLocalInspectionBase = createUnusedSymbolLocalInspection();
 
-  private Set<RefElement> myProcessedSuspicious = null;
+  private Set<RefElement> myProcessedSuspicious;
   private int myPhase;
   private GlobalInspectionContext myContext;
   private final boolean myEnabledInEditor;
index f3880bfef9904f92670d14598f7dd5e4a4af2531..d7ef822d828f394bdfab2563a292acd38b700ce8 100644 (file)
@@ -34,7 +34,7 @@ import java.util.*;
 import java.util.List;
 
 public class DefUseInspectionBase extends BaseJavaBatchLocalInspectionTool {
-  public boolean REPORT_PREFIX_EXPRESSIONS = false;
+  public boolean REPORT_PREFIX_EXPRESSIONS;
   public boolean REPORT_POSTFIX_EXPRESSIONS = true;
   public boolean REPORT_REDUNDANT_INITIALIZER = true;
 
index b02c02657532ffd6b0e770b05d19e5e9c608835b..081053a6ed53aaa0e1d59f4e4c8084b4bc761832 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class DeprecationInspection extends BaseJavaBatchLocalInspectionTool {
   public static final String DISPLAY_NAME = DeprecationUtil.DEPRECATION_DISPLAY_NAME;
   public static final String IGNORE_METHODS_OF_DEPRECATED_NAME = "IGNORE_METHODS_OF_DEPRECATED";
 
-  public boolean IGNORE_INSIDE_DEPRECATED = false;
+  public boolean IGNORE_INSIDE_DEPRECATED;
   public boolean IGNORE_ABSTRACT_DEPRECATED_OVERRIDES = true;
   public boolean IGNORE_IMPORT_STATEMENTS = true;
   public boolean IGNORE_METHODS_OF_DEPRECATED = true;
index c490570152448b3a10dc69cb634b9bcea3791a82..5a8665a534c845009d9a873c92a1ab9a3ad01997 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@ import javax.swing.*;
 
 public class DuplicateThrowsInspection extends BaseJavaBatchLocalInspectionTool implements CleanupLocalInspectionTool {
   @SuppressWarnings("PublicField")
-  public boolean ignoreSubclassing = false;
+  public boolean ignoreSubclassing;
 
   @Override
   @NotNull
index ab23d803aa5777f2dec7877c15358850cc3ab9a1..1a5e464551ebeea0b37336296c8a76bee5ca4a6a 100644 (file)
@@ -77,7 +77,7 @@ public abstract class EntryPointsManagerBase extends EntryPointsManager implemen
   @NonNls private static final String VERSION_ATTR = "version";
   @NonNls private static final String ENTRY_POINT_ATTR = "entry_point";
   private boolean myAddNonJavaEntries = true;
-  private boolean myResolved = false;
+  private boolean myResolved;
   protected final Project myProject;
   private long myLastModificationCount = -1;
 
index 4266b66cb6eddb23c7f2463117a8cb12579d8c55..c28ccc2d609626f1f9f12c652e3bb7434199fc4f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -118,7 +118,7 @@ public class InheritorsStatisticalDataSearch {
       myAllNotAnonymousInheritors = new HashSet<String>();
     }
 
-    private int myAnonymousInheritorsCount = 0;
+    private int myAnonymousInheritorsCount;
 
     private Set<String> getAllNotAnonymousInheritors() {
       return myAllNotAnonymousInheritors;
index ab764a1f518e3c5b96002d269085b2342b447d36..a95ad064e8bfdaeeaf81d4253983d7e6691166c5 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@ public class Java15APIUsageInspectionBase extends BaseJavaBatchLocalInspectionTo
     ourDefaultMethods.add("java.util.Iterator#remove()");
   }
 
-  protected LanguageLevel myEffectiveLanguageLevel = null;
+  protected LanguageLevel myEffectiveLanguageLevel;
 
   @Nullable
   private static Set<String> getForbiddenApi(@NotNull LanguageLevel languageLevel) {
index b263fc278ffea70a19cebc1183a4c4d5aafac0b4..04167ce144a4bd925c765aaac1920e5714405835 100644 (file)
@@ -78,17 +78,17 @@ public class JavaDocLocalInspectionBase extends BaseJavaBatchLocalInspectionTool
   public Options INNER_CLASS_OPTIONS = new Options("none", "");
   public Options METHOD_OPTIONS = new Options("none", "@return@param@throws or @exception");
   public Options FIELD_OPTIONS = new Options("none", "");
-  public boolean IGNORE_DEPRECATED = false;
+  public boolean IGNORE_DEPRECATED;
   public boolean IGNORE_JAVADOC_PERIOD = true;
   @SuppressWarnings("unused") @Deprecated
-  public boolean IGNORE_DUPLICATED_THROWS = false;
-  public boolean IGNORE_POINT_TO_ITSELF = false;
+  public boolean IGNORE_DUPLICATED_THROWS;
+  public boolean IGNORE_POINT_TO_ITSELF;
 
   public String myAdditionalJavadocTags = "";
 
   private boolean myIgnoreDuplicatedThrows = true;
-  private boolean myIgnoreEmptyDescriptions = false;
-  private boolean myIgnoreSimpleAccessors = false;
+  private boolean myIgnoreEmptyDescriptions;
+  private boolean myIgnoreSimpleAccessors;
 
   public void setPackageOption(String modifier, String tags) {
     PACKAGE_OPTIONS.ACCESS_JAVADOC_REQUIRED_FOR = modifier;
@@ -451,7 +451,7 @@ public class JavaDocLocalInspectionBase extends BaseJavaBatchLocalInspectionTool
   private class ProblemHolderImpl implements JavadocHighlightUtil.ProblemHolder {
     private final InspectionManager myManager;
     private final boolean myOnTheFly;
-    private List<ProblemDescriptor> myProblems = null;
+    private List<ProblemDescriptor> myProblems;
 
     private ProblemHolderImpl(InspectionManager manager, boolean onTheFly) {
       myManager = manager;
index 229979ca347d1048d95c23f5077ec3778d148916..44a28e2c7062611afea9e83f04a03055463e3de8 100644 (file)
@@ -52,9 +52,9 @@ public class NullableStuffInspectionBase extends BaseJavaBatchLocalInspectionToo
   @SuppressWarnings({"WeakerAccess"}) public boolean REPORT_NOTNULL_PARAMETER_OVERRIDES_NULLABLE = true;
   @Deprecated @SuppressWarnings({"WeakerAccess"}) public boolean REPORT_NOT_ANNOTATED_PARAMETER_OVERRIDES_NOTNULL = true;
   @SuppressWarnings({"WeakerAccess"}) public boolean REPORT_NOT_ANNOTATED_GETTER = true;
-  @SuppressWarnings({"WeakerAccess"}) public boolean IGNORE_EXTERNAL_SUPER_NOTNULL = false;
+  @SuppressWarnings({"WeakerAccess"}) public boolean IGNORE_EXTERNAL_SUPER_NOTNULL;
   @SuppressWarnings({"WeakerAccess"}) public boolean REQUIRE_NOTNULL_FIELDS_INITIALIZED = true;
-  @SuppressWarnings({"WeakerAccess"}) public boolean REPORT_NOTNULL_PARAMETERS_OVERRIDES_NOT_ANNOTATED = false;
+  @SuppressWarnings({"WeakerAccess"}) public boolean REPORT_NOTNULL_PARAMETERS_OVERRIDES_NOT_ANNOTATED;
   @Deprecated @SuppressWarnings({"WeakerAccess"}) public boolean REPORT_NOT_ANNOTATED_SETTER_PARAMETER = true;
   @Deprecated @SuppressWarnings({"WeakerAccess"}) public boolean REPORT_ANNOTATION_NOT_PROPAGATED_TO_OVERRIDERS = true; // remains for test
   @SuppressWarnings({"WeakerAccess"}) public boolean REPORT_NULLS_PASSED_TO_NON_ANNOTATED_METHOD = true;
index 930485558c20640ab161d5c944edaa1279d5f477..2e4e80599c1ba3db4a414e265eb1d928d66902e3 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,8 +46,8 @@ public class RedundantCastInspection extends GenericsInspectionToolBase {
   private static final String DISPLAY_NAME = InspectionsBundle.message("inspection.redundant.cast.display.name");
   @NonNls private static final String SHORT_NAME = "RedundantCast";
 
-  public boolean IGNORE_ANNOTATED_METHODS = false;
-  public boolean IGNORE_SUSPICIOUS_METHOD_CALLS = false;
+  public boolean IGNORE_ANNOTATED_METHODS;
+  public boolean IGNORE_SUSPICIOUS_METHOD_CALLS;
 
 
   public RedundantCastInspection() {
index accdc0b2b17b2f85e301ae2b3bcb9d86fb9d4175..b938eef5f26087e0a7cbbdb41c937c85bce428e1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,11 +50,11 @@ public class UncheckedWarningLocalInspectionBase extends BaseJavaBatchLocalInspe
   public static final String DISPLAY_NAME = InspectionsBundle.message("unchecked.warning");
   @NonNls private static final String ID = "unchecked";
   private static final Logger LOG = Logger.getInstance("#" + UncheckedWarningLocalInspectionBase.class);
-  public boolean IGNORE_UNCHECKED_ASSIGNMENT = false;
-  public boolean IGNORE_UNCHECKED_GENERICS_ARRAY_CREATION = false;
-  public boolean IGNORE_UNCHECKED_CALL = false;
-  public boolean IGNORE_UNCHECKED_CAST = false;
-  public boolean IGNORE_UNCHECKED_OVERRIDING = false;
+  public boolean IGNORE_UNCHECKED_ASSIGNMENT;
+  public boolean IGNORE_UNCHECKED_GENERICS_ARRAY_CREATION;
+  public boolean IGNORE_UNCHECKED_CALL;
+  public boolean IGNORE_UNCHECKED_CAST;
+  public boolean IGNORE_UNCHECKED_OVERRIDING;
 
   protected static JCheckBox createSetting(final String cbText,
                                            final boolean option,
index e4d3b33a5cfc8f33f503f69e2e607bcdd0864739..6fb30d7070d50c64680ed0306ddd460ebb162a50 100644 (file)
@@ -59,7 +59,7 @@ public class VisibilityInspection extends GlobalJavaBatchInspectionTool {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInspection.visibility.VisibilityInspection");
   public boolean SUGGEST_PACKAGE_LOCAL_FOR_MEMBERS = true;
   public boolean SUGGEST_PACKAGE_LOCAL_FOR_TOP_CLASSES = true;
-  public boolean SUGGEST_PRIVATE_FOR_INNERS = false;
+  public boolean SUGGEST_PRIVATE_FOR_INNERS;
   private static final String DISPLAY_NAME = InspectionsBundle.message("inspection.visibility.display.name");
   @NonNls public static final String SHORT_NAME = "WeakerAccess";
   private static final String CAN_BE_PRIVATE = InspectionsBundle.message("inspection.visibility.compose.suggestion", VisibilityUtil.toPresentableText(PsiModifier.PRIVATE));
index 4339d36ffb38fcafe09b8529f16382d133893bde..a36824cebe36eb9202e660945f2b08d01ade8f48 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,13 +26,13 @@ import java.util.LinkedHashSet;
  * @author peter
  */
 public class JavaClassFindUsagesOptions extends JavaFindUsagesOptions {
-  public boolean isMethodsUsages = false;
-  public boolean isFieldsUsages = false;
-  public boolean isDerivedClasses = false;
-  public boolean isImplementingClasses = false;
-  public boolean isDerivedInterfaces = false;
+  public boolean isMethodsUsages;
+  public boolean isFieldsUsages;
+  public boolean isDerivedClasses;
+  public boolean isImplementingClasses;
+  public boolean isDerivedInterfaces;
   public boolean isCheckDeepInheritance = true;
-  public boolean isIncludeInherited = false;
+  public boolean isIncludeInherited;
 
   public JavaClassFindUsagesOptions(@NotNull Project project) {
     super(project);
index 60b650ce293ac89ddc3d025bb0467762f5eeae25..a990879fafffa2bf36fd252439fc3aa24e854055 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ import java.util.LinkedHashSet;
  * @author peter
  */
 public abstract class JavaFindUsagesOptions extends FindUsagesOptions {
-  public boolean isSkipImportStatements = false;
+  public boolean isSkipImportStatements;
 
   public JavaFindUsagesOptions(@NotNull Project project) {
     super(project);
index ab39b82d109f7d7cee2c2a6b182c43c2e2f61726..87970138d70a25917bd2c177d11f2b0962fabf4d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,11 +26,11 @@ import java.util.LinkedHashSet;
  * @author peter
  */
 public class JavaMethodFindUsagesOptions extends JavaFindUsagesOptions {
-  public boolean isOverridingMethods = false;
-  public boolean isImplementingMethods = false;
+  public boolean isOverridingMethods;
+  public boolean isImplementingMethods;
   public boolean isCheckDeepInheritance = true;
-  public boolean isIncludeInherited = false;
-  public boolean isIncludeOverloadUsages = false;
+  public boolean isIncludeInherited;
+  public boolean isIncludeOverloadUsages;
 
   public JavaMethodFindUsagesOptions(@NotNull Project project) {
     super(project);
index 93cc0db69e9e7415d6195b7ed1a7b03ac5966005..081284123e7dbb043d93cbba353b9ab60d26cc45 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,9 @@ import java.util.LinkedHashSet;
  * @author peter
  */
 public class JavaPackageFindUsagesOptions extends JavaFindUsagesOptions {
-  public boolean isClassesUsages = false;
+  public boolean isClassesUsages;
   public boolean isIncludeSubpackages = true;
-  public boolean isSkipPackageStatements = false;
+  public boolean isSkipPackageStatements;
 
   public JavaPackageFindUsagesOptions(@NotNull Project project) {
     super(project);
index ad9897ae8c31495ae36ec4bdf1fd9872488ffb96..ccab96611fcfef1c069aebe597b20d85e4416054 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -48,8 +48,8 @@ public class InputVariables {
   private ParametersFolder myFolding;
   private boolean myFoldingAvailable;
 
-  private Set<PsiField> myUsedInstanceFields = null;
-  private boolean       myPassFields = false;
+  private Set<PsiField> myUsedInstanceFields;
+  private boolean       myPassFields;
 
   public InputVariables(final List<? extends PsiVariable> inputVariables,
                         Project project,
index b7e0e48f8c4b5bd2ceb2ca8c3715db9c4402c555..3cf591b9d34ad363e708d5d6573a7afbc8e87294 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ public class ParametersFolder {
   private final Set<String> myUsedNames = new HashSet<String>();
 
   private final Set<PsiVariable> myDeleted = new HashSet<PsiVariable>();
-  private boolean myFoldingSelectedByDefault = false;
+  private boolean myFoldingSelectedByDefault;
 
 
   public void clear() {
index c34982debacff130aa08b073bc7634409d916398..99d7bdeb25fae008fbc107cc83cd8c073b71a6f7 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ public class DuplicatesFinder {
   private final InputVariables myParameters;
   private final List<? extends PsiVariable> myOutputParameters;
   private final List<PsiElement> myPatternAsList;
-  private boolean myMultipleExitPoints = false;
+  private boolean myMultipleExitPoints;
   @Nullable private final ReturnValue myReturnValue;
 
   public DuplicatesFinder(PsiElement[] pattern,
index 10a3238ae7b674ca635e41df3fe74c846f0c3cfe..5d3cb6f9f8029fb2c89eee926d1f008580fa1f2e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -51,8 +51,8 @@ public final class Match {
   private final Map<PsiVariable, List<PsiElement>> myParameterValues = new HashMap<PsiVariable, List<PsiElement>>();
   private final Map<PsiVariable, ArrayList<PsiElement>> myParameterOccurrences = new HashMap<PsiVariable, ArrayList<PsiElement>>();
   private final Map<PsiElement, PsiElement> myDeclarationCorrespondence = new HashMap<PsiElement, PsiElement>();
-  private ReturnValue myReturnValue = null;
-  private Ref<PsiExpression> myInstanceExpression = null;
+  private ReturnValue myReturnValue;
+  private Ref<PsiExpression> myInstanceExpression;
   final Map<PsiVariable, PsiType> myChangedParams = new HashMap<PsiVariable, PsiType>();
   private final boolean myIgnoreParameterTypes;
 
index 95b93d9f90287117c81bb0ff973950f4f6d1fff5..a10e0d59fdba80719d882e9d7ad8cf15b088aee5 100644 (file)
@@ -21,24 +21,24 @@ package org.jetbrains.java.generate.config;
  */
 public class Config {
 
-    public boolean useFullyQualifiedName = false;
+    public boolean useFullyQualifiedName;
     public InsertWhere insertNewMethodOption = InsertWhere.AT_CARET;
     public DuplicationPolicy whenDuplicatesOption = DuplicationPolicy.ASK;
     public boolean filterConstantField = true;
-    public boolean filterEnumField = false;
-    public boolean filterTransientModifier = false;
+    public boolean filterEnumField;
+    public boolean filterTransientModifier;
     public boolean filterStaticModifier = true;
-    public String filterFieldName = null;
-    public String filterMethodName = null;
-    public String filterMethodType = null;
-    public String filterFieldType = null;
+    public String filterFieldName;
+    public String filterMethodName;
+    public String filterMethodType;
+    public String filterFieldType;
     public boolean filterLoggers = true;
-    public boolean addImplementSerializable = false;
-    public boolean enableMethods = false;
+    public boolean addImplementSerializable;
+    public boolean enableMethods;
     public boolean jumpToMethod = true; // jump cursor to toString method
-    public int sortElements = 0; // 0 = none, 1 = asc, 2 = desc
+    public int sortElements; // 0 = none, 1 = asc, 2 = desc
 
-    private FilterPattern myPattern = null;
+    private FilterPattern myPattern;
 
     public boolean isUseFullyQualifiedName() {
         return useFullyQualifiedName;
index e56ac4f3d0ee22df93e75619ce5a493964e5298d..c91c6abba82038a43db98fd3fed8881ffd8a1339 100644 (file)
@@ -51,10 +51,10 @@ public class FilterPattern {
     private boolean transientModifier;
     private boolean enumField;
     private boolean loggers;
-    private Pattern methodNamePattern = null;
-    private Pattern methodTypePattern = null;
-    private Pattern fieldNamePattern = null;
-    private Pattern fieldTypePattern = null;
+    private Pattern methodNamePattern;
+    private Pattern methodTypePattern;
+    private Pattern fieldNamePattern;
+    private Pattern fieldTypePattern;
 
   public boolean fieldMatches(PsiField field) {
     if (isConstantField() && PsiAdapter.isConstantField(field)) {
index a5359d5a1392c27b327db9fa6e4348ff51be3dad..3100c9fca2bb151ee11587f664b87765e7b592b6 100644 (file)
@@ -53,13 +53,13 @@ public class ClassHasNoToStringMethodInspection extends AbstractToStringInspecti
     /** User options for excluded deprecated classes */
     public boolean excludeDeprecated = true; // must be public for JDOMSerialization
     /** User options for excluded enum classes */
-    public boolean excludeEnum = false; // must be public for JDOMSerialization
+    public boolean excludeEnum; // must be public for JDOMSerialization
     /** User options for excluded abstract classes */
-    public boolean excludeAbstract = false; // must be public for JDOMSerialization
+    public boolean excludeAbstract; // must be public for JDOMSerialization
 
-    public boolean excludeTestCode = false;
+    public boolean excludeTestCode;
 
-    public boolean excludeInnerClasses = false;
+    public boolean excludeInnerClasses;
 
   public ClassHasNoToStringMethodInspection() {
     try {
index 3326e97fe2f6407839b966f38a673a8bc4646da9..7a22d4754c946a8683e97fa882c601e4f72b6f85 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -34,7 +34,7 @@ import java.util.TreeMap;
 
 public class HyperlinksToClassesOption extends PrintOption {
   private JCheckBox myCbGenerateHyperlinksToClasses;
-  private boolean isGenerateHyperlinksToClasses = false;
+  private boolean isGenerateHyperlinksToClasses;
 
   @Nullable
   public TreeMap<Integer, PsiReference> collectReferences(PsiFile psiFile, Map<PsiFile, PsiFile> filesMap) {
index 2a87f9fc8e291470edff515684b4314f8a84eda8..99247cfd287f6a2916977ed02379077999732190 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -154,7 +154,7 @@ public class AllClassesGetter {
     int limit = Registry.intValue("ide.completion.variant.limit");
 
     Processor<PsiClass> processor = new Processor<PsiClass>() {
-      int count = 0;
+      int count;
       final Set<String> qNames = new THashSet<String>();
       final boolean pkgContext = JavaCompletionUtil.inSomePackage(context);
       final String packagePrefix = getPackagePrefix(context, parameters.getOffset());
index f665920528d22426683f26c2247ee682c6b281f8..6589f4a815e3dccad57cdabe0f793345baa871d9 100644 (file)
@@ -1,3 +1,18 @@
+/*
+ * Copyright 2000-2016 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.intellij.codeInsight.completion;
 
 import com.intellij.codeInsight.lookup.LookupElementPresentation;
@@ -16,7 +31,7 @@ public class MemberLookupHelper {
   private final PsiMember myMember;
   private final boolean myMergedOverloads;
   @Nullable private final PsiClass myContainingClass;
-  private boolean myShouldImport = false;
+  private boolean myShouldImport;
 
   public MemberLookupHelper(List<PsiMethod> overloads, PsiClass containingClass, boolean shouldImport) {
     this(overloads.get(0), containingClass, shouldImport, true);
index e79fe27ac5c23fdeebbafd4afeebc709aa68f1e5..5a152a7c6eafba5abf74453463814a7f40f43e8d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,7 +30,10 @@ import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+import java.util.Set;
 
 /**
 * @author peter
@@ -40,7 +43,7 @@ public abstract class StaticMemberProcessor {
   private final PsiElement myPosition;
   private final Project myProject;
   private final PsiResolveHelper myResolveHelper;
-  private boolean myHintShown = false;
+  private boolean myHintShown;
   private final boolean myPackagedContext;
 
   public StaticMemberProcessor(final PsiElement position) {
index 152f82650739857bd0ef69ef1dd345dd44bc661f..6a681fd182d28cbab5ebd699c3eef48d40cf7df0 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -50,8 +50,8 @@ import java.util.Set;
 public class JavaCompletionProcessor extends BaseScopeProcessor implements ElementClassHint {
 
   private final boolean myInJavaDoc;
-  private boolean myStatic = false;
-  private PsiElement myDeclarationHolder = null;
+  private boolean myStatic;
+  private PsiElement myDeclarationHolder;
   private final Map<CompletionElement, CompletionElement> myResults = new LinkedHashMap<>();
   private final Set<CompletionElement> mySecondRateResults = ContainerUtil.newIdentityTroveSet();
   private final Set<String> myShadowedNames = ContainerUtil.newHashSet();
@@ -60,10 +60,10 @@ public class JavaCompletionProcessor extends BaseScopeProcessor implements Eleme
   private final PsiElement myElement;
   private final PsiElement myScope;
   private final ElementFilter myFilter;
-  private boolean myMembersFlag = false;
-  private boolean myQualified = false;
-  private PsiType myQualifierType = null;
-  private PsiClass myQualifierClass = null;
+  private boolean myMembersFlag;
+  private boolean myQualified;
+  private PsiType myQualifierType;
+  private PsiClass myQualifierClass;
   private final Condition<String> myMatcher;
   private final Options myOptions;
   private final boolean myAllowStaticWithInstanceQualifier;
index 1c6fd53e460f1a1a81f802721b48b36f2d01d7a8..ce0ee8fefe916639d39bb155c78b8ca5e03413cd 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,7 +27,6 @@ import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
 import com.intellij.psi.*;
 import com.intellij.ui.popup.list.ListPopupImpl;
 import com.intellij.util.IncorrectOperationException;
-import com.intellij.util.ObjectUtils;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.TestOnly;
 
@@ -42,7 +41,7 @@ public class AddMethodQualifierFix implements IntentionAction {
   private static final boolean UNIT_TEST_MODE = ApplicationManager.getApplication().isUnitTestMode();
 
   private final SmartPsiElementPointer<PsiMethodCallExpression> myMethodCall;
-  private List<PsiVariable> myCandidates = null;
+  private List<PsiVariable> myCandidates;
 
   public AddMethodQualifierFix(final PsiMethodCallExpression methodCallExpression) {
     myMethodCall = SmartPointerManager.getInstance(methodCallExpression.getProject()).createSmartPsiElementPointer(methodCallExpression);
index dce0d54e405b5361be449f40c262d7a976f0328e..1462dc3d28972fd6da683bc98d24dd272dc4950f 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.daemon.QuickFixBundle;
index 277342155f6196298fdc5148fc0bf9b3bc9c00a4..40093816e2e1e76dfd1a4ad85ff131cf69d2f6c5 100644 (file)
@@ -125,7 +125,7 @@ public class ChangeMethodSignatureFromUsageFix implements IntentionAction/*, Hig
     StringBuilder result = new StringBuilder();
     try {
       for (ParameterInfoImpl info : infos) {
-        PsiType type = info.createType(context, context.getManager());
+        PsiType type = info.createType(context);
         if (type == null) return null;
         if (result.length() != 0) result.append(", ");
         result.append(type.getPresentableText());
index 6d414e5e4750c8d1e9982d5c3f45c7fda5aa95b9..5e91052a46ebdc369fa27b36884bc2ea43798950 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: cdr
- * Date: Nov 13, 2002
- * Time: 3:26:50 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.CodeInsightUtil;
index 97bb45cb531c89ffad0b4fb9da9b734eda1472a3..91732b67b6ad6a20963231ea268b7a31d4ac7ec1 100644 (file)
@@ -371,7 +371,7 @@ public class CreateConstructorParameterFromFieldFix implements IntentionAction {
     for (int i = 0; i < newParameters.length; i++) {
       if (parameterInfos[i].getOldIndex() == -1) {
         final PsiParameter parameter = newParameters[i];
-        final PsiType paramType = parameterInfos[i].getTypeWrapper().getType(parameter, parameter.getManager());
+        final PsiType paramType = parameterInfos[i].getTypeWrapper().getType(parameter);
         if (type.isAssignableFrom(paramType)){
           return parameter;
         }
index dcae6c51d727155cb25024b84de08665166592fa..08822884965b3d88b62b6d74bf1f7667dad8efa6 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * Created by IntelliJ IDEA.
- * User: cdr
- * Date: Nov 19, 2002
- * Time: 12:03:39 PM
- * To change this template use Options | File Templates.
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.FileModificationService;
index a418efb4da15bc3968251c5a99a726a8d6cdc86e..b9dc50f31d7890c24f8f5cc07a2363b1e7745181 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.FileModificationService;
index 82cca2862eac6dc62532202465b4490718884bb0..c6ecd4b31013e22df39d9a0c19ed869d72ffb2fb 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,7 +102,7 @@ public class RenameWrongRefFix implements IntentionAction {
       class MyScopeProcessor extends BaseScopeProcessor {
         ArrayList<PsiElement> myResult = new ArrayList<PsiElement>();
         boolean myFilterMethods;
-        boolean myFilterStatics = false;
+        boolean myFilterStatics;
 
         MyScopeProcessor(PsiReferenceExpression refExpression) {
           myFilterMethods = refExpression.getParent() instanceof PsiMethodCallExpression;
index b0264dc22c5244abbb41f0cf30b20818d6a79f45..5a48b1abb2c97a4af655f45a426d94ed4484d440 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,7 +39,7 @@ import org.jetbrains.annotations.NotNull;
 public class SurroundWithTryCatchFix implements IntentionAction {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.daemon.impl.quickfix.SurroundWithTryCatchFix");
 
-  private PsiElement myStatement = null;
+  private PsiElement myStatement;
 
   public SurroundWithTryCatchFix(@NotNull PsiElement element) {
     final PsiFunctionalExpression functionalExpression = PsiTreeUtil.getParentOfType(element, PsiFunctionalExpression.class, false, PsiStatement.class);
index f361a95e1cf7be5530ddcda581a961384dce099f..cc7602917cc8b42c96d199809f38f9ec22b08639 100644 (file)
@@ -30,8 +30,8 @@ class SwitchStatementBranch {
     new ArrayList<PsiElement>(5);
   private final List<PsiElement> m_pendingWhiteSpace =
     new ArrayList<PsiElement>(2);
-  private boolean m_default = false;
-  private boolean m_hasStatements = false;
+  private boolean m_default;
+  private boolean m_hasStatements;
 
   public void addCaseValue(String labelString) {
     m_caseValues.add(labelString);
index 0e2a3de309334ae5dabdeba43ecee3e9f5e7fd41..2a7c9f38283d5bab83b81f8a679a9d8cbdb69a2c 100644 (file)
@@ -45,7 +45,7 @@ import org.jetbrains.annotations.TestOnly;
 import java.util.List;
 
 public class AutoFormatTypedHandler extends TypedActionHandlerBase {
-  private static boolean myIsEnabledInTests = false;
+  private static boolean myIsEnabledInTests;
   
   private static char[] NO_SPACE_AFTER = { 
     '+', '-', '*', '/', '%', '&', '^', '|', '<', '>', '!', '=', ' ' 
index 3b56a946e281e12454626407432fc03fc2536a53..4d2d0e5c56b4ad84e43998b7712d1aa147eea802 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -38,7 +38,7 @@ import java.util.List;
 class DeclarationMover extends LineMover {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.actions.moveUpDown.DeclarationMover");
   private PsiEnumConstant myEnumToInsertSemicolonAfter;
-  private boolean moveEnumConstant = false;
+  private boolean moveEnumConstant;
 
   @Override
   public void beforeMove(@NotNull final Editor editor, @NotNull final MoveInfo info, final boolean down) {
index 6028ec3d564cff03eaf33d17364bbc890b997a85..30071b845e9db3bfdaccbe0a53ee4c06fc8c2464 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ import java.util.*;
  */
 public class GenerateDelegateHandler implements LanguageCodeInsightActionHandler {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.GenerateDelegateHandler");
-  private boolean myToCopyJavaDoc = false;
+  private boolean myToCopyJavaDoc;
 
   @Override
   public boolean isValidFor(Editor editor, PsiFile file) {
index b8f5a477097d013c1a1baf807126c176b52856a5..55e6aac1da513fc2a9f645a0d07ea7b9f68b565c 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2014 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,9 +37,9 @@ import java.util.List;
  */
 public class GenerateEqualsHandler extends GenerateMembersHandlerBase {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.GenerateEqualsHandler");
-  private PsiField[] myEqualsFields = null;
-  private PsiField[] myHashCodeFields = null;
-  private PsiField[] myNonNullFields = null;
+  private PsiField[] myEqualsFields;
+  private PsiField[] myHashCodeFields;
+  private PsiField[] myNonNullFields;
   private static final PsiElementClassMember[] DUMMY_RESULT = new PsiElementClassMember[1]; //cannot return empty array, but this result won't be used anyway
 
   public GenerateEqualsHandler() {
index 8e674adca489fc67deff99ddab613bc4d838d1d6..1f9e4a55ad836f95bc75c6bdc0685fa08028de70 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@ public abstract class GenerateMembersHandlerBase implements CodeInsightActionHan
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.generation.GenerateMembersHandlerBase");
 
   private final String myChooserTitle;
-  protected boolean myToCopyJavaDoc = false;
+  protected boolean myToCopyJavaDoc;
 
   public GenerateMembersHandlerBase(String chooserTitle) {
     myChooserTitle = chooserTitle;
index 81a98e94a16093ccd9c006f143df2a9cc8a6e5f1..d88bb8d5e3e78f0a5a59ef60544da39662e8efcd 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.generation.actions;
 
 import com.intellij.codeInsight.CodeInsightActionHandler;
 import com.intellij.codeInsight.CodeInsightUtilBase;
 import com.intellij.codeInsight.CodeInsightUtilCore;
 import com.intellij.codeInsight.generation.OverrideImplementUtil;
-import com.intellij.openapi.project.Project;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.ScrollType;
-import com.intellij.openapi.diagnostic.Logger;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.IncorrectOperationException;
index 43924d9199c3957a404477b3bd73829176ec7761..691e9a36831ea6d64f5d086c0924527109f48b29 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -33,7 +33,7 @@ import java.util.Collections;
  * @author ven
  */
 public class JavaExpressionSurroundDescriptor implements SurroundDescriptor {
-  private Surrounder[] mySurrounders = null;
+  private Surrounder[] mySurrounders;
 
   private static final Surrounder[] SURROUNDERS = {
     new JavaWithParenthesesSurrounder(),
index 996d61483451d3ff15ce25fa68216bd0d8c4b7e1..482ffd851162c5780982be3f52bc967d223b77e4 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,7 +32,7 @@ import java.util.Collections;
 import java.util.List;
 
 public class JavaWithTryCatchSurrounder extends JavaStatementsSurrounder {
-  protected boolean myGenerateFinally = false;
+  protected boolean myGenerateFinally;
 
   @Override
   public String getTemplateDescription() {
index 71e301aa91f63d12ccc5d6f62a3779284a54d4dd..9ae19918b5c28bafa9d2824fca443fd0e62b450d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,7 +40,7 @@ public class HighlightImportedElementsHandler extends HighlightUsagesHandlerBase
   private final PsiElement myTarget;
   private final PsiImportStatementBase myImportStatement;
   private final boolean myImportStatic;
-  private Map<PsiMember,List<PsiElement>> myClassReferenceListMap = null;
+  private Map<PsiMember,List<PsiElement>> myClassReferenceListMap;
 
   public HighlightImportedElementsHandler(Editor editor, PsiFile file, PsiElement target, PsiImportStatementBase importStatement) {
     super(editor, file);
index cc6687acbcb4e50952e63eb6a8b8b8b454c82869..aa36b456f33d1a9eab345f2cc8649a0ba04fe92a 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -146,7 +146,7 @@ public class AddOnDemandStaticImportAction extends BaseElementAtCaretIntentionAc
 
       final TIntArrayList expressionToDequalifyOffsets = new TIntArrayList();
       copy.accept(new JavaRecursiveElementWalkingVisitor() {
-        int delta = 0;
+        int delta;
         @Override
         public void visitReferenceElement(PsiJavaCodeReferenceElement expression) {
           if (isParameterizedReference(expression)) return;
index 52deff695f95593e090a92d35f2242835a9a93d6..60b33eb24b6439fa3db0ea00fb61c7f005fd1f1d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2015 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,7 @@ import java.util.List;
 
 public class DeannotateIntentionAction implements IntentionAction, LowPriorityAction {
   private static final Logger LOG = Logger.getInstance("#" + DeannotateIntentionAction.class.getName());
-  private String myAnnotationName = null;
+  private String myAnnotationName;
 
   @Override
   @NotNull
index 14a85ef7e348492d0e3a2f9fcd950dd2cc9a12bb..a612a87b331203efa211906d07d04e3583bb808d 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -116,7 +116,7 @@ public class ReplaceCastWithVariableAction extends PsiElementBaseIntentionAction
 
     scope.accept(
       new JavaRecursiveElementWalkingVisitor() {
-        private boolean inScope = false;
+        private boolean inScope;
 
         @Override
         public void visitElement(PsiElement element) {
index 3ae3ddcf7498f1fdab3dca6f30168aefce2f7d0c..a977ab7202e87ca06907da8cd397a5d25a248175 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2016 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-/**
- * @author cdr
- */
 package com.intellij.codeInsight.intention.impl;
 
 import com.intellij.codeInsight.FileModificationService;
index 2627ca9417afe9988cafbe2f8e348974a6442248..639004bf4586e9b16af7aa704cab40aac3956fb0 100644 (file)
@@ -29,7 +29,6 @@ import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileEditor.FileEditorManager;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.vcs.FileStatus;
@@ -75,8 +74,6 @@ import java.util.*;
 public class UnusedDeclarationPresentation extends DefaultInspectionToolPresentation {
   private final Map<String, Set<RefEntity>> myPackageContents = Collections.synchronizedMap(new HashMap<String, Set<RefEntity>>());
 
-  private Map<String, Set<RefEntity>> myOldPackageContents = null;
-
   private final Set<RefEntity> myIgnoreElements = new HashSet<RefEntity>();
   private WeakUnreferencedFilter myFilter;
   private DeadHTMLComposer myComposer;
@@ -376,27 +373,7 @@ public class UnusedDeclarationPresentation extends DefaultInspectionToolPresenta
 
   @Override
   public boolean hasReportedProblems() {
-    final GlobalInspectionContextImpl context = getContext();
-    if (!isDisposed() && context.getUIOptions().SHOW_ONLY_DIFF){
-      return containsOnlyDiff(myPackageContents) ||
-             myOldPackageContents != null && containsOnlyDiff(myOldPackageContents);
-    }
-    if (!myPackageContents.isEmpty()) return true;
-    return isOldProblemsIncluded() && !myOldPackageContents.isEmpty();
-  }
-
-  private boolean containsOnlyDiff(@NotNull Map<String, Set<RefEntity>> packageContents) {
-    for (String packageName : packageContents.keySet()) {
-      final Set<RefEntity> refElements = packageContents.get(packageName);
-      if (refElements != null){
-        for (RefEntity refElement : refElements) {
-          if (getElementStatus(refElement) != FileStatus.NOT_CHANGED){
-            return true;
-          }
-        }
-      }
-    }
-    return false;
+    return !myPackageContents.isEmpty();
   }
 
   @NotNull
@@ -405,11 +382,6 @@ public class UnusedDeclarationPresentation extends DefaultInspectionToolPresenta
     return myPackageContents;
   }
 
-  @Override
-  public Map<String, Set<RefEntity>> getOldContent() {
-    return myOldPackageContents;
-  }
-
   @Override
   public void ignoreCurrentElement(RefEntity refEntity) {
     if (refEntity == null) return;
@@ -424,7 +396,6 @@ public class UnusedDeclarationPresentation extends DefaultInspectionToolPresenta
   @Override
   public void cleanup() {
     super.cleanup();
-    myOldPackageContents = null;
     myPackageContents.clear();
     myIgnoreElements.clear();
   }
@