diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerContentIterator.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerContentIterator.java index 8c879d72d895..b7adfbc2a0ca 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerContentIterator.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerContentIterator.java @@ -29,9 +29,9 @@ public class CompilerContentIterator implements ContentIterator { private final FileType myFileType; private final FileIndex myFileIndex; private final boolean myInSourceOnly; - private final Collection myFiles; + private final Collection myFiles; - public CompilerContentIterator(FileType fileType, FileIndex fileIndex, boolean inSourceOnly, Collection files) { + public CompilerContentIterator(FileType fileType, FileIndex fileIndex, boolean inSourceOnly, Collection files) { myFileType = fileType; myFileIndex = fileIndex; myInSourceOnly = inSourceOnly; diff --git a/java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java b/java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java index 6d8d71c2a820..f9ed6ea46165 100644 --- a/java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java +++ b/java/execution/impl/src/com/intellij/execution/junit/RefactoringListeners.java @@ -93,10 +93,10 @@ public class RefactoringListeners { private static abstract class RenameElement extends RefactoringElementAdapter implements UndoRefactoringElementListener{ - private final Accessor myAccessor; + private final Accessor myAccessor; private final String myPath; - RenameElement(final Accessor accessor, final String path) { + RenameElement(final Accessor accessor, final String path) { myAccessor = accessor; myPath = path; } @@ -129,7 +129,7 @@ public class RefactoringListeners { } private static class RefactorPackage extends RenameElement { - RefactorPackage(final Accessor accessor, final String path) { + RefactorPackage(final Accessor accessor, final String path) { super(accessor, path); } @@ -145,7 +145,7 @@ public class RefactoringListeners { } private static class RefactorClass extends RenameElement { - RefactorClass(final Accessor accessor, final String path) { + RefactorClass(final Accessor accessor, final String path) { super(accessor, path); } @@ -167,7 +167,7 @@ public class RefactoringListeners { } public static class RefactorPackageByClass extends RenameElement { - public RefactorPackageByClass(final Accessor accessor) { + public RefactorPackageByClass(final Accessor accessor) { super(accessor, "*"); } diff --git a/java/execution/impl/src/com/intellij/execution/junit2/info/MethodLocation.java b/java/execution/impl/src/com/intellij/execution/junit2/info/MethodLocation.java index 5d77f6d68306..88776dd73fc3 100644 --- a/java/execution/impl/src/com/intellij/execution/junit2/info/MethodLocation.java +++ b/java/execution/impl/src/com/intellij/execution/junit2/info/MethodLocation.java @@ -35,9 +35,9 @@ public class MethodLocation extends Location { private static final Logger LOG = Logger.getInstance("#com.intellij.execution.junit2.info.MethodLocation"); private final Project myProject; @NotNull private final PsiMethod myMethod; - private final Location myClassLocation; + private final Location myClassLocation; - public MethodLocation(@NotNull final Project project, @NotNull final PsiMethod method, @NotNull final Location classLocation) { + public MethodLocation(@NotNull final Project project, @NotNull final PsiMethod method, @NotNull final Location classLocation) { myProject = project; myMethod = method; myClassLocation = classLocation; diff --git a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/TestMethodUsage.java b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/TestMethodUsage.java index 4bf3ab0ef403..fee906358cec 100644 --- a/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/TestMethodUsage.java +++ b/java/execution/impl/src/com/intellij/execution/testDiscovery/actions/TestMethodUsage.java @@ -37,12 +37,12 @@ class TestMethodUsage implements Usage, UsageInFile, UsageInModule, PsiElementUs @NotNull private final Collection myParameters; @NotNull - private final SmartPsiElementPointer myTestMethodPointer; + private final SmartPsiElementPointer myTestMethodPointer; @Nullable - private final SmartPsiElementPointer myTestClassPointer; + private final SmartPsiElementPointer myTestClassPointer; - TestMethodUsage(@NotNull SmartPsiElementPointer testMethod, - @NotNull SmartPsiElementPointer testClass, + TestMethodUsage(@NotNull SmartPsiElementPointer testMethod, + @NotNull SmartPsiElementPointer testClass, @NotNull Collection parameters) { myTestMethodPointer = testMethod; myTestClassPointer = parameters.isEmpty() ? null : testClass; diff --git a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java index 579df6f74eda..a29c31aa73de 100644 --- a/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java +++ b/java/execution/impl/src/com/intellij/execution/ui/ConfigurationModuleSelector.java @@ -42,13 +42,13 @@ public class ConfigurationModuleSelector { /** this field is {@code null} if and only if {@link #myModulesList} is not null */ private final ModuleDescriptionsComboBox myModulesDescriptionsComboBox; /** this field is {@code null} if and only if {@link #myModulesDescriptionsComboBox} is not null */ - private final JComboBox myModulesList; + private final JComboBox myModulesList; /** * @deprecated use {@link #ConfigurationModuleSelector(Project, ModulesComboBox)} instead */ @Deprecated - public ConfigurationModuleSelector(final Project project, final JComboBox modulesList) { + public ConfigurationModuleSelector(final Project project, final JComboBox modulesList) { this(project, modulesList, NO_MODULE_TEXT); } @@ -78,7 +78,7 @@ public class ConfigurationModuleSelector { * @deprecated use {@link #ConfigurationModuleSelector(Project, ModulesComboBox, String)} instead */ @Deprecated - public ConfigurationModuleSelector(final Project project, final JComboBox modulesList, final String noModule) { + public ConfigurationModuleSelector(final Project project, final JComboBox modulesList, final String noModule) { myProject = project; myModulesList = modulesList; myModulesDescriptionsComboBox = null; diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java index 095f3c91a685..bfb572214565 100644 --- a/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java +++ b/java/idea-ui/src/com/intellij/ide/util/importProject/ModuleInsight.java @@ -61,7 +61,7 @@ public abstract class ModuleInsight { setRoots(Collections.emptyList(), Collections.emptyList(), Collections.emptySet()); } - public final void setRoots(final List contentRoots, final List sourceRoots, final Set ignoredNames) { + public final void setRoots(final List contentRoots, final List sourceRoots, final Set ignoredNames) { myModules = null; myLibraries = null; diff --git a/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java b/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java index 49b2b966a03d..d62e11d5d12f 100644 --- a/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java +++ b/java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java @@ -133,7 +133,7 @@ abstract class ProjectLayoutPanel extends JPanel { return list; } - public final Collection getDependencies(final List entries) { + public final Collection getDependencies(final List entries) { final Set deps = new HashSet(); for (T et : entries) { deps.addAll(getDependencies(et)); diff --git a/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java b/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java index f2246ff94066..cb6f70dfc9e1 100644 --- a/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/projectWizard/SdkSettingsStep.java @@ -55,14 +55,14 @@ public class SdkSettingsStep extends ModuleWizardStep { private final JPanel myJdkPanel; public SdkSettingsStep(SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder, - @NotNull Condition sdkTypeIdFilter) { + @NotNull Condition sdkTypeIdFilter) { this(settingsStep, moduleBuilder, sdkTypeIdFilter, null); } public SdkSettingsStep(SettingsStep settingsStep, @NotNull ModuleBuilder moduleBuilder, - @NotNull Condition sdkTypeIdFilter, - @Nullable Condition sdkFilter) { + @NotNull Condition sdkTypeIdFilter, + @Nullable Condition sdkFilter) { this(settingsStep.getContext(), moduleBuilder, sdkTypeIdFilter, sdkFilter); if (!isEmpty()) { settingsStep.addSettingsField(getSdkFieldLabel(settingsStep.getContext().getProject()), myJdkPanel); @@ -71,8 +71,8 @@ public class SdkSettingsStep extends ModuleWizardStep { public SdkSettingsStep(WizardContext context, @NotNull ModuleBuilder moduleBuilder, - @NotNull Condition sdkTypeIdFilter, - @Nullable Condition sdkFilter) { + @NotNull Condition sdkTypeIdFilter, + @Nullable Condition sdkFilter) { myModuleBuilder = moduleBuilder; myWizardContext = context; diff --git a/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java b/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java index 289e46892000..5a402afc57ae 100644 --- a/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java +++ b/java/idea-ui/src/com/intellij/jarRepository/JarRepositoryManager.java @@ -160,7 +160,7 @@ public class JarRepositoryManager { } @NotNull - protected static NewLibraryConfiguration createNewLibraryConfiguration(RepositoryLibraryProperties props, Collection roots) { + protected static NewLibraryConfiguration createNewLibraryConfiguration(RepositoryLibraryProperties props, Collection roots) { return new NewLibraryConfiguration( RepositoryLibraryDescription.findDescription(props).getDisplayName(props.getVersion()), RepositoryLibraryType.getInstance(), diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java index bf88b1c25d2e..7132dd6ae366 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JdkComboBox.java @@ -56,25 +56,25 @@ public class JdkComboBox extends ComboBoxWithWidePopup myFilter; + private final Condition myFilter; @Nullable private final Condition myCreationFilter; private JButton mySetUpButton; - private final Condition mySdkTypeFilter; + private final Condition mySdkTypeFilter; public JdkComboBox(@NotNull final ProjectSdksModel jdkModel) { this(jdkModel, null); } public JdkComboBox(@NotNull final ProjectSdksModel jdkModel, - @Nullable Condition filter) { + @Nullable Condition filter) { this(jdkModel, filter, getSdkFilter(filter), filter, false); } public JdkComboBox(@NotNull final ProjectSdksModel jdkModel, - @Nullable Condition sdkTypeFilter, - @Nullable Condition filter, - @Nullable Condition creationFilter, + @Nullable Condition sdkTypeFilter, + @Nullable Condition filter, + @Nullable Condition creationFilter, boolean addSuggestedItems) { super(new JdkComboBoxModel(jdkModel, sdkTypeFilter, filter, addSuggestedItems)); myFilter = filter; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorSettings.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorSettings.java index 67aa5d652d02..891489ded766 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorSettings.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorSettings.java @@ -23,7 +23,7 @@ public class ArtifactEditorSettings implements PersistentStateComponent> typesToShowContent) { + public ArtifactEditorSettings(boolean sortElements, Collection> typesToShowContent) { mySortElements = sortElements; myTypesToShowContent.addAll(typesToShowContent); } diff --git a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Data.java b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Data.java index c34746d73f2d..79d1ed68084b 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Data.java +++ b/java/java-analysis-impl/src/com/intellij/codeInspection/bytecodeAnalysis/Data.java @@ -93,10 +93,10 @@ final class Equation { } class Equations { - @NotNull final List results; + @NotNull final List results; final boolean stable; - Equations(@NotNull List results, boolean stable) { + Equations(@NotNull List results, boolean stable) { this.results = results; this.stable = stable; } diff --git a/java/java-impl/src/com/intellij/codeInsight/completion/JavaGlobalMemberLookupElement.java b/java/java-impl/src/com/intellij/codeInsight/completion/JavaGlobalMemberLookupElement.java index 57b19df14f3b..7109069d3377 100644 --- a/java/java-impl/src/com/intellij/codeInsight/completion/JavaGlobalMemberLookupElement.java +++ b/java/java-impl/src/com/intellij/codeInsight/completion/JavaGlobalMemberLookupElement.java @@ -24,7 +24,7 @@ public class JavaGlobalMemberLookupElement extends LookupElement implements Stat private final InsertHandler myQualifiedInsertion; private final InsertHandler myImportInsertion; - public JavaGlobalMemberLookupElement(List overloads, + public JavaGlobalMemberLookupElement(List overloads, PsiClass containingClass, InsertHandler qualifiedInsertion, InsertHandler importInsertion, boolean shouldImport) { diff --git a/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java index 296dfb9efe2c..1103456c90fd 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/changeClassSignature/ChangeClassSignatureDialog.java @@ -86,7 +86,7 @@ public class ChangeClassSignatureDialog extends RefactoringDialog { } public ChangeClassSignatureDialog(@NotNull PsiClass aClass, - @NotNull List parameters, + @NotNull List parameters, boolean hideDefaultValueColumn) { super(aClass.getProject(), true); myHideDefaultValueColumn = hideDefaultValueColumn; diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/AbstractJavaMemberCallerChooser.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/AbstractJavaMemberCallerChooser.java index 96316954e5cb..0cee4e56686d 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/AbstractJavaMemberCallerChooser.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/AbstractJavaMemberCallerChooser.java @@ -28,7 +28,7 @@ import java.util.Set; public abstract class AbstractJavaMemberCallerChooser extends CallerChooserBase { - public AbstractJavaMemberCallerChooser(M member, Project project, @Nls(capitalization = Nls.Capitalization.Title) String title, Tree previousTree, Consumer> callback) { + public AbstractJavaMemberCallerChooser(M member, Project project, @Nls(capitalization = Nls.Capitalization.Title) String title, Tree previousTree, Consumer> callback) { super(member, project, title, previousTree, "dummy." + StdFileTypes.JAVA.getDefaultExtension(), callback); } diff --git a/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/JavaCallerChooser.java b/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/JavaCallerChooser.java index eee0549afa75..8452d3525e6f 100644 --- a/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/JavaCallerChooser.java +++ b/java/java-impl/src/com/intellij/refactoring/changeSignature/inCallers/JavaCallerChooser.java @@ -31,7 +31,7 @@ public class JavaCallerChooser extends AbstractJavaMemberCallerChooser> callback) { + Consumer> callback) { super(method, project, title, previousTree, callback); } diff --git a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java index cd34566537f4..a075ce4f3622 100644 --- a/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/inheritanceToDelegation/InheritanceToDelegationProcessor.java @@ -940,10 +940,10 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor { } private class MyClassInheritorMemberReferencesVisitor extends ClassMemberReferencesVisitor { - private final List myUsageInfoStorage; + private final List myUsageInfoStorage; private final ClassInstanceScanner.ClassInstanceReferenceVisitor myInstanceVisitor; - MyClassInheritorMemberReferencesVisitor(PsiClass aClass, List usageInfoStorage, + MyClassInheritorMemberReferencesVisitor(PsiClass aClass, List usageInfoStorage, ClassInstanceScanner.ClassInstanceReferenceVisitor instanceScanner) { super(aClass); @@ -987,7 +987,7 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor { } private class MyClassMemberReferencesVisitor extends MyClassInheritorMemberReferencesVisitor { - MyClassMemberReferencesVisitor(List usageInfoStorage, + MyClassMemberReferencesVisitor(List usageInfoStorage, ClassInstanceScanner.ClassInstanceReferenceVisitor instanceScanner) { super(InheritanceToDelegationProcessor.this.myClass, usageInfoStorage, instanceScanner); } @@ -1146,10 +1146,10 @@ public class InheritanceToDelegationProcessor extends BaseRefactoringProcessor { private final class MyClassInstanceReferenceVisitor implements ClassInstanceScanner.ClassInstanceReferenceVisitor { private final PsiClass myClass; - private final List myUsageInfoStorage; + private final List myUsageInfoStorage; private final Set myImplementedInterfaces; - MyClassInstanceReferenceVisitor(PsiClass aClass, List usageInfoStorage) { + MyClassInstanceReferenceVisitor(PsiClass aClass, List usageInfoStorage) { myClass = aClass; myUsageInfoStorage = usageInfoStorage; myImplementedInterfaces = getImplementedInterfaces(); diff --git a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java index 908f8e0fb727..c243f3affec0 100644 --- a/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/introduceParameter/IntroduceParameterDialog.java @@ -31,7 +31,7 @@ public class IntroduceParameterDialog extends RefactoringDialog { private final Project myProject; private final PsiFile myFile; - private final List myClassMembersList; + private final List myClassMembersList; private final int myOccurenceNumber; private final PsiMethod myMethodToSearchFor; private final PsiMethod myMethodToReplaceIn; @@ -54,7 +54,7 @@ public class IntroduceParameterDialog extends RefactoringDialog { private boolean myHasWriteAccess; IntroduceParameterDialog(@NotNull Project project, - @NotNull List classMembersList, + @NotNull List classMembersList, PsiExpression[] occurences, PsiLocalVariable onLocalVariable, PsiExpression onExpression, diff --git a/java/java-impl/src/com/intellij/refactoring/psi/TypeParametersVisitor.java b/java/java-impl/src/com/intellij/refactoring/psi/TypeParametersVisitor.java index 109ddc33642e..1eca19955b80 100644 --- a/java/java-impl/src/com/intellij/refactoring/psi/TypeParametersVisitor.java +++ b/java/java-impl/src/com/intellij/refactoring/psi/TypeParametersVisitor.java @@ -21,9 +21,9 @@ import java.util.Set; @SuppressWarnings({"AssignmentToCollectionOrArrayFieldFromParameter"}) public class TypeParametersVisitor extends JavaRecursiveElementWalkingVisitor { - private final Set params; + private final Set params; - public TypeParametersVisitor(Set params) { + public TypeParametersVisitor(Set params) { super(); this.params = params; } diff --git a/java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticVariableRenamer.java b/java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticVariableRenamer.java index 0f270e8951bc..eede6525fb60 100644 --- a/java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticVariableRenamer.java +++ b/java/java-impl/src/com/intellij/refactoring/rename/naming/AutomaticVariableRenamer.java @@ -37,7 +37,7 @@ import java.util.*; public class AutomaticVariableRenamer extends AutomaticRenamer { private final Set myToUnpluralize = new HashSet<>(); - public AutomaticVariableRenamer(PsiClass aClass, String newClassName, Collection usages) { + public AutomaticVariableRenamer(PsiClass aClass, String newClassName, Collection usages) { final String oldClassName = aClass.getName(); final Set files = new HashSet<>(); for (final UsageInfo info : usages) { diff --git a/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java b/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java index 59167f8e799f..194f6bc35e94 100644 --- a/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/safeDelete/OverridingMethodsDialog.java @@ -38,7 +38,7 @@ import java.util.List; * @author dsl */ class OverridingMethodsDialog extends DialogWrapper { - private final List myOverridingMethods; + private final List myOverridingMethods; private final String[] myMethodText; private final boolean[] myChecked; @@ -46,7 +46,7 @@ class OverridingMethodsDialog extends DialogWrapper { private Table myTable; private final UsagePreviewPanel myUsagePreviewPanel; - OverridingMethodsDialog(Project project, List overridingMethods) { + OverridingMethodsDialog(Project project, List overridingMethods) { super(project, true); myOverridingMethods = overridingMethods; myChecked = new boolean[myOverridingMethods.size()]; diff --git a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java index c77be03937da..6575b82679b2 100644 --- a/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/turnRefsToSuper/TurnRefsToSuperDialog.java @@ -24,12 +24,12 @@ import java.util.List; */ public class TurnRefsToSuperDialog extends RefactoringDialog { private final PsiClass mySubClass; - private final List mySuperClasses; + private final List mySuperClasses; private JList mySuperClassesList; private final JCheckBox myCbReplaceInstanceOf = new JCheckBox(); - TurnRefsToSuperDialog(Project project, @NotNull PsiClass subClass, List superClasses) { + TurnRefsToSuperDialog(Project project, @NotNull PsiClass subClass, List superClasses) { super(project, true); mySubClass = subClass; diff --git a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/MigrationNode.java b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/MigrationNode.java index c6629c0e7f24..69f421108510 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/MigrationNode.java +++ b/java/java-impl/src/com/intellij/refactoring/typeMigration/ui/MigrationNode.java @@ -38,13 +38,13 @@ public class MigrationNode extends AbstractTreeNode impl private final TypeMigrationLabeler myLabeler; private final PsiType myMigrationType; private final HashMap> myProcessed; - private final HashSet myParents; + private final HashSet myParents; public MigrationNode(final Project project, final TypeMigrationUsageInfo info, final PsiType migrationType, final TypeMigrationLabeler labeler, - final HashSet parents, + final HashSet parents, final HashMap> processed) { super(project, info); myLabeler = labeler; diff --git a/java/java-impl/src/com/intellij/refactoring/ui/TypeListCreatingVisitor.java b/java/java-impl/src/com/intellij/refactoring/ui/TypeListCreatingVisitor.java index 2ca110550378..cfd8eeb175e0 100644 --- a/java/java-impl/src/com/intellij/refactoring/ui/TypeListCreatingVisitor.java +++ b/java/java-impl/src/com/intellij/refactoring/ui/TypeListCreatingVisitor.java @@ -24,11 +24,11 @@ import java.util.ArrayList; import java.util.HashSet; class TypeListCreatingVisitor implements RefactoringHierarchyUtil.SuperTypeVisitor { - private final ArrayList myList; + private final ArrayList myList; private final PsiElementFactory myFactory; private final HashSet mySet; - TypeListCreatingVisitor(ArrayList result, PsiElementFactory factory) { + TypeListCreatingVisitor(ArrayList result, PsiElementFactory factory) { myList = result; myFactory = factory; mySet = new HashSet<>(); diff --git a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java index 91cf2b590d06..a13fc8e1d8d0 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java +++ b/java/java-impl/src/com/intellij/refactoring/util/ParameterTablePanel.java @@ -50,7 +50,7 @@ public abstract class ParameterTablePanel extends AbstractParameterTablePanel parameterNameValidator) { + public ParameterTablePanel(Predicate parameterNameValidator) { super(new PassParameterColumnInfo(), new TypeColumnInfo(), new NameColumnInfo(parameterNameValidator)); diff --git a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java index 84cc1861952f..01b6d2377704 100644 --- a/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/wrapreturnvalue/WrapReturnValueProcessor.java @@ -347,10 +347,10 @@ public class WrapReturnValueProcessor extends FixableUsagesRefactoringProcessor private class ReturnSearchVisitor extends JavaRecursiveElementWalkingVisitor { - private final List usages; + private final List usages; private final String type; - ReturnSearchVisitor(List usages, String type) { + ReturnSearchVisitor(List usages, String type) { super(); this.usages = usages; this.type = type; diff --git a/java/java-psi-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java b/java/java-psi-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java index 6f704363cd23..9bdf4e60626c 100644 --- a/java/java-psi-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java +++ b/java/java-psi-impl/src/com/intellij/codeInsight/completion/proc/VariablesProcessor.java @@ -23,7 +23,7 @@ public class VariablesProcessor implements PsiScopeProcessor, ElementClassHint{ private final String myPrefix; private boolean myStaticScopeFlag; private final boolean myStaticSensitiveFlag; - private final List myResultList; + private final List myResultList; /** Collecting _all_ variables in scope */ public VariablesProcessor(String _prefix, boolean staticSensitiveFlag){ @@ -31,7 +31,7 @@ public class VariablesProcessor implements PsiScopeProcessor, ElementClassHint{ } /** Collecting _all_ variables in scope */ - public VariablesProcessor(String _prefix, boolean staticSensitiveFlag, List lst){ + public VariablesProcessor(String _prefix, boolean staticSensitiveFlag, List lst){ myPrefix = _prefix; myStaticSensitiveFlag = staticSensitiveFlag; myResultList = lst; diff --git a/java/openapi/src/com/intellij/util/xml/converters/AbstractMethodResolveConverter.java b/java/openapi/src/com/intellij/util/xml/converters/AbstractMethodResolveConverter.java index f213f7f45ff0..0eb8b896edb0 100644 --- a/java/openapi/src/com/intellij/util/xml/converters/AbstractMethodResolveConverter.java +++ b/java/openapi/src/com/intellij/util/xml/converters/AbstractMethodResolveConverter.java @@ -39,9 +39,9 @@ import java.util.*; */ public abstract class AbstractMethodResolveConverter extends ResolvingConverter { public static final String ALL_METHODS = "*"; - private final Class myDomMethodClass; + private final Class myDomMethodClass; - protected AbstractMethodResolveConverter(final Class domMethodClass) { + protected AbstractMethodResolveConverter(final Class domMethodClass) { myDomMethodClass = domMethodClass; } diff --git a/java/testFramework/src/com/intellij/testFramework/CompilerTester.java b/java/testFramework/src/com/intellij/testFramework/CompilerTester.java index 89d55dea89c1..a46c3b307801 100644 --- a/java/testFramework/src/com/intellij/testFramework/CompilerTester.java +++ b/java/testFramework/src/com/intellij/testFramework/CompilerTester.java @@ -68,7 +68,7 @@ public class CompilerTester { this(module.getProject(), Collections.singletonList(module), null); } - public CompilerTester(@NotNull IdeaProjectTestFixture fixture, @NotNull List modules) throws Exception { + public CompilerTester(@NotNull IdeaProjectTestFixture fixture, @NotNull List modules) throws Exception { this(fixture.getProject(), modules, fixture.getTestRootDisposable()); } diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/JavacFileManager.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/JavacFileManager.java index 8280d8c75a6b..3a84a29adac0 100644 --- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/JavacFileManager.java +++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/JavacFileManager.java @@ -34,11 +34,11 @@ import java.util.*; */ class JavacFileManager extends JpsJavacFileManager { - private final Collection mySourceTransformers; + private final Collection mySourceTransformers; @Nullable private String myEncodingName; - JavacFileManager(Context context, Collection transformers) { + JavacFileManager(Context context, Collection transformers) { super(context); mySourceTransformers = transformers; } diff --git a/jps/jps-builders-6/src/org/jetbrains/jps/javac/TransformableJavaFileObject.java b/jps/jps-builders-6/src/org/jetbrains/jps/javac/TransformableJavaFileObject.java index b549d2cfceb3..ad733dd9ef71 100644 --- a/jps/jps-builders-6/src/org/jetbrains/jps/javac/TransformableJavaFileObject.java +++ b/jps/jps-builders-6/src/org/jetbrains/jps/javac/TransformableJavaFileObject.java @@ -30,9 +30,9 @@ import java.util.Collection; */ public class TransformableJavaFileObject implements JavaFileObject { private final JavaFileObject myOriginal; - private final Collection myTransformers; + private final Collection myTransformers; - public TransformableJavaFileObject(JavaFileObject original, Collection transformers) { + public TransformableJavaFileObject(JavaFileObject original, Collection transformers) { myOriginal = original; myTransformers = transformers; } diff --git a/jps/jps-builders/src/org/jetbrains/jps/api/TaskFutureAdapter.java b/jps/jps-builders/src/org/jetbrains/jps/api/TaskFutureAdapter.java index 5279a6c8ea32..d0d1452b519a 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/api/TaskFutureAdapter.java +++ b/jps/jps-builders/src/org/jetbrains/jps/api/TaskFutureAdapter.java @@ -23,9 +23,9 @@ import java.util.concurrent.*; * Makes TaskFuture from the supplied Future */ public class TaskFutureAdapter implements TaskFuture { - @NotNull private final Future myFuture; + @NotNull private final Future myFuture; - public TaskFutureAdapter(@NotNull Future future) { + public TaskFutureAdapter(@NotNull Future future) { myFuture = future; } diff --git a/jps/jps-builders/src/org/jetbrains/jps/cmdline/JpsModelLoaderImpl.java b/jps/jps-builders/src/org/jetbrains/jps/cmdline/JpsModelLoaderImpl.java index e6712c4f1e6e..94abd776a9ab 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/cmdline/JpsModelLoaderImpl.java +++ b/jps/jps-builders/src/org/jetbrains/jps/cmdline/JpsModelLoaderImpl.java @@ -31,12 +31,12 @@ public class JpsModelLoaderImpl implements JpsModelLoader { private final String myProjectPath; private final String myGlobalOptionsPath; private final boolean myLoadUnloadedModules; - private final ParameterizedRunnable myModelInitializer; + private final ParameterizedRunnable myModelInitializer; public JpsModelLoaderImpl(String projectPath, String globalOptionsPath, boolean loadUnloadedModules, - @Nullable ParameterizedRunnable initializer) { + @Nullable ParameterizedRunnable initializer) { myProjectPath = projectPath; myGlobalOptionsPath = globalOptionsPath; myLoadUnloadedModules = loadUnloadedModules; diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompositeConstantResolver.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompositeConstantResolver.java index f9ea0cdea281..ca7249007fbf 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/CompositeConstantResolver.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/CompositeConstantResolver.java @@ -17,9 +17,9 @@ import java.util.concurrent.TimeoutException; * Date: 21-Feb-18 */ class CompositeConstantResolver implements Callbacks.ConstantAffectionResolver { - private final Collection myResolvers; + private final Collection myResolvers; - CompositeConstantResolver(@NotNull Collection resolvers) { + CompositeConstantResolver(@NotNull Collection resolvers) { myResolvers = resolvers; } diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/JarBasedArtifactRootDescriptor.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/JarBasedArtifactRootDescriptor.java index 2906a0a5fd44..d3ebe3b65510 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/JarBasedArtifactRootDescriptor.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/artifacts/instructions/JarBasedArtifactRootDescriptor.java @@ -26,7 +26,7 @@ import java.util.zip.ZipFile; */ public class JarBasedArtifactRootDescriptor extends ArtifactRootDescriptor { private final String myPathInJar; - private final Condition myPathInJarFilter; + private final Condition myPathInJarFilter; public JarBasedArtifactRootDescriptor(@NotNull File jarFile, @NotNull String pathInJar, @@ -34,7 +34,7 @@ public class JarBasedArtifactRootDescriptor extends ArtifactRootDescriptor { int index, @NotNull ArtifactBuildTarget target, @NotNull DestinationInfo destinationInfo, - @NotNull Condition pathInJarFilter) { + @NotNull Condition pathInJarFilter) { super(jarFile, filter, index, target, destinationInfo); myPathInJar = pathInJar; myPathInJarFilter = pathInJarFilter; diff --git a/jps/model-impl/src/org/jetbrains/jps/model/jarRepository/impl/JpsRemoteRepositoriesConfigurationImpl.java b/jps/model-impl/src/org/jetbrains/jps/model/jarRepository/impl/JpsRemoteRepositoriesConfigurationImpl.java index 51e6685d900d..d47e8816011c 100644 --- a/jps/model-impl/src/org/jetbrains/jps/model/jarRepository/impl/JpsRemoteRepositoriesConfigurationImpl.java +++ b/jps/model-impl/src/org/jetbrains/jps/model/jarRepository/impl/JpsRemoteRepositoriesConfigurationImpl.java @@ -42,7 +42,7 @@ public class JpsRemoteRepositoriesConfigurationImpl extends JpsElementBase repositories) { + public JpsRemoteRepositoriesConfigurationImpl(List repositories) { myRepositories.addAll(repositories); } diff --git a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/blockingCallsDetection/BlockingMethodInNonBlockingContextInspection.java b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/blockingCallsDetection/BlockingMethodInNonBlockingContextInspection.java index 66daa8627439..6fab1dcbb98c 100644 --- a/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/blockingCallsDetection/BlockingMethodInNonBlockingContextInspection.java +++ b/jvm/jvm-analysis-impl/src/com/intellij/codeInspection/blockingCallsDetection/BlockingMethodInNonBlockingContextInspection.java @@ -129,12 +129,12 @@ public class BlockingMethodInNonBlockingContextInspection extends AbstractBaseUa private static class BlockingMethodInNonBlockingContextVisitor extends PsiElementVisitor { private final ProblemsHolder myHolder; - private final List myBlockingMethodCheckers; - private final List myNonBlockingContextCheckers; + private final List myBlockingMethodCheckers; + private final List myNonBlockingContextCheckers; BlockingMethodInNonBlockingContextVisitor(@NotNull ProblemsHolder holder, - List blockingMethodCheckers, - List nonBlockingContextCheckers) { + List blockingMethodCheckers, + List nonBlockingContextCheckers) { myHolder = holder; this.myBlockingMethodCheckers = blockingMethodCheckers; this.myNonBlockingContextCheckers = nonBlockingContextCheckers; @@ -165,7 +165,7 @@ public class BlockingMethodInNonBlockingContextInspection extends AbstractBaseUa } private static CachedValueProvider getIsBlockingProvider(PsiMethod referencedMethod, - List blockingMethodCheckers) { + List blockingMethodCheckers) { return () -> { boolean isBlocking = StreamEx.of(referencedMethod).append(referencedMethod.findDeepestSuperMethods()) @@ -182,7 +182,7 @@ public class BlockingMethodInNonBlockingContextInspection extends AbstractBaseUa } private static boolean isMethodBlocking(PsiMethod method, - List blockingMethodCheckers) { + List blockingMethodCheckers) { return blockingMethodCheckers.stream().anyMatch(extension -> { ProgressIndicatorProvider.checkCanceled(); return extension.isMethodBlocking(method); diff --git a/platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java b/platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java index 98bbf80a10b4..0ebe7c88ef49 100644 --- a/platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java +++ b/platform/analysis-api/src/com/intellij/analysis/AnalysisScope.java @@ -136,7 +136,7 @@ public class AnalysisScope { myVFiles = null; } - public AnalysisScope(@NotNull Project project, @NotNull Collection virtualFiles) { + public AnalysisScope(@NotNull Project project, @NotNull Collection virtualFiles) { myProject = project; myElement = null; myModule = null; diff --git a/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java b/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java index 05bba002ed78..9ff12e414c7f 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/ex/InspectionToolWrapper.java @@ -44,7 +44,7 @@ public abstract class InspectionToolWrapper other) { + protected InspectionToolWrapper(@NotNull InspectionToolWrapper other) { myEP = other.myEP; // we need to create a copy for buffering if (other.myTool == null) { diff --git a/platform/core-api/src/com/intellij/openapi/util/ActionCallback.java b/platform/core-api/src/com/intellij/openapi/util/ActionCallback.java index 7e9a56014ce0..c22a885d345f 100644 --- a/platform/core-api/src/com/intellij/openapi/util/ActionCallback.java +++ b/platform/core-api/src/com/intellij/openapi/util/ActionCallback.java @@ -119,7 +119,7 @@ public class ActionCallback implements Disposable { } @NotNull - public final ActionCallback doWhenRejected(@NotNull final Consumer consumer) { + public final ActionCallback doWhenRejected(@NotNull final Consumer consumer) { myRejected.doWhenExecuted(() -> consumer.consume(myError)); return this; } diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java index dbcfe2398eb9..d5869110286c 100644 --- a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java +++ b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java @@ -716,7 +716,7 @@ public class VfsUtilCore { public static class DistinctVFilesRootsCollection extends DistinctRootsCollection { public DistinctVFilesRootsCollection() { } - public DistinctVFilesRootsCollection(Collection virtualFiles) { + public DistinctVFilesRootsCollection(Collection virtualFiles) { super(virtualFiles); } diff --git a/platform/core-api/src/com/intellij/psi/search/PsiElementProcessorAdapter.java b/platform/core-api/src/com/intellij/psi/search/PsiElementProcessorAdapter.java index 0da6a7263026..f90386dabfd4 100644 --- a/platform/core-api/src/com/intellij/psi/search/PsiElementProcessorAdapter.java +++ b/platform/core-api/src/com/intellij/psi/search/PsiElementProcessorAdapter.java @@ -10,9 +10,9 @@ import com.intellij.psi.PsiElement; import com.intellij.util.Processor; public class PsiElementProcessorAdapter extends ReadActionProcessor implements Processor { - private final PsiElementProcessor myProcessor; + private final PsiElementProcessor myProcessor; - public PsiElementProcessorAdapter(final PsiElementProcessor processor) { + public PsiElementProcessorAdapter(final PsiElementProcessor processor) { myProcessor = processor; } diff --git a/platform/core-api/src/com/intellij/util/FilteredQuery.java b/platform/core-api/src/com/intellij/util/FilteredQuery.java index 7a167d0f689d..ab5f9861c97c 100644 --- a/platform/core-api/src/com/intellij/util/FilteredQuery.java +++ b/platform/core-api/src/com/intellij/util/FilteredQuery.java @@ -16,9 +16,9 @@ import java.util.List; */ public class FilteredQuery implements Query { private final Query myOriginal; - private final Condition myFilter; + private final Condition myFilter; - public FilteredQuery(@NotNull Query original, @NotNull Condition filter) { + public FilteredQuery(@NotNull Query original, @NotNull Condition filter) { myOriginal = original; myFilter = filter; } diff --git a/platform/core-api/src/com/intellij/util/QueryFactory.java b/platform/core-api/src/com/intellij/util/QueryFactory.java index 3e6348dd9e00..69709668acaf 100644 --- a/platform/core-api/src/com/intellij/util/QueryFactory.java +++ b/platform/core-api/src/com/intellij/util/QueryFactory.java @@ -82,8 +82,8 @@ public class QueryFactory { */ @NotNull public final Query createUniqueResultsQuery(@NotNull Parameters parameters, - @NotNull TObjectHashingStrategy hashingStrategy, - @NotNull Function mapper) { + @NotNull TObjectHashingStrategy hashingStrategy, + @NotNull Function mapper) { return new UniqueResultsQuery<>(createQuery(parameters), hashingStrategy, mapper); } } diff --git a/platform/core-api/src/com/intellij/util/UniqueResultsQuery.java b/platform/core-api/src/com/intellij/util/UniqueResultsQuery.java index 386ca0501984..8d23921e94b9 100644 --- a/platform/core-api/src/com/intellij/util/UniqueResultsQuery.java +++ b/platform/core-api/src/com/intellij/util/UniqueResultsQuery.java @@ -19,7 +19,7 @@ public class UniqueResultsQuery implements Query { @NotNull private final TObjectHashingStrategy myHashingStrategy; @NotNull private final Function myMapper; - public UniqueResultsQuery(@NotNull Query original) { + public UniqueResultsQuery(@NotNull Query original) { //noinspection unchecked this(original, ContainerUtil.canonicalStrategy(), Function.ID); } diff --git a/platform/core-impl/src/com/intellij/indentation/IndentationParser.java b/platform/core-impl/src/com/intellij/indentation/IndentationParser.java index 7e10b49d22ff..e84cece2acf2 100644 --- a/platform/core-impl/src/com/intellij/indentation/IndentationParser.java +++ b/platform/core-impl/src/com/intellij/indentation/IndentationParser.java @@ -38,14 +38,14 @@ public abstract class IndentationParser implements PsiParser { private final IElementType myBlockElementType; @NotNull private final IElementType myDocumentType; - private final List myContainerTypes; + private final List myContainerTypes; public IndentationParser( @NotNull IElementType documentType, @NotNull final IElementType blockElementType, @NotNull final IElementType eolTokenType, @NotNull final IElementType indentTokenType, - final List containerTypes) + final List containerTypes) { myDocumentType = documentType; myBlockElementType = blockElementType; diff --git a/platform/core-impl/src/com/intellij/mock/MockFileDocumentManagerImpl.java b/platform/core-impl/src/com/intellij/mock/MockFileDocumentManagerImpl.java index 204ed444b998..2e92ca1684d7 100644 --- a/platform/core-impl/src/com/intellij/mock/MockFileDocumentManagerImpl.java +++ b/platform/core-impl/src/com/intellij/mock/MockFileDocumentManagerImpl.java @@ -29,10 +29,10 @@ import org.jetbrains.annotations.Nullable; public class MockFileDocumentManagerImpl extends FileDocumentManager { private static final Key MOCK_VIRTUAL_FILE_KEY = Key.create("MockVirtualFile"); - private final Function myFactory; + private final Function myFactory; @Nullable private final Key myCachedDocumentKey; - public MockFileDocumentManagerImpl(Function factory, @Nullable Key cachedDocumentKey) { + public MockFileDocumentManagerImpl(Function factory, @Nullable Key cachedDocumentKey) { myFactory = factory; myCachedDocumentKey = cachedDocumentKey; } diff --git a/platform/core-impl/src/com/intellij/openapi/roots/impl/PackageDirectoryCache.java b/platform/core-impl/src/com/intellij/openapi/roots/impl/PackageDirectoryCache.java index 943af7a5b80d..fe31505d8ee8 100644 --- a/platform/core-impl/src/com/intellij/openapi/roots/impl/PackageDirectoryCache.java +++ b/platform/core-impl/src/com/intellij/openapi/roots/impl/PackageDirectoryCache.java @@ -29,6 +29,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.*; +import java.util.function.Consumer; import static com.intellij.util.containers.ContainerUtil.or; @@ -61,7 +62,7 @@ public class PackageDirectoryCache { @NotNull public List getDirectoriesByPackageName(@NotNull final String packageName) { PackageInfo info = getPackageInfo(packageName); - return info == null ? Collections.emptyList() : info.myPackageDirectories; + return info == null ? Collections.emptyList() : Collections.unmodifiableList(info.myPackageDirectories); } @Nullable @@ -130,7 +131,7 @@ public class PackageDirectoryCache { @NotNull final String myQname; @NotNull - final List myPackageDirectories; + final List myPackageDirectories; final NotNullLazyValue> mySubPackages = new VolatileNotNullLazyValue>() { @NotNull @Override @@ -149,7 +150,7 @@ public class PackageDirectoryCache { } }; - PackageInfo(@NotNull String qname, @NotNull List packageDirectories) { + PackageInfo(@NotNull String qname, @NotNull List packageDirectories) { myQname = qname; myPackageDirectories = packageDirectories; } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemExecuteTaskTask.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemExecuteTaskTask.java index 169a0078b898..f9f7bf3427cc 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemExecuteTaskTask.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/internal/ExternalSystemExecuteTaskTask.java @@ -73,7 +73,7 @@ public class ExternalSystemExecuteTaskTask extends AbstractExternalSystemTask { @Deprecated public ExternalSystemExecuteTaskTask(@NotNull ProjectSystemId externalSystemId, @NotNull Project project, - @NotNull List tasksToExecute, + @NotNull List tasksToExecute, @Nullable String vmOptions, @Nullable String arguments, @Nullable String jvmAgentSetup) throws IllegalArgumentException { diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java index a3ccfed6930d..6711e4ad88cc 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/wizard/AbstractExternalProjectImportBuilder.java @@ -87,7 +87,7 @@ public abstract class AbstractExternalProjectImportBuilder controlFactory, + @NotNull NotNullFactory controlFactory, @NotNull ProjectSystemId externalSystemId) { myProjectDataManager = projectDataManager; myControlValue = NotNullLazyValue.createValue(controlFactory); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ConfigureTasksActivationDialog.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ConfigureTasksActivationDialog.java index 91735047a37d..34433cfdf928 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ConfigureTasksActivationDialog.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/task/ui/ConfigureTasksActivationDialog.java @@ -427,7 +427,7 @@ public class ConfigureTasksActivationDialog extends DialogWrapper { } private class ChooseProjectStep extends BaseListPopupStep { - protected ChooseProjectStep(List values) { + protected ChooseProjectStep(List values) { super("Choose project", values); } diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/TasksNode.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/TasksNode.java index a982205ba943..a3e8ca6d531f 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/TasksNode.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/view/TasksNode.java @@ -41,7 +41,7 @@ public class TasksNode extends ExternalSystemNode { private final MultiMap myTasksMap = new MultiMap<>(); @SuppressWarnings("unchecked") - public TasksNode(ExternalProjectsView externalProjectsView, final Collection> dataNodes) { + public TasksNode(ExternalProjectsView externalProjectsView, final Collection> dataNodes) { super(externalProjectsView, null, null); if (dataNodes != null && !dataNodes.isEmpty()) { diff --git a/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java b/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java index 7cb593439fb7..87ddcb8c1548 100644 --- a/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java +++ b/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/LibraryRuntimeClasspathScope.java @@ -26,7 +26,7 @@ public class LibraryRuntimeClasspathScope extends GlobalSearchScope { private int myCachedHashCode; - public LibraryRuntimeClasspathScope(@NotNull Project project, @NotNull Collection modules) { + public LibraryRuntimeClasspathScope(@NotNull Project project, @NotNull Collection modules) { super(project); myIndex = ProjectRootManager.getInstance(project).getFileIndex(); final Set processedSdk = new THashSet<>(); diff --git a/platform/lang-api/src/com/intellij/codeInsight/daemon/RelatedItemLineMarkerInfo.java b/platform/lang-api/src/com/intellij/codeInsight/daemon/RelatedItemLineMarkerInfo.java index 94e45f516c40..afd7b2d42440 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/daemon/RelatedItemLineMarkerInfo.java +++ b/platform/lang-api/src/com/intellij/codeInsight/daemon/RelatedItemLineMarkerInfo.java @@ -32,13 +32,13 @@ import java.util.List; * @author nik */ public class RelatedItemLineMarkerInfo extends MergeableLineMarkerInfo { - private final NotNullLazyValue> myTargets; + private final NotNullLazyValue> myTargets; public RelatedItemLineMarkerInfo(@NotNull T element, @NotNull TextRange range, Icon icon, int updatePass, @Nullable Function tooltipProvider, @Nullable GutterIconNavigationHandler navHandler, @NotNull GutterIconRenderer.Alignment alignment, - @NotNull NotNullLazyValue> targets) { + @NotNull NotNullLazyValue> targets) { super(element, range, icon, updatePass, tooltipProvider, navHandler, alignment); myTargets = targets; } diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/ArrangementSectionDetector.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/ArrangementSectionDetector.java index c55aaf8ac930..8d5130109123 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/ArrangementSectionDetector.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/ArrangementSectionDetector.java @@ -41,12 +41,12 @@ import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Se public class ArrangementSectionDetector { private final Document myDocument; private final ArrangementSettings mySettings; - private final Consumer mySectionEntryProducer; + private final Consumer mySectionEntryProducer; private final Stack myOpenedSections = ContainerUtil.newStack(); public ArrangementSectionDetector(@Nullable Document document, @NotNull ArrangementSettings settings, - @NotNull Consumer producer) { + @NotNull Consumer producer) { myDocument = document; mySettings = settings; mySectionEntryProducer = producer; diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/CompositeArrangementSettingsToken.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/CompositeArrangementSettingsToken.java index 1f5be935d9b3..c2a53177c814 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/CompositeArrangementSettingsToken.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/CompositeArrangementSettingsToken.java @@ -68,7 +68,7 @@ public class CompositeArrangementSettingsToken { } public CompositeArrangementSettingsToken(@NotNull ArrangementSettingsToken token, - @NotNull Collection children) + @NotNull Collection children) { this(token, deduceRole(token), ContainerUtilRt.map2List(children, WRAPPER)); } diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementExtendableSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementExtendableSettings.java index e4190887c4ad..c42124f183db 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementExtendableSettings.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementExtendableSettings.java @@ -47,16 +47,16 @@ public class StdArrangementExtendableSettings extends StdArrangementSettings imp super(); } - public StdArrangementExtendableSettings(@NotNull List groupingRules, - @NotNull List sectionRules, - @NotNull Collection rulesAliases) { + public StdArrangementExtendableSettings(@NotNull List groupingRules, + @NotNull List sectionRules, + @NotNull Collection rulesAliases) { super(groupingRules, sectionRules); myRulesAliases.addAll(rulesAliases); } - public static StdArrangementExtendableSettings createByMatchRules(@NotNull List groupingRules, + public static StdArrangementExtendableSettings createByMatchRules(@NotNull List groupingRules, @NotNull List matchRules, - @NotNull Collection rulesAliases) { + @NotNull Collection rulesAliases) { final List sectionRules = new ArrayList<>(); for (StdArrangementMatchRule rule : matchRules) { sectionRules.add(ArrangementSectionRule.create(rule)); diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementSettings.java b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementSettings.java index e87a55e2d380..6280c413f198 100644 --- a/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementSettings.java +++ b/platform/lang-api/src/com/intellij/psi/codeStyle/arrangement/std/StdArrangementSettings.java @@ -42,17 +42,17 @@ public class StdArrangementSettings implements ArrangementSettings { } @SuppressWarnings("unchecked") - public StdArrangementSettings(@NotNull List rules) { + public StdArrangementSettings(@NotNull List rules) { this(Collections.EMPTY_LIST, rules); } - public StdArrangementSettings(@NotNull List groupingRules, - @NotNull List sectionRules) { + public StdArrangementSettings(@NotNull List groupingRules, + @NotNull List sectionRules) { myGroupings.addAll(groupingRules); mySectionRules.addAll(sectionRules); } - public static StdArrangementSettings createByMatchRules(@NotNull List groupingRules, + public static StdArrangementSettings createByMatchRules(@NotNull List groupingRules, @NotNull List matchRules) { final List sectionRules = new ArrayList<>(); for (StdArrangementMatchRule rule : matchRules) { diff --git a/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java b/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java index c40e4a9a0abd..d577afae93ab 100644 --- a/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java +++ b/platform/lang-impl/src/com/intellij/analysis/BaseAnalysisActionDialog.java @@ -79,7 +79,7 @@ public class BaseAnalysisActionDialog extends DialogWrapper { public BaseAnalysisActionDialog(@NotNull String title, @NotNull String analysisNoon, @NotNull Project project, - @NotNull List items, + @NotNull List items, @NotNull AnalysisUIOptions options, final boolean rememberScope, final boolean showInspectTestSource) { diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java index 984067ba0a37..8a4c3dd94851 100644 --- a/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/CodeCompletionPanel.java @@ -70,7 +70,7 @@ public class CodeCompletionPanel { private JPanel myAddonPanel; - public CodeCompletionPanel(List addons) { + public CodeCompletionPanel(List addons) { ChangeListener updateCaseCheckboxes = __ -> { myFirstLetterOnly.setEnabled(myCbMatchCase.isSelected()); myAllLetters.setEnabled(myCbMatchCase.isSelected()); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java index 3ce91f145f18..697ed24f90d1 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/OptionTableWithPreviewPanel.java @@ -506,7 +506,7 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo private final int myMinValue; private final int myMaxValue; private final int myDefaultValue; - @Nullable private final Function myDefaultValueRenderer; + @Nullable private final Function myDefaultValueRenderer; IntOption(Class clazz, @NotNull String fieldName, @@ -517,7 +517,7 @@ public abstract class OptionTableWithPreviewPanel extends CustomizableLanguageCo int minValue, int maxValue, int defaultValue, - @Nullable Function defaultValueRenderer) { + @Nullable Function defaultValueRenderer) { super(clazz, fieldName, title, groupName, anchor, anchorFiledName); myMinValue = minValue; myMaxValue = maxValue; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/FileTreeIterator.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/FileTreeIterator.java index bd14ea565d52..0aea8f48c322 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/actions/FileTreeIterator.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/FileTreeIterator.java @@ -32,7 +32,7 @@ public class FileTreeIterator { private Queue myCurrentFiles = new LinkedList<>(); private Queue myCurrentDirectories = new LinkedList<>(); - public FileTreeIterator(@NotNull List files) { + public FileTreeIterator(@NotNull List files) { myCurrentFiles.addAll(files); } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java index 3f3d5c76b7e3..50f102015af1 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/FilePathCompletionContributor.java @@ -255,9 +255,9 @@ public class FilePathCompletionContributor extends CompletionContributor { private final String myInfo; private final Icon myIcon; private final PsiFile myFile; - private final List myHelpers; + private final List myHelpers; - public FilePathLookupItem(@NotNull final PsiFile file, @NotNull final List helpers) { + public FilePathLookupItem(@NotNull final PsiFile file, @NotNull final List helpers) { myName = file.getName(); myPath = file.getVirtualFile().getPath(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java index 202756d1f977..617f694a350b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/impl/LiftShorterItemsClassifier.java @@ -157,12 +157,12 @@ public class LiftShorterItemsClassifier extends Classifier { private final Set mySrcSet; private final ProcessingContext myContext; private final Iterable mySource; - private final THashSet myLifted; + private final THashSet myLifted; LiftingIterable(Set srcSet, - ProcessingContext context, - Iterable source, - THashSet lifted) { + ProcessingContext context, + Iterable source, + THashSet lifted) { mySrcSet = srcSet; myContext = context; mySource = source; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java index c458a18fcb0d..dc1c3b89e0dc 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/EditVariableDialog.java @@ -33,9 +33,9 @@ class EditVariableDialog extends DialogWrapper { private final ArrayList myVariables; private JTable myTable; private final Editor myEditor; - private final List myContextTypes; + private final List myContextTypes; - EditVariableDialog(Editor editor, Component parent, ArrayList variables, List contextTypes) { + EditVariableDialog(Editor editor, Component parent, ArrayList variables, List contextTypes) { super(parent, true); myContextTypes = contextTypes; myVariables = variables; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/macro/CommentMacro.java b/platform/lang-impl/src/com/intellij/codeInsight/template/macro/CommentMacro.java index e090b01e3f39..88cdafb4de5b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/macro/CommentMacro.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/macro/CommentMacro.java @@ -22,9 +22,9 @@ import java.util.function.Function; * @author peter */ public abstract class CommentMacro extends MacroBase { - private final Function myCommenterFunction; + private final Function myCommenterFunction; - protected CommentMacro(String name, Function commenterFunction) { + protected CommentMacro(String name, Function commenterFunction) { super(name, name + "()"); myCommenterFunction = commenterFunction; } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/unwrap/ScopeHighlighter.java b/platform/lang-impl/src/com/intellij/codeInsight/unwrap/ScopeHighlighter.java index a9997aafb26f..927701f2f289 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/unwrap/ScopeHighlighter.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/unwrap/ScopeHighlighter.java @@ -37,13 +37,13 @@ public class ScopeHighlighter { @NotNull private final Editor myEditor; @NotNull private final List myActiveHighliters = new ArrayList<>(); - @NotNull private final NotNullFunction myRanger; + @NotNull private final NotNullFunction myRanger; public ScopeHighlighter(@NotNull Editor editor) { this(editor, NATURAL_RANGER); } - public ScopeHighlighter(@NotNull Editor editor, @NotNull NotNullFunction ranger) { + public ScopeHighlighter(@NotNull Editor editor, @NotNull NotNullFunction ranger) { myEditor = editor; myRanger = ranger; } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java index 0eb2994e439f..ddf086d1829f 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/GlobalInspectionContextImpl.java @@ -84,7 +84,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextBase imp public volatile static boolean CREATE_VIEW_FORCE = false; public static final NotificationGroup NOTIFICATION_GROUP = NotificationGroup.toolWindowGroup("Inspection Results", ToolWindowId.INSPECTION); - private final NotNullLazyValue myContentManager; + private final NotNullLazyValue myContentManager; private volatile InspectionResultsView myView; private volatile String myOutputPath; private Content myContent; @@ -95,7 +95,7 @@ public class GlobalInspectionContextImpl extends GlobalInspectionContextBase imp private AnalysisUIOptions myUIOptions; private InspectionTreeState myTreeState; - public GlobalInspectionContextImpl(@NotNull Project project, @NotNull NotNullLazyValue contentManager) { + public GlobalInspectionContextImpl(@NotNull Project project, @NotNull NotNullLazyValue contentManager) { super(project); myUIOptions = AnalysisUIOptions.getInstance(project).copy(); myContentManager = contentManager; diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java index 04aee05a85d3..ebc19834650f 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/RunDashboardContent.java @@ -90,7 +90,7 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab private RunDashboardAnimator myAnimator; private AbstractTreeNode myLastSelection; private final Set myCollapsedTreeNodeValues = new HashSet<>(); - private final List myGroupers; + private final List myGroupers; private final RunDashboardStatusFilter myStatusFilter = new RunDashboardStatusFilter(); @NotNull private final ContentManager myContentManager; @@ -102,7 +102,7 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab private final DefaultActionGroup myDashboardContentActions = new DefaultActionGroup(); private final Map> myContentActions = new WeakHashMap<>(); - public RunDashboardContent(@NotNull Project project, @NotNull ContentManager contentManager, @NotNull List groupers) { + public RunDashboardContent(@NotNull Project project, @NotNull ContentManager contentManager, @NotNull List groupers) { super(new BorderLayout()); myProject = project; myGroupers = groupers; @@ -539,7 +539,7 @@ public class RunDashboardContent extends JPanel implements TreeContent, Disposab } private class GroupByActionGroup extends DefaultActionGroup implements CheckedActionGroup { - GroupByActionGroup(List groupers) { + GroupByActionGroup(List groupers) { super(ExecutionBundle.message("run.dashboard.group.by.action.name"), true); getTemplatePresentation().setIcon(AllIcons.Actions.GroupBy); diff --git a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeStructure.java b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeStructure.java index c4c0c76cff53..d30c1181d501 100644 --- a/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeStructure.java +++ b/platform/lang-impl/src/com/intellij/execution/dashboard/tree/RunDashboardTreeStructure.java @@ -34,13 +34,13 @@ import java.util.stream.Collectors; */ public class RunDashboardTreeStructure extends AbstractTreeStructureBase { private final Project myProject; - private final List myGroupers; - private final List myFilters; + private final List myGroupers; + private final List myFilters; private final RunConfigurationsTreeRootNode myRootElement; public RunDashboardTreeStructure(@NotNull Project project, - @NotNull List groupers, - @NotNull List filters) { + @NotNull List groupers, + @NotNull List filters) { super(project); myProject = project; myGroupers = groupers; diff --git a/platform/lang-impl/src/com/intellij/execution/filters/impl/MultipleFilesHyperlinkInfo.java b/platform/lang-impl/src/com/intellij/execution/filters/impl/MultipleFilesHyperlinkInfo.java index d25e2bd7d8f9..e78a39c5dc78 100644 --- a/platform/lang-impl/src/com/intellij/execution/filters/impl/MultipleFilesHyperlinkInfo.java +++ b/platform/lang-impl/src/com/intellij/execution/filters/impl/MultipleFilesHyperlinkInfo.java @@ -42,11 +42,11 @@ import java.util.List; * @author nik */ class MultipleFilesHyperlinkInfo extends HyperlinkInfoBase implements FileHyperlinkInfo { - private final List myVirtualFiles; + private final List myVirtualFiles; private final int myLineNumber; private final Project myProject; - MultipleFilesHyperlinkInfo(@NotNull List virtualFiles, int lineNumber, @NotNull Project project) { + MultipleFilesHyperlinkInfo(@NotNull List virtualFiles, int lineNumber, @NotNull Project project) { myVirtualFiles = virtualFiles; myLineNumber = lineNumber; myProject = project; diff --git a/platform/lang-impl/src/com/intellij/facet/impl/ui/MultipleFacetEditorHelperImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/ui/MultipleFacetEditorHelperImpl.java index 35566ddbdc56..ba7db0114773 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/ui/MultipleFacetEditorHelperImpl.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/ui/MultipleFacetEditorHelperImpl.java @@ -72,10 +72,10 @@ public class MultipleFacetEditorHelperImpl implements MultipleFacetEditorHelper private static class CheckBoxBinding extends AbstractBinding implements ActionListener { private final ThreeStateCheckBox myCommon; - private final List myCheckBoxesList; + private final List myCheckBoxesList; private final List myInitialValues; - CheckBoxBinding(final ThreeStateCheckBox common, final List checkBoxesList) { + CheckBoxBinding(final ThreeStateCheckBox common, final List checkBoxesList) { LOG.assertTrue(!checkBoxesList.isEmpty()); myCommon = common; myCheckBoxesList = checkBoxesList; @@ -169,10 +169,10 @@ public class MultipleFacetEditorHelperImpl implements MultipleFacetEditorHelper private static class CombobBoxBinding extends AbstractBinding implements ItemListener { private final JComboBox myCommon; - private final List myComponentsList; + private final List myComponentsList; private final List myInitialValues; - CombobBoxBinding(final JComboBox common, final List componentsList) { + CombobBoxBinding(final JComboBox common, final List componentsList) { LOG.assertTrue(!componentsList.isEmpty()); myCommon = common; myComponentsList = componentsList; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/PersistentSearchEverywhereContributorFilter.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/PersistentSearchEverywhereContributorFilter.java index 7acbfcfe6c4f..892d02d00cb4 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/PersistentSearchEverywhereContributorFilter.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/PersistentSearchEverywhereContributorFilter.java @@ -11,13 +11,13 @@ import java.util.function.Function; public class PersistentSearchEverywhereContributorFilter implements SearchEverywhereContributorFilter { - private final ChooseByNameFilterConfiguration myPersistentConfiguration; + private final ChooseByNameFilterConfiguration myPersistentConfiguration; private final List myElements; private final Function myTextExtractor; private final Function myIconExtractor; public PersistentSearchEverywhereContributorFilter(@NotNull List elements, - @NotNull ChooseByNameFilterConfiguration configuration, + @NotNull ChooseByNameFilterConfiguration configuration, Function textExtractor, Function iconExtractor) { myElements = elements; diff --git a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java index 722d36d0ec36..8c607cec05bb 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/searcheverywhere/SearchEverywhereUI.java @@ -75,8 +75,8 @@ public class SearchEverywhereUI extends BigPopupUI implements DataProvider, Quic public static final int MULTIPLE_CONTRIBUTORS_ELEMENTS_LIMIT = 15; public static final int THROTTLING_TIMEOUT = 200; - private final List myServiceContributors; - private final List myShownContributors; + private final List myServiceContributors; + private final List myShownContributors; private final Map> myContributorFilters; private SearchListModel myListModel; //todo using in different threads? #UX-1 @@ -96,8 +96,8 @@ public class SearchEverywhereUI extends BigPopupUI implements DataProvider, Quic private ProgressIndicator mySearchProgressIndicator; public SearchEverywhereUI(Project project, - List serviceContributors, - List contributors, + List serviceContributors, + List contributors, Map> filters) { super(project); List equalityProviders = SEResultsEqualityProvider.getProviders(); diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java index d6d0ab5eff30..747c55caee32 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java @@ -31,9 +31,9 @@ import java.util.List; class DeleteBookmarkAction extends DumbAwareAction { private final Project myProject; - private final JList myList; + private final JList myList; - DeleteBookmarkAction(Project project, JList list) { + DeleteBookmarkAction(Project project, JList list) { super("Delete", "Delete current bookmark", AllIcons.General.Remove); setEnabledInModalContext(true); myProject = project; diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java index 5f174eb10cb6..17b8d6e05bce 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java @@ -32,10 +32,10 @@ import javax.swing.*; class EditBookmarkDescriptionAction extends DumbAwareAction { private final Project myProject; - private final JList myList; + private final JList myList; private JBPopup myPopup; - EditBookmarkDescriptionAction(Project project, JList list) { + EditBookmarkDescriptionAction(Project project, JList list) { super(IdeBundle.message("action.bookmark.edit.description"), IdeBundle.message("action.bookmark.edit.description.description"), AllIcons.Actions.Edit); setEnabledInModalContext(true); myProject = project; diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NestingTreeNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NestingTreeNode.java index a440640fd88b..721e2ecd39cd 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NestingTreeNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NestingTreeNode.java @@ -24,9 +24,9 @@ import java.util.ArrayList; import java.util.Collection; public class NestingTreeNode extends PsiFileNode { - @NotNull private final Collection myChildNodes; + @NotNull private final Collection myChildNodes; - public NestingTreeNode(@NotNull final PsiFileNode originalNode, @NotNull final Collection childNodes) { + public NestingTreeNode(@NotNull final PsiFileNode originalNode, @NotNull final Collection childNodes) { super(originalNode.getProject(), originalNode.getValue(), originalNode.getSettings()); myChildNodes = childNodes; } diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ListChooseByNameModel.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ListChooseByNameModel.java index 9d3340c345dc..c0908e2b893c 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ListChooseByNameModel.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ListChooseByNameModel.java @@ -43,13 +43,13 @@ public class ListChooseByNameModel extends SimpleCho private Pattern myCompiledPattern; private String myPattern; - private final List myItems; + private final List myItems; private final String myNotInMessage; public ListChooseByNameModel(@NotNull final Project project, final String prompt, final String notInMessage, - List items) { + List items) { super(project, prompt, null); myItems = items; diff --git a/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java b/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java index 1ee9cfc5fb36..fe895c78b031 100644 --- a/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java +++ b/platform/lang-impl/src/com/intellij/internal/ImageDuplicateResultsDialog.java @@ -281,7 +281,7 @@ public class ImageDuplicateResultsDialog extends DialogWrapper { private static class MyDuplicatesNode extends DefaultMutableTreeNode { - MyDuplicatesNode(DefaultMutableTreeNode node, Set files) { + MyDuplicatesNode(DefaultMutableTreeNode node, Set files) { super(files); setParent(node); children = files.stream().map(file -> new MyFileNode(this, file)).collect(Collectors.toCollection(Vector::new)); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ChooseModulesDialog.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ChooseModulesDialog.java index fd1945f97732..9b6e5ed12892 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ChooseModulesDialog.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ChooseModulesDialog.java @@ -28,11 +28,11 @@ import java.util.List; public class ChooseModulesDialog extends ChooseElementsDialog { - public ChooseModulesDialog(Component parent, final List items, final String title) { + public ChooseModulesDialog(Component parent, final List items, final String title) { super(parent, items, title, null, true); } - public ChooseModulesDialog(Component parent, List items, String title, @Nullable String description) { + public ChooseModulesDialog(Component parent, List items, String title, @Nullable String description) { super(parent, items, title, description, true); } diff --git a/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/IndentUsageStatisticsImpl.java b/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/IndentUsageStatisticsImpl.java index 26413ee345ea..1a56dc555b64 100644 --- a/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/IndentUsageStatisticsImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/codeStyle/autodetect/IndentUsageStatisticsImpl.java @@ -28,7 +28,7 @@ public class IndentUsageStatisticsImpl implements IndentUsageStatistics { private static final Comparator DECREASING_ORDER = (o1, o2) -> Integer.compare(o2.getTimesUsed(), o1.getTimesUsed()); - private final List myLineInfos; + private final List myLineInfos; private int myPreviousLineIndent; private int myPreviousRelativeIndent; @@ -40,7 +40,7 @@ public class IndentUsageStatisticsImpl implements IndentUsageStatistics { private List myIndentUsages = ContainerUtil.newArrayList(); private final Stack myParentIndents = ContainerUtil.newStack(new IndentData(0, 0)); - public IndentUsageStatisticsImpl(@NotNull List lineInfos) { + public IndentUsageStatisticsImpl(@NotNull List lineInfos) { myLineInfos = lineInfos; buildIndentToUsagesMap(); myIndentUsages = toIndentUsageList(myIndentToUsagesMap); diff --git a/platform/lang-impl/src/com/intellij/psi/formatter/CompositeWhiteSpaceFormattingStrategy.java b/platform/lang-impl/src/com/intellij/psi/formatter/CompositeWhiteSpaceFormattingStrategy.java index ebaec2a570fe..60db1860fcf9 100644 --- a/platform/lang-impl/src/com/intellij/psi/formatter/CompositeWhiteSpaceFormattingStrategy.java +++ b/platform/lang-impl/src/com/intellij/psi/formatter/CompositeWhiteSpaceFormattingStrategy.java @@ -38,7 +38,7 @@ public class CompositeWhiteSpaceFormattingStrategy implements WhiteSpaceFormatti private final List myStrategies = new ArrayList<>(); private boolean myReplaceDefaultStrategy; - public CompositeWhiteSpaceFormattingStrategy(@NotNull Collection strategies) + public CompositeWhiteSpaceFormattingStrategy(@NotNull Collection strategies) throws IllegalArgumentException { for (WhiteSpaceFormattingStrategy strategy : strategies) { diff --git a/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java b/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java index eefded087c90..740bfe46397b 100644 --- a/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/stubs/StubIndexImpl.java @@ -604,9 +604,9 @@ public class StubIndexImpl extends StubIndex implements PersistentStateComponent private class StubIndexInitialization extends IndexInfrastructure.DataInitialization { private final AsyncState state = new AsyncState(); private final StringBuilder updated = new StringBuilder(); - private final List> myExtensions; + private final List> myExtensions; - StubIndexInitialization(@NotNull List> extensions) { + StubIndexInitialization(@NotNull List> extensions) { myExtensions = extensions; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/CallerChooserBase.java b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/CallerChooserBase.java index f571d75f506b..db11f6410f2d 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/changeSignature/CallerChooserBase.java +++ b/platform/lang-impl/src/com/intellij/refactoring/changeSignature/CallerChooserBase.java @@ -62,7 +62,7 @@ public abstract class CallerChooserBase extends DialogWrap private MemberNodeBase myRoot; protected final Project myProject; private Tree myTree; - private final Consumer> myCallback; + private final Consumer> myCallback; private TreeSelectionListener myTreeSelectionListener; private Editor myCallerEditor; private Editor myCalleeEditor; @@ -83,7 +83,7 @@ public abstract class CallerChooserBase extends DialogWrap return ""; } - public CallerChooserBase(M method, Project project, @Nls(capitalization = Nls.Capitalization.Title) String title, Tree previousTree, String fileName, Consumer> callback) { + public CallerChooserBase(M method, Project project, @Nls(capitalization = Nls.Capitalization.Title) String title, Tree previousTree, String fileName, Consumer> callback) { super(true); myMethod = method; myProject = project; diff --git a/platform/lang-impl/src/com/intellij/refactoring/listeners/impl/impl/RefactoringTransactionImpl.java b/platform/lang-impl/src/com/intellij/refactoring/listeners/impl/impl/RefactoringTransactionImpl.java index b3bb7f39865a..74fc50735e01 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/listeners/impl/impl/RefactoringTransactionImpl.java +++ b/platform/lang-impl/src/com/intellij/refactoring/listeners/impl/impl/RefactoringTransactionImpl.java @@ -26,10 +26,10 @@ import com.intellij.refactoring.listeners.RefactoringElementListener; import com.intellij.refactoring.listeners.RefactoringElementListenerProvider; import com.intellij.refactoring.listeners.UndoRefactoringElementListener; import com.intellij.refactoring.listeners.impl.RefactoringTransaction; -import java.util.HashMap; import org.jetbrains.annotations.NotNull; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -43,13 +43,13 @@ public class RefactoringTransactionImpl implements RefactoringTransaction { * Actions to be performed at commit. */ private final ArrayList myRunnables = new ArrayList<>(); - private final List myListenerProviders; + private final List myListenerProviders; private final Project myProject; private final Map> myOldElementToListenerListMap = new HashMap<>(); private final Map myOldElementToTransactionListenerMap = new HashMap<>(); public RefactoringTransactionImpl(Project project, - List listenerProviders) { + List listenerProviders) { myListenerProviders = listenerProviders; myProject = project; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownUsageViewDescriptor.java b/platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownUsageViewDescriptor.java index ced46f67ad46..d5b693fb0c77 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownUsageViewDescriptor.java +++ b/platform/lang-impl/src/com/intellij/refactoring/memberPushDown/PushDownUsageViewDescriptor.java @@ -22,7 +22,7 @@ public class PushDownUsageViewDescriptor memberInfos) { + public PushDownUsageViewDescriptor(Klass aClass, List memberInfos) { myMembers = memberInfos != null ? ContainerUtil.map2Array(memberInfos, PsiElement.class, MemberInfoBase::getMember) : new PsiElement[]{aClass}; myProcessedElementsHeader = RefactoringBundle.message("push.down.members.elements.header", memberInfos != null ? DescriptiveNameUtil.getDescriptiveName(aClass) : ""); diff --git a/platform/lang-impl/src/com/intellij/refactoring/util/AbstractParameterTablePanel.java b/platform/lang-impl/src/com/intellij/refactoring/util/AbstractParameterTablePanel.java index 4e3e4baeb3d3..091379cb08ff 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/util/AbstractParameterTablePanel.java +++ b/platform/lang-impl/src/com/intellij/refactoring/util/AbstractParameterTablePanel.java @@ -134,9 +134,9 @@ public abstract class AbstractParameterTablePanel

{ - private final Predicate myNameValidator; + private final Predicate myNameValidator; - public NameColumnInfo(Predicate nameValidator) { + public NameColumnInfo(Predicate nameValidator) { super("Name"); myNameValidator = nameValidator; } diff --git a/platform/lang-impl/src/com/intellij/refactoring/util/SimpleParameterTablePanel.java b/platform/lang-impl/src/com/intellij/refactoring/util/SimpleParameterTablePanel.java index e140a949236b..36b3deba15a7 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/util/SimpleParameterTablePanel.java +++ b/platform/lang-impl/src/com/intellij/refactoring/util/SimpleParameterTablePanel.java @@ -22,7 +22,7 @@ import com.intellij.util.ui.ColumnInfo; import java.util.function.Predicate; public abstract class SimpleParameterTablePanel extends AbstractParameterTablePanel { - public SimpleParameterTablePanel(Predicate parameterNameValidator) { + public SimpleParameterTablePanel(Predicate parameterNameValidator) { super(new PassParameterColumnInfo(), new NameColumnInfo(parameterNameValidator)); } diff --git a/platform/lang-impl/src/com/intellij/task/impl/ModuleFilesBuildTaskImpl.java b/platform/lang-impl/src/com/intellij/task/impl/ModuleFilesBuildTaskImpl.java index d4e8ef3eb4ed..e1e9f685c197 100644 --- a/platform/lang-impl/src/com/intellij/task/impl/ModuleFilesBuildTaskImpl.java +++ b/platform/lang-impl/src/com/intellij/task/impl/ModuleFilesBuildTaskImpl.java @@ -36,7 +36,7 @@ public class ModuleFilesBuildTaskImpl extends ModuleBuildTaskImpl implements Mod myFiles = files; } - public ModuleFilesBuildTaskImpl(Module module, boolean isIncrementalBuild, Collection files) { + public ModuleFilesBuildTaskImpl(Module module, boolean isIncrementalBuild, Collection files) { this(module, isIncrementalBuild, ArrayUtil.toObjectArray(files, VirtualFile.class)); } diff --git a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java index 90ac10a71856..d4f1ff8fe640 100644 --- a/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java +++ b/platform/lang-impl/src/com/intellij/ui/DeferredIconImpl.java @@ -109,7 +109,7 @@ public class DeferredIconImpl extends CachingScalableJBIcon evaluator) { + public DeferredIconImpl(Icon baseIcon, T param, final boolean needReadAction, @NotNull Function evaluator) { this(baseIcon, param, needReadAction, evaluator, null, false); } diff --git a/platform/lang-impl/src/com/intellij/ui/EditorTextFieldProviderImpl.java b/platform/lang-impl/src/com/intellij/ui/EditorTextFieldProviderImpl.java index c55bc2b04972..04daddd8e043 100644 --- a/platform/lang-impl/src/com/intellij/ui/EditorTextFieldProviderImpl.java +++ b/platform/lang-impl/src/com/intellij/ui/EditorTextFieldProviderImpl.java @@ -40,9 +40,9 @@ public class EditorTextFieldProviderImpl implements EditorTextFieldProvider { private static class MyEditorTextField extends LanguageTextField { - @NotNull private final Iterable myCustomizations; + @NotNull private final Iterable myCustomizations; - MyEditorTextField(@NotNull Language language, @NotNull Project project, @NotNull Iterable customizations) { + MyEditorTextField(@NotNull Language language, @NotNull Project project, @NotNull Iterable customizations) { super(language, project, "", false); myCustomizations = customizations; } diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java index 1c90e734c2b0..13d807e305f9 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexImpl.java @@ -2352,7 +2352,7 @@ public class FileBasedIndexImpl extends FileBasedIndex implements BaseComponent, private boolean currentVersionCorrupted; private SerializationManagerEx mySerializationManagerEx; - FileIndexDataInitialization(@NotNull List extensions) { + FileIndexDataInitialization(@NotNull List extensions) { // init contentless indices first if (!extensions.isEmpty()) { extensions = ContainerUtil.copyList(extensions); diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/revertion/DifferenceReverter.java b/platform/lvcs-impl/src/com/intellij/history/integration/revertion/DifferenceReverter.java index baeb41d96324..a552b8848efc 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/revertion/DifferenceReverter.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/revertion/DifferenceReverter.java @@ -36,10 +36,10 @@ import java.util.Set; public class DifferenceReverter extends Reverter { private final IdeaGateway myGateway; - private final List myDiffs; + private final List myDiffs; private final Revision myLeftRevision; - public DifferenceReverter(Project p, LocalHistoryFacade vcs, IdeaGateway gw, List diffs, Revision leftRevision) { + public DifferenceReverter(Project p, LocalHistoryFacade vcs, IdeaGateway gw, List diffs, Revision leftRevision) { super(p, vcs, gw); myGateway = gw; myDiffs = diffs; diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionCalculator.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionCalculator.java index b12b220d2a39..cdd9aac71d22 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionCalculator.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/models/SelectionCalculator.java @@ -31,12 +31,12 @@ public class SelectionCalculator { private static final Block EMPTY_BLOCK = new Block("", 0, 0); private final IdeaGateway myGateway; - private final List myRevisions; + private final List myRevisions; private final int myFromLine; private final int myToLine; private final Map myCache = new HashMap<>(); - public SelectionCalculator(IdeaGateway gw, List rr, int fromLine, int toLine) { + public SelectionCalculator(IdeaGateway gw, List rr, int fromLine, int toLine) { myGateway = gw; myRevisions = rr; myFromLine = fromLine; diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RevisionsList.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RevisionsList.java index a059bb2611a6..ebcefa9bd872 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RevisionsList.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/RevisionsList.java @@ -144,10 +144,10 @@ public class RevisionsList { } public static class MyModel extends AbstractTableModel { - private final List myRevisions; + private final List myRevisions; private final Map myPeriods; - public MyModel(List revisions, Map periods) { + public MyModel(List revisions, Map periods) { myRevisions = revisions; myPeriods = periods; } diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java index 69e26eaab454..5be04ab6abe5 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/AbstractTreeBuilder.java @@ -165,7 +165,7 @@ public class AbstractTreeBuilder implements Disposable { return ui == null ? null : ui.getRootNode(); } - public final void setNodeDescriptorComparator(Comparator nodeDescriptorComparator) { + public final void setNodeDescriptorComparator(Comparator nodeDescriptorComparator) { AbstractTreeUi ui = getUi(); if (ui != null) ui.setNodeDescriptorComparator(nodeDescriptorComparator); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java b/platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java index efb8a3bd6a1c..fd5fc123cadd 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/ComponentWithBrowseButton.java @@ -220,7 +220,7 @@ public class ComponentWithBrowseButton extends JPanel i private final String myTitle; private final String myDescription; protected ComponentWithBrowseButton myTextComponent; - private final TextComponentAccessor myAccessor; + private final TextComponentAccessor myAccessor; private Project myProject; protected final FileChooserDescriptor myFileChooserDescriptor; @@ -229,7 +229,7 @@ public class ComponentWithBrowseButton extends JPanel i ComponentWithBrowseButton textField, @Nullable Project project, FileChooserDescriptor fileChooserDescriptor, - TextComponentAccessor accessor) { + TextComponentAccessor accessor) { if (fileChooserDescriptor != null && fileChooserDescriptor.isChooseMultiple()) { LOG.error("multiple selection not supported"); fileChooserDescriptor = new FileChooserDescriptor(fileChooserDescriptor) { diff --git a/platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java b/platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java index 9b4a5f78c9e6..4ace58110f9b 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java @@ -41,10 +41,10 @@ public abstract class NamedItemsListEditor extends MasterDetailsComponent { private final List myOriginalItems; private boolean myShowIcons; - protected NamedItemsListEditor(Namer namer, - Factory factory, + protected NamedItemsListEditor(Namer namer, + Factory factory, Cloner cloner, - Equality comparer, + Equality comparer, List items) { this(namer, factory, cloner, comparer, items, true); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/popup/util/BaseListPopupStep.java b/platform/platform-api/src/com/intellij/openapi/ui/popup/util/BaseListPopupStep.java index 728d55c8d06d..418c071f30c3 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/popup/util/BaseListPopupStep.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/popup/util/BaseListPopupStep.java @@ -55,7 +55,7 @@ public class BaseListPopupStep extends BaseStep implements ListPopupStep values, List icons) { + public BaseListPopupStep(@Nullable String title, @NotNull List values, List icons) { init(title, values, icons); } diff --git a/platform/platform-api/src/com/intellij/ui/InplaceButton.java b/platform/platform-api/src/com/intellij/ui/InplaceButton.java index 6479ec63c4a8..e2fd09e91592 100644 --- a/platform/platform-api/src/com/intellij/ui/InplaceButton.java +++ b/platform/platform-api/src/com/intellij/ui/InplaceButton.java @@ -55,7 +55,7 @@ public class InplaceButton extends JComponent implements ActiveComponent, Access this(new IconButton(tooltip, icon, icon), listener, null); } - public InplaceButton(String tooltip, final Icon icon, final ActionListener listener, final Pass me) { + public InplaceButton(String tooltip, final Icon icon, final ActionListener listener, final Pass me) { this(new IconButton(tooltip, icon, icon), listener, me); } @@ -63,11 +63,11 @@ public class InplaceButton extends JComponent implements ActiveComponent, Access this(source, listener, null); } - public InplaceButton(IconButton source, final ActionListener listener, final Pass me) { + public InplaceButton(IconButton source, final ActionListener listener, final Pass me) { this(source, listener, me, TimedDeadzone.DEFAULT); } - public InplaceButton(IconButton source, final ActionListener listener, final Pass me, TimedDeadzone.Length mouseDeadzone) { + public InplaceButton(IconButton source, final ActionListener listener, final Pass me, TimedDeadzone.Length mouseDeadzone) { myListener = listener; myBehavior = new BaseButtonBehavior(this, mouseDeadzone) { @Override diff --git a/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java b/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java index 671802f88577..51268a82c135 100644 --- a/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java +++ b/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java @@ -35,7 +35,7 @@ public class RawCommandLineEditor extends JPanel implements TextAccessor { this(ParametersListUtil.DEFAULT_LINE_PARSER, ParametersListUtil.DEFAULT_LINE_JOINER); } - public RawCommandLineEditor(final Function> lineParser, final Function, String> lineJoiner) { + public RawCommandLineEditor(final Function> lineParser, final Function, String> lineJoiner) { super(new BorderLayout()); myEditor = new ExpandableTextField(lineParser, lineJoiner); add(myEditor, BorderLayout.CENTER); diff --git a/platform/platform-api/src/com/intellij/ui/SortedComboBoxModel.java b/platform/platform-api/src/com/intellij/ui/SortedComboBoxModel.java index 8198fbf3a6c2..1fa0a636fde1 100644 --- a/platform/platform-api/src/com/intellij/ui/SortedComboBoxModel.java +++ b/platform/platform-api/src/com/intellij/ui/SortedComboBoxModel.java @@ -23,7 +23,7 @@ import java.util.Comparator; public class SortedComboBoxModel extends SortedListModel implements ComboBoxModel { private T mySelection; - public SortedComboBoxModel(Comparator comparator) { + public SortedComboBoxModel(Comparator comparator) { super(comparator); } diff --git a/platform/platform-api/src/com/intellij/ui/SortedListModel.java b/platform/platform-api/src/com/intellij/ui/SortedListModel.java index 3672c004cfaf..0adad269fa7a 100644 --- a/platform/platform-api/src/com/intellij/ui/SortedListModel.java +++ b/platform/platform-api/src/com/intellij/ui/SortedListModel.java @@ -8,18 +8,18 @@ import java.util.*; public class SortedListModel extends AbstractListModel { private List myItems = new ArrayList<>(); - private final Comparator myComparator; + private final Comparator myComparator; - public SortedListModel(Comparator comparator) { + public SortedListModel(Comparator comparator) { myComparator = comparator; } - public SortedListModel(Collection items, Comparator comparator) { + public SortedListModel(Collection items, Comparator comparator) { this(comparator); addAll(items); } - public static SortedListModel create(Comparator comparator) { + public static SortedListModel create(Comparator comparator) { return new SortedListModel<>(comparator); } @@ -44,7 +44,7 @@ public class SortedListModel extends AbstractListModel { return addAll(ContainerUtil.collect(iterator)); } - public int[] addAll(Collection items) { + public int[] addAll(Collection items) { int[] indices = new int[items.size()]; int i = 0; for (T item : items) { diff --git a/platform/platform-api/src/com/intellij/ui/components/JBList.java b/platform/platform-api/src/com/intellij/ui/components/JBList.java index 3971b69c3bfd..90fdc2da4e86 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBList.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBList.java @@ -68,7 +68,7 @@ public class JBList extends JList implements ComponentWithEmptyText, Compo return model; } - public JBList(@NotNull Collection items) { + public JBList(@NotNull Collection items) { this(createDefaultListModel(items)); } diff --git a/platform/platform-api/src/com/intellij/ui/components/fields/ExpandableTextField.java b/platform/platform-api/src/com/intellij/ui/components/fields/ExpandableTextField.java index 98aca565d9f8..96cc1b6f3514 100644 --- a/platform/platform-api/src/com/intellij/ui/components/fields/ExpandableTextField.java +++ b/platform/platform-api/src/com/intellij/ui/components/fields/ExpandableTextField.java @@ -41,7 +41,7 @@ public class ExpandableTextField extends ExtendableTextField implements Expandab * * @see ParametersListUtil */ - public ExpandableTextField(@NotNull Function> parser, @NotNull Function, String> joiner) { + public ExpandableTextField(@NotNull Function> parser, @NotNull Function, String> joiner) { Function onShow = text -> StringUtil.join(parser.fun(text), "\n"); Function onHide = text -> joiner.fun(asList(StringUtil.splitByLines(text))); support = new ExpandableSupport(this, onShow, onHide) { diff --git a/platform/platform-api/src/com/intellij/ui/speedSearch/NameFilteringListModel.java b/platform/platform-api/src/com/intellij/ui/speedSearch/NameFilteringListModel.java index d13e821fa097..76bb79cd4240 100644 --- a/platform/platform-api/src/com/intellij/ui/speedSearch/NameFilteringListModel.java +++ b/platform/platform-api/src/com/intellij/ui/speedSearch/NameFilteringListModel.java @@ -45,7 +45,7 @@ public class NameFilteringListModel extends FilteringListModel { this(list, namer, filter, () -> speedSearch.getFilter()); } - public NameFilteringListModel(JList list, final Function namer, final Condition filter, final SpeedSearchSupply speedSearch) { + public NameFilteringListModel(JList list, final Function namer, final Condition filter, final SpeedSearchSupply speedSearch) { this(list, namer, filter, () -> { final String prefix = speedSearch.getEnteredPrefix(); return prefix == null ? "" : prefix; diff --git a/platform/platform-api/src/com/intellij/util/concurrency/QueueProcessor.java b/platform/platform-api/src/com/intellij/util/concurrency/QueueProcessor.java index 52e1ec589626..83660c13bafe 100644 --- a/platform/platform-api/src/com/intellij/util/concurrency/QueueProcessor.java +++ b/platform/platform-api/src/com/intellij/util/concurrency/QueueProcessor.java @@ -46,18 +46,18 @@ public class QueueProcessor { /** * Constructs a QueueProcessor, which will autostart as soon as the first element is added to it. */ - public QueueProcessor(@NotNull Consumer processor) { + public QueueProcessor(@NotNull Consumer processor) { this(processor, Conditions.alwaysFalse()); } /** * Constructs a QueueProcessor, which will autostart as soon as the first element is added to it. */ - public QueueProcessor(@NotNull Consumer processor, @NotNull Condition deathCondition) { + public QueueProcessor(@NotNull Consumer processor, @NotNull Condition deathCondition) { this(processor, deathCondition, true); } - public QueueProcessor(@NotNull Consumer processor, @NotNull Condition deathCondition, boolean autostart) { + public QueueProcessor(@NotNull Consumer processor, @NotNull Condition deathCondition, boolean autostart) { this(wrappingProcessor(processor), autostart, ThreadToUse.POOLED, deathCondition); } diff --git a/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java b/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java index 0ce00d31b6cf..19b697c3f364 100644 --- a/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java +++ b/platform/platform-impl/src/com/intellij/application/options/schemes/AbstractSchemesPanel.java @@ -160,7 +160,7 @@ public abstract class AbstractSchemesPanel schemes) { + public final void resetSchemes(@NotNull Collection schemes) { mySchemesCombo.resetSchemes(schemes); } diff --git a/platform/platform-impl/src/com/intellij/codeInsight/editorActions/TextBlockTransferable.java b/platform/platform-impl/src/com/intellij/codeInsight/editorActions/TextBlockTransferable.java index 8a5b01e10ca6..3ee81302228a 100644 --- a/platform/platform-impl/src/com/intellij/codeInsight/editorActions/TextBlockTransferable.java +++ b/platform/platform-impl/src/com/intellij/codeInsight/editorActions/TextBlockTransferable.java @@ -19,12 +19,12 @@ import java.io.StringReader; import java.util.*; public class TextBlockTransferable implements Transferable { - private final Collection myExtraData; + private final Collection myExtraData; private final RawText myRawText; private final String myText; private final DataFlavor[] myTransferDataFlavors; - public TextBlockTransferable(@NotNull String text, @NotNull Collection extraData, @Nullable RawText rawText) { + public TextBlockTransferable(@NotNull String text, @NotNull Collection extraData, @Nullable RawText rawText) { myText = cleanFromNullsIfNeeded(text); myExtraData = extraData; myRawText = rawText; diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/TransferableList.java b/platform/platform-impl/src/com/intellij/ide/dnd/TransferableList.java index 0b0ddad2350e..73ba10f80419 100644 --- a/platform/platform-impl/src/com/intellij/ide/dnd/TransferableList.java +++ b/platform/platform-impl/src/com/intellij/ide/dnd/TransferableList.java @@ -40,7 +40,7 @@ abstract public class TransferableList implements Transferable { this(Arrays.asList(array)); } - public TransferableList(List list) { + public TransferableList(List list) { myList = Collections.unmodifiableList(list); } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginsGroupComponent.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginsGroupComponent.java index d051b91b5ea7..49eda19a45e5 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginsGroupComponent.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginsGroupComponent.java @@ -26,14 +26,14 @@ public class PluginsGroupComponent extends JBPanelWithEmptyText { private final EventHandler myEventHandler; private final LinkListener myListener; private final LinkListener mySearchListener; - private final Function myFunction; + private final Function myFunction; private final List myGroups = new ArrayList<>(); public PluginsGroupComponent(@NotNull LayoutManager layout, @NotNull EventHandler eventHandler, @NotNull LinkListener listener, @NotNull LinkListener searchListener, - @NotNull Function function) { + @NotNull Function function) { super(layout); myEventHandler = eventHandler; myListener = listener; diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginsGroupComponentWithProgress.java b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginsGroupComponentWithProgress.java index 993f16a455e9..b2549632f734 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginsGroupComponentWithProgress.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/newui/PluginsGroupComponentWithProgress.java @@ -22,7 +22,7 @@ public class PluginsGroupComponentWithProgress extends PluginsGroupComponent { @NotNull EventHandler eventHandler, @NotNull LinkListener listener, @NotNull LinkListener searchListener, - @NotNull Function function) { + @NotNull Function function) { super(layout, eventHandler, listener, searchListener, function); myIcon.setOpaque(false); myIcon.setPaintPassiveIcon(false); diff --git a/platform/platform-impl/src/com/intellij/ide/util/ChooseElementsDialog.java b/platform/platform-impl/src/com/intellij/ide/util/ChooseElementsDialog.java index d18e1ab1b0d8..2ce721ab427a 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/ChooseElementsDialog.java +++ b/platform/platform-impl/src/com/intellij/ide/util/ChooseElementsDialog.java @@ -34,11 +34,11 @@ public abstract class ChooseElementsDialog extends DialogWrapper { initializeDialog(items, title, sort); } - public ChooseElementsDialog(Component parent, List items, String title) { + public ChooseElementsDialog(Component parent, List items, String title) { this(parent, items, title, null, false); } - public ChooseElementsDialog(Component parent, List items, String title, @Nullable String description, final boolean sort) { + public ChooseElementsDialog(Component parent, List items, String title, @Nullable String description, final boolean sort) { super(parent, true); myDescription = description; initializeDialog(items, title, sort); diff --git a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java index 4d6fb3b0f022..06b7c3545c28 100644 --- a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java +++ b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java @@ -1162,7 +1162,7 @@ public class UiInspectorAction extends ToggleAction implements DumbAware { final Component myComponent; final List myProperties = ContainerUtil.newArrayList(); - InspectorTableModel(@NotNull List clickInfo) { + InspectorTableModel(@NotNull List clickInfo) { myComponent = null; myProperties.addAll(clickInfo); } diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.java index 1c9d86a2b7e2..468c1aaadedb 100644 --- a/platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/CannotUndoReportDialog.java @@ -26,7 +26,7 @@ public class CannotUndoReportDialog extends DialogWrapper { private JPanel myPanel; private JLabel myProblemMessageLabel; - public CannotUndoReportDialog(Project project, @Nls String problemText, Collection files) { + public CannotUndoReportDialog(Project project, @Nls String problemText, Collection files) { super(project, false); DefaultListModel model = new DefaultListModel<>(); diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/CompositeDiffTool.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/CompositeDiffTool.java index 9b3bdf825193..a369afff57da 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/CompositeDiffTool.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/CompositeDiffTool.java @@ -22,7 +22,7 @@ class CompositeDiffTool implements DiffTool { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.diff.impl.external.CompositeDiffTool"); private final List myTools; - CompositeDiffTool(@NotNull List tools) { + CompositeDiffTool(@NotNull List tools) { myTools = new ArrayList<>(tools); } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/tree/FileRefresher.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/tree/FileRefresher.java index de20ea974dd9..79b4123f8c30 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/tree/FileRefresher.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/tree/FileRefresher.java @@ -43,7 +43,7 @@ public class FileRefresher implements Disposable { private final ScheduledExecutorService executor = EdtExecutorService.getScheduledExecutorInstance(); private final boolean recursive; private final long delay; - private final NotNullProducer producer; + private final NotNullProducer producer; private final ArrayList watchers = new ArrayList<>(); private final ArrayList files = new ArrayList<>(); private final AtomicBoolean scheduled = new AtomicBoolean(); @@ -58,7 +58,7 @@ public class FileRefresher implements Disposable { * @param producer a provider for modality state that can be invoked on background thread * @throws IllegalArgumentException if the specified delay is not positive */ - public FileRefresher(boolean recursive, long delay, @NotNull NotNullProducer producer) { + public FileRefresher(boolean recursive, long delay, @NotNull NotNullProducer producer) { if (delay <= 0) throw new IllegalArgumentException("delay"); this.recursive = recursive; this.delay = delay; diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.java index 5e0404383ab7..7729c855104c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/NonProjectFileWritingAccessDialog.java @@ -25,12 +25,12 @@ public class NonProjectFileWritingAccessDialog extends DialogWrapper { private JRadioButton myUnlockDirButton; private JRadioButton myUnlockAllButton; - public NonProjectFileWritingAccessDialog(@NotNull Project project, @NotNull List nonProjectFiles) { + public NonProjectFileWritingAccessDialog(@NotNull Project project, @NotNull List nonProjectFiles) { this(project, nonProjectFiles, "Non-Project Files"); } public NonProjectFileWritingAccessDialog(@NotNull Project project, - @NotNull List nonProjectFiles, + @NotNull List nonProjectFiles, @NotNull String filesType) { super(project); setTitle(filesType + " Protection"); diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginUpdateInfoDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginUpdateInfoDialog.java index 7f022eb0abeb..dc0fbc9a23af 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginUpdateInfoDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/PluginUpdateInfoDialog.java @@ -20,10 +20,10 @@ import java.util.Set; * @author pti */ class PluginUpdateInfoDialog extends AbstractUpdateDialog { - private final Collection myUploadedPlugins; + private final Collection myUploadedPlugins; private final boolean myPlatformUpdate; - PluginUpdateInfoDialog(Collection uploadedPlugins, boolean enableLink) { + PluginUpdateInfoDialog(Collection uploadedPlugins, boolean enableLink) { super(enableLink); myUploadedPlugins = uploadedPlugins; myPlatformUpdate = false; @@ -33,7 +33,7 @@ class PluginUpdateInfoDialog extends AbstractUpdateDialog { /** * Used from {@link UpdateInfoDialog} when both platform and plugin updates are available. */ - PluginUpdateInfoDialog(@NotNull Collection updatePlugins) { + PluginUpdateInfoDialog(@NotNull Collection updatePlugins) { super(false); myUploadedPlugins = updatePlugins; myPlatformUpdate = true; diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java index 8e7ef5202cb5..226eaea2a132 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateInfoDialog.java @@ -56,7 +56,7 @@ import static javax.swing.ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED; class UpdateInfoDialog extends AbstractUpdateDialog { private final UpdateChannel myUpdatedChannel; private final boolean myForceHttps; - private final Collection myUpdatedPlugins; + private final Collection myUpdatedPlugins; private final BuildInfo myNewBuild; private final UpdateChain myPatches; private final boolean myWriteProtected; @@ -68,8 +68,8 @@ class UpdateInfoDialog extends AbstractUpdateDialog { @Nullable UpdateChain patches, boolean enableLink, boolean forceHttps, - @Nullable Collection updatedPlugins, - @Nullable Collection incompatiblePlugins) { + @Nullable Collection updatedPlugins, + @Nullable Collection incompatiblePlugins) { super(enableLink); myUpdatedChannel = channel; myForceHttps = forceHttps; diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java index 93c5b9e24910..ce8fb8eec5ea 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiser.java @@ -433,7 +433,7 @@ public class PluginsAdvertiser implements StartupActivity { public PluginSet() { } - public PluginSet(Set plugins) { + public PluginSet(Set plugins) { myPlugins.addAll(plugins); } } @@ -484,17 +484,17 @@ public class PluginsAdvertiser implements StartupActivity { } private static class ConfigurePluginsListener implements NotificationListener { - private final Set myUnknownFeatures; + private final Set myUnknownFeatures; private final Project myProject; - private final List myAllPlugins; + private final List myAllPlugins; private final Set myPlugins; private final Map myDisabledPlugins; - ConfigurePluginsListener(Set unknownFeatures, - Project project, - List allPlugins, - Set plugins, - Map disabledPlugins) { + ConfigurePluginsListener(Set unknownFeatures, + Project project, + List allPlugins, + Set plugins, + Map disabledPlugins) { myUnknownFeatures = unknownFeatures; myProject = project; myAllPlugins = allPlugins; diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java index 7a944abad0d2..1093bb4f904e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserDialog.java @@ -22,12 +22,12 @@ public class PluginsAdvertiserDialog extends DialogWrapper { @Nullable private final Project myProject; private final PluginDownloader[] myUploadedPlugins; - private final List myAllPlugins; + private final List myAllPlugins; private final Set mySkippedPlugins = new HashSet<>(); private final PluginManagerMain.PluginEnabler.HEADLESS pluginHelper = new PluginManagerMain.PluginEnabler.HEADLESS(); - PluginsAdvertiserDialog(@Nullable Project project, PluginDownloader[] plugins, List allPlugins) { + PluginsAdvertiserDialog(@Nullable Project project, PluginDownloader[] plugins, List allPlugins) { super(project); myProject = project; Arrays.sort(plugins, (o1, o2) -> o1.getPluginName().compareToIgnoreCase(o2.getPluginName())); diff --git a/platform/platform-impl/src/com/intellij/openapi/util/RequestsMerger.java b/platform/platform-impl/src/com/intellij/openapi/util/RequestsMerger.java index a5d121378d9d..cda86c33780b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/util/RequestsMerger.java +++ b/platform/platform-impl/src/com/intellij/openapi/util/RequestsMerger.java @@ -44,12 +44,12 @@ public class RequestsMerger { private final Object myLock = new Object(); private MyState myState; - private final Consumer myAlarm; + private final Consumer myAlarm; private final List myWaitingStartListeners = new ArrayList<>(); private final List myWaitingFinishListeners = new ArrayList<>(); - public RequestsMerger(final Runnable runnable, final Consumer alarm) { + public RequestsMerger(final Runnable runnable, final Consumer alarm) { myAlarm = alarm; myWorker = new MyWorker(runnable); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java index fb93fd0138e1..2e8f1567f18c 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java @@ -36,7 +36,7 @@ import java.awt.image.BufferedImage; * @author pegov */ public abstract class ToolWindowHeader extends JPanel implements Disposable, UISettingsListener { - @NotNull private final Producer myGearProducer; + @NotNull private final Producer myGearProducer; private ToolWindow myToolWindow; private BufferedImage myImage; @@ -46,7 +46,7 @@ public abstract class ToolWindowHeader extends JPanel implements Disposable, UIS private final DefaultActionGroup myActionGroup = new DefaultActionGroup(); private ActionToolbar myToolbar; - ToolWindowHeader(final ToolWindowImpl toolWindow, @NotNull final Producer gearProducer) { + ToolWindowHeader(final ToolWindowImpl toolWindow, @NotNull final Producer gearProducer) { myGearProducer = gearProducer; setLayout(new BorderLayout()); AccessibleContextUtil.setName(this, "Tool Window Header"); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java index 66818cd2caba..d7aab67dda23 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowsPane.java @@ -1217,7 +1217,7 @@ public final class ToolWindowsPane extends JBLayeredPane implements UISettingsLi } private static class ImageCache extends ScaleContext.Cache { - ImageCache(@NotNull Function imageProvider) { + ImageCache(@NotNull Function imageProvider) { super(imageProvider); } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java index 2d9920caf751..7f93fbc8fb7a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/FlatWelcomeFrame.java @@ -1035,7 +1035,7 @@ public class FlatWelcomeFrame extends JFrame implements IdeFrame, Disposable, Ac return cancelButton; } - public static void installQuickSearch(JBList list) { + public static void installQuickSearch(JBList list) { new ListSpeedSearch<>(list, (Function)o -> { if (o instanceof AbstractActionWithPanel) { //to avoid dependency mess with ProjectSettingsStepBase return o.getTemplatePresentation().getText(); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeBalloonLayoutImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeBalloonLayoutImpl.java index 8597bc859d84..423188ccbce7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeBalloonLayoutImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/WelcomeBalloonLayoutImpl.java @@ -48,16 +48,16 @@ import static com.intellij.notification.impl.NotificationsManagerImpl.FILL_COLOR public class WelcomeBalloonLayoutImpl extends BalloonLayoutImpl { private static final String TYPE_KEY = "Type"; - private final Consumer> myListener; - private final Computable myButtonLocation; + private final Consumer> myListener; + private final Computable myButtonLocation; private BalloonImpl myPopupBalloon; private final BalloonPanel myBalloonPanel = new BalloonPanel(); private boolean myVisible; public WelcomeBalloonLayoutImpl(@NotNull JRootPane parent, @NotNull Insets insets, - @NotNull Consumer> listener, - @NotNull Computable buttonLocation) { + @NotNull Consumer> listener, + @NotNull Computable buttonLocation) { super(parent, insets); myListener = listener; myButtonLocation = buttonLocation; diff --git a/platform/platform-impl/src/com/intellij/ui/ListSpeedSearch.java b/platform/platform-impl/src/com/intellij/ui/ListSpeedSearch.java index bfafe6bdde27..08f384acfb59 100644 --- a/platform/platform-impl/src/com/intellij/ui/ListSpeedSearch.java +++ b/platform/platform-impl/src/com/intellij/ui/ListSpeedSearch.java @@ -32,7 +32,7 @@ import java.util.Arrays; import java.util.List; public class ListSpeedSearch extends SpeedSearchBase> { - @Nullable private final Function myToStringConvertor; + @Nullable private final Function myToStringConvertor; public ListSpeedSearch(JList list) { super(list); @@ -41,7 +41,7 @@ public class ListSpeedSearch extends SpeedSearchBase> { } @SuppressWarnings("LambdaUnfriendlyMethodOverload") - public ListSpeedSearch(final JList list, @NotNull Function convertor) { + public ListSpeedSearch(final JList list, @NotNull Function convertor) { super(list); myToStringConvertor = convertor; registerSelectAll(list); @@ -52,7 +52,7 @@ public class ListSpeedSearch extends SpeedSearchBase> { */ @Deprecated @SuppressWarnings("LambdaUnfriendlyMethodOverload") - public ListSpeedSearch(final JList list, @Nullable Convertor convertor) { + public ListSpeedSearch(final JList list, @Nullable Convertor convertor) { super(list); myToStringConvertor = convertor == null ? null : convertor::convert; registerSelectAll(list); diff --git a/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java b/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java index f5661e6a4e3c..7244e7eacb50 100644 --- a/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java +++ b/platform/platform-impl/src/com/intellij/ui/TableSpeedSearch.java @@ -33,7 +33,7 @@ import static javax.swing.ListSelectionModel.MULTIPLE_INTERVAL_SELECTION; public class TableSpeedSearch extends SpeedSearchBase { private static final PairFunction TO_STRING = (o, cell) -> o == null || o instanceof Boolean ? "" : o.toString(); - private final PairFunction myToStringConvertor; + private final PairFunction myToStringConvertor; public TableSpeedSearch(JTable table) { this(table, TO_STRING); @@ -43,7 +43,7 @@ public class TableSpeedSearch extends SpeedSearchBase { this(table, (o, c) -> toStringConvertor.convert(o)); } - public TableSpeedSearch(JTable table, final PairFunction toStringConvertor) { + public TableSpeedSearch(JTable table, final PairFunction toStringConvertor) { super(table); myToStringConvertor = toStringConvertor; diff --git a/platform/platform-impl/src/com/intellij/ui/TreeSpeedSearch.java b/platform/platform-impl/src/com/intellij/ui/TreeSpeedSearch.java index f525dfdefba3..a38c2c9869b1 100644 --- a/platform/platform-impl/src/com/intellij/ui/TreeSpeedSearch.java +++ b/platform/platform-impl/src/com/intellij/ui/TreeSpeedSearch.java @@ -44,11 +44,11 @@ public class TreeSpeedSearch extends SpeedSearchBase { this(tree, TO_STRING); } - public TreeSpeedSearch(Tree tree, Convertor toString) { + public TreeSpeedSearch(Tree tree, Convertor toString) { this(tree, toString, false); } - public TreeSpeedSearch(Tree tree, Convertor toString, boolean canExpand) { + public TreeSpeedSearch(Tree tree, Convertor toString, boolean canExpand) { this((JTree)tree, toString, canExpand); } diff --git a/platform/platform-impl/src/com/intellij/ui/TreeTableSpeedSearch.java b/platform/platform-impl/src/com/intellij/ui/TreeTableSpeedSearch.java index 7c15c83febe8..9a260226799a 100644 --- a/platform/platform-impl/src/com/intellij/ui/TreeTableSpeedSearch.java +++ b/platform/platform-impl/src/com/intellij/ui/TreeTableSpeedSearch.java @@ -14,9 +14,9 @@ public class TreeTableSpeedSearch extends SpeedSearchBase { DefaultMutableTreeNode node = (DefaultMutableTreeNode)object.getLastPathComponent(); return node.toString(); }; - private final Convertor myToStringConvertor; + private final Convertor myToStringConvertor; - public TreeTableSpeedSearch(TreeTable tree, Convertor toStringConvertor) { + public TreeTableSpeedSearch(TreeTable tree, Convertor toStringConvertor) { super(tree); myToStringConvertor = toStringConvertor; } diff --git a/platform/platform-impl/src/com/intellij/ui/tree/project/ProjectFileTreeModel.java b/platform/platform-impl/src/com/intellij/ui/tree/project/ProjectFileTreeModel.java index f7dec4d107a2..dbaa2847fef7 100644 --- a/platform/platform-impl/src/com/intellij/ui/tree/project/ProjectFileTreeModel.java +++ b/platform/platform-impl/src/com/intellij/ui/tree/project/ProjectFileTreeModel.java @@ -166,7 +166,7 @@ public final class ProjectFileTreeModel extends BaseTreeModel i private static final class Mapper implements BiFunction { private final HashMap map = new HashMap<>(); - Mapper(@NotNull List list) { + Mapper(@NotNull List list) { list.forEach(node -> map.put(node.file, node)); } diff --git a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java index 5d2eec35bd1b..28de3b4ec3b0 100644 --- a/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java +++ b/platform/remote-servers/impl/src/com/intellij/remoteServer/impl/runtime/ServerConnectionImpl.java @@ -474,9 +474,9 @@ public class ServerConnectionImpl implements private final Map myRemoteDeployments = new HashMap<>(); private final Map myLocalDeployments = new HashMap<>(); private List myCachedAllDeployments; - private final Comparator myDeploymentComparator; + private final Comparator myDeploymentComparator; - MyDeployments(Comparator deploymentComparator) { + MyDeployments(Comparator deploymentComparator) { myDeploymentComparator = deploymentComparator; } diff --git a/platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonReaders.java b/platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonReaders.java index b3e3976f3716..33401b39863b 100644 --- a/platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonReaders.java +++ b/platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/JsonReaders.java @@ -26,7 +26,7 @@ public final class JsonReaders { private JsonReaders() { } - public static ObjectFactory> mapFactory(@NotNull ObjectFactory valueFactory) { + public static ObjectFactory> mapFactory(@NotNull ObjectFactory valueFactory) { return new MapFactory<>(valueFactory); } diff --git a/platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/MapFactory.java b/platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/MapFactory.java index e1a1451eebce..d602df9e7f02 100644 --- a/platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/MapFactory.java +++ b/platform/script-debugger/protocol/protocol-reader-runtime/src/org/jetbrains/jsonProtocol/MapFactory.java @@ -6,9 +6,9 @@ import org.jetbrains.io.JsonReaderEx; import java.util.Map; final class MapFactory extends ObjectFactory> { - private final ObjectFactory valueFactory; + private final ObjectFactory valueFactory; - MapFactory(@NotNull ObjectFactory valueFactory) { + MapFactory(@NotNull ObjectFactory valueFactory) { this.valueFactory = valueFactory; } diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/TestProxyPrinterProvider.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/TestProxyPrinterProvider.java index cbac46d4e97f..d5590771b8c7 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/TestProxyPrinterProvider.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/runner/TestProxyPrinterProvider.java @@ -54,11 +54,11 @@ public final class TestProxyPrinterProvider { contentType -> ConsoleViewContentType.ERROR_OUTPUT == contentType; private static final String NL = "\n"; - private final Condition myContentTypeCondition; + private final Condition myContentTypeCondition; private final Filter myFilter; HyperlinkPrinter(@NotNull BaseTestsOutputConsoleView testsOutputConsoleView, - @NotNull Condition contentTypeCondition, + @NotNull Condition contentTypeCondition, @NotNull Filter filter) { super(testsOutputConsoleView, testsOutputConsoleView.getProperties(), null); myContentTypeCondition = contentTypeCondition; diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java index cc10b9da2e51..1b3dd1fd8eef 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/StructuralSearchProfile.java @@ -317,7 +317,7 @@ public abstract class StructuralSearchProfile { return false; } - public final boolean isApplicableConstraint(String constraintName, List nodes, boolean completePattern, boolean target) { + public final boolean isApplicableConstraint(String constraintName, List nodes, boolean completePattern, boolean target) { if (nodes.isEmpty()) { return isApplicableConstraint(constraintName, (PsiElement)null, completePattern, target); } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/DeleteNodesAction.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/DeleteNodesAction.java index c89fe4f60b3c..5810279e5281 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/DeleteNodesAction.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/compiler/DeleteNodesAction.java @@ -6,9 +6,9 @@ import java.util.List; class DeleteNodesAction implements Runnable { - private final List elements; + private final List elements; - DeleteNodesAction(List _elements) { + DeleteNodesAction(List _elements) { elements = _elements; } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LiteralWithSubstitutionHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LiteralWithSubstitutionHandler.java index 7d118225ab6e..a3243926bdf1 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LiteralWithSubstitutionHandler.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/impl/matcher/handlers/LiteralWithSubstitutionHandler.java @@ -10,9 +10,9 @@ import java.util.regex.Pattern; public class LiteralWithSubstitutionHandler extends MatchingHandler { private final String matchExpression; private Matcher matcher; - private final List handlers; + private final List handlers; - public LiteralWithSubstitutionHandler(String _matchedExpression, List _handlers) { + public LiteralWithSubstitutionHandler(String _matchedExpression, List _handlers) { matchExpression = _matchedExpression; handlers = _handlers; } diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java index eada7158d6ee..17c0ecc10094 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/plugin/ui/SubstitutionShortInfoHandler.java @@ -34,10 +34,10 @@ public class SubstitutionShortInfoHandler implements DocumentListener, EditorMou private long modificationTimeStamp; private final List variables = new SmartList<>(); private final Editor editor; - @Nullable private final Consumer myCurrentVariableCallback; + @Nullable private final Consumer myCurrentVariableCallback; public static final Key CURRENT_CONFIGURATION_KEY = Key.create("SS.CurrentConfiguration"); - SubstitutionShortInfoHandler(@NotNull Editor _editor, @Nullable Consumer currentVariableCallback) { + SubstitutionShortInfoHandler(@NotNull Editor _editor, @Nullable Consumer currentVariableCallback) { editor = _editor; myCurrentVariableCallback = currentVariableCallback; } @@ -234,7 +234,7 @@ public class SubstitutionShortInfoHandler implements DocumentListener, EditorMou return editor.getUserData(LISTENER_KEY); } - static void install(Editor editor, @Nullable Consumer currentVariableCallback) { + static void install(Editor editor, @Nullable Consumer currentVariableCallback) { final SubstitutionShortInfoHandler handler = new SubstitutionShortInfoHandler(editor, currentVariableCallback); editor.addEditorMouseMotionListener(handler); editor.getDocument().addDocumentListener(handler); diff --git a/platform/testFramework/src/com/intellij/testFramework/CodeStyleSettingsTracker.java b/platform/testFramework/src/com/intellij/testFramework/CodeStyleSettingsTracker.java index 111fd3d1f8a9..5126907d529b 100644 --- a/platform/testFramework/src/com/intellij/testFramework/CodeStyleSettingsTracker.java +++ b/platform/testFramework/src/com/intellij/testFramework/CodeStyleSettingsTracker.java @@ -12,10 +12,10 @@ import java.util.function.Supplier; * Usage: {@code setUp() { tracker = new CodeStyleSettingsTracker(...); } tearDown() { tracker.checkForSettingsDamage(); } } */ public class CodeStyleSettingsTracker { - private final Supplier myCurrentSettingsSupplier; + private final Supplier myCurrentSettingsSupplier; private CodeStyleSettings myOldSettings; - public CodeStyleSettingsTracker(@NotNull Supplier currentSettingsSupplier) { + public CodeStyleSettingsTracker(@NotNull Supplier currentSettingsSupplier) { myCurrentSettingsSupplier = currentSettingsSupplier; CodeStyleSettings settings = currentSettingsSupplier.get(); if (settings != null) { diff --git a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/GlobalInspectionContextForTests.java b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/GlobalInspectionContextForTests.java index 4edd027d0b47..3f7d35a1b34c 100644 --- a/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/GlobalInspectionContextForTests.java +++ b/platform/testFramework/src/com/intellij/testFramework/fixtures/impl/GlobalInspectionContextForTests.java @@ -29,7 +29,7 @@ import org.jetbrains.annotations.NotNull; public class GlobalInspectionContextForTests extends GlobalInspectionContextImpl { private volatile boolean myFinished; - public GlobalInspectionContextForTests(@NotNull Project project, @NotNull NotNullLazyValue contentManager) { + public GlobalInspectionContextForTests(@NotNull Project project, @NotNull NotNullLazyValue contentManager) { super(project, contentManager); } diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffRequestProcessor.java b/platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffRequestProcessor.java index 82be56b4da86..d88e4978f6ea 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffRequestProcessor.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/TestDiffRequestProcessor.java @@ -36,10 +36,10 @@ import org.jetbrains.annotations.Nullable; import java.util.List; public class TestDiffRequestProcessor extends DiffRequestProcessor { - @NotNull private final List myRequests; + @NotNull private final List myRequests; private int myIndex; - public TestDiffRequestProcessor(@Nullable Project project, @NotNull List requests, int index) { + public TestDiffRequestProcessor(@Nullable Project project, @NotNull List requests, int index) { super(project, DiffPlaces.TESTS_FAILED_ASSERTIONS); myRequests = requests; myIndex = index; diff --git a/platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java b/platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java index dc535d67b643..707d79f2a853 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsagePreviewPanel.java @@ -341,7 +341,7 @@ public class UsagePreviewPanel extends UsageContextPanelBase implements DataProv } @Nullable - public final String getCannotPreviewMessage(@Nullable final List infos) { + public final String getCannotPreviewMessage(@Nullable final List infos) { return cannotPreviewMessage(infos); } diff --git a/platform/util/src/com/intellij/ui/JBColor.java b/platform/util/src/com/intellij/ui/JBColor.java index 3c8f3d9c0706..e0e1e5d5e6fd 100644 --- a/platform/util/src/com/intellij/ui/JBColor.java +++ b/platform/util/src/com/intellij/ui/JBColor.java @@ -25,7 +25,7 @@ public class JBColor extends Color { } private final Color darkColor; - private final NotNullProducer func; + private final NotNullProducer func; public JBColor(int rgb, int darkRGB) { this(new Color(rgb), new Color(darkRGB)); @@ -37,7 +37,7 @@ public class JBColor extends Color { func = null; } - public JBColor(@NotNull NotNullProducer function) { + public JBColor(@NotNull NotNullProducer function) { super(0); darkColor = null; func = function; diff --git a/platform/util/src/com/intellij/util/AdapterProcessor.java b/platform/util/src/com/intellij/util/AdapterProcessor.java index 549249bfa8e7..46c44589e52f 100644 --- a/platform/util/src/com/intellij/util/AdapterProcessor.java +++ b/platform/util/src/com/intellij/util/AdapterProcessor.java @@ -22,10 +22,10 @@ package com.intellij.util; import org.jetbrains.annotations.NotNull; public class AdapterProcessor implements Processor { - private final Processor myAdaptee; - private final Function myConversion; + private final Processor myAdaptee; + private final Function myConversion; - public AdapterProcessor(@NotNull Processor adaptee, @NotNull Function conversion) { + public AdapterProcessor(@NotNull Processor adaptee, @NotNull Function conversion) { myAdaptee = adaptee; myConversion = conversion; } diff --git a/platform/util/src/com/intellij/util/CommonProcessors.java b/platform/util/src/com/intellij/util/CommonProcessors.java index 035146f67f5f..23cde7005c87 100644 --- a/platform/util/src/com/intellij/util/CommonProcessors.java +++ b/platform/util/src/com/intellij/util/CommonProcessors.java @@ -103,7 +103,7 @@ public class CommonProcessors { private final Set processed; private final Processor myDelegate; - public UniqueProcessor(@NotNull Processor delegate) { + public UniqueProcessor(@NotNull Processor delegate) { this(delegate, ContainerUtil.canonicalStrategy()); } diff --git a/platform/util/src/com/intellij/util/FilteringProcessor.java b/platform/util/src/com/intellij/util/FilteringProcessor.java index 7b1587e5efc5..9c644557d1b9 100644 --- a/platform/util/src/com/intellij/util/FilteringProcessor.java +++ b/platform/util/src/com/intellij/util/FilteringProcessor.java @@ -21,10 +21,10 @@ import com.intellij.openapi.util.Condition; * @author max */ public class FilteringProcessor implements Processor { - private final Condition myFilter; - private final Processor myProcessor; + private final Condition myFilter; + private final Processor myProcessor; - public FilteringProcessor(final Condition filter, Processor processor) { + public FilteringProcessor(final Condition filter, Processor processor) { myFilter = filter; myProcessor = processor; } diff --git a/platform/util/src/com/intellij/util/ListWithSelection.java b/platform/util/src/com/intellij/util/ListWithSelection.java index 4ebbe1e5138a..44a9aa3dbb70 100644 --- a/platform/util/src/com/intellij/util/ListWithSelection.java +++ b/platform/util/src/com/intellij/util/ListWithSelection.java @@ -25,7 +25,7 @@ public class ListWithSelection extends ArrayList { super(collection); } - public ListWithSelection(Collection collection, E selection) { + public ListWithSelection(Collection collection, E selection) { this(collection); select(selection); } diff --git a/platform/util/src/com/intellij/util/PathMappingSettings.java b/platform/util/src/com/intellij/util/PathMappingSettings.java index 70f10fe342d5..a740647b1200 100644 --- a/platform/util/src/com/intellij/util/PathMappingSettings.java +++ b/platform/util/src/com/intellij/util/PathMappingSettings.java @@ -39,7 +39,7 @@ public class PathMappingSettings extends AbstractPathMapper implements Cloneable @NotNull private List myPathMappings; - public PathMappingSettings(@Nullable final List pathMappings) { + public PathMappingSettings(@Nullable final List pathMappings) { myPathMappings = create(pathMappings); } diff --git a/platform/util/src/com/intellij/util/containers/DistinctRootsCollection.java b/platform/util/src/com/intellij/util/containers/DistinctRootsCollection.java index e3eba304c686..a1c1b7068f7d 100644 --- a/platform/util/src/com/intellij/util/containers/DistinctRootsCollection.java +++ b/platform/util/src/com/intellij/util/containers/DistinctRootsCollection.java @@ -30,7 +30,7 @@ public abstract class DistinctRootsCollection implements Collection { public DistinctRootsCollection() { } - public DistinctRootsCollection(Collection collection) { + public DistinctRootsCollection(Collection collection) { addAll(collection); } diff --git a/platform/util/src/com/intellij/util/containers/FilteringIterator.java b/platform/util/src/com/intellij/util/containers/FilteringIterator.java index 5ec5de63142e..dc22f16ab39d 100644 --- a/platform/util/src/com/intellij/util/containers/FilteringIterator.java +++ b/platform/util/src/com/intellij/util/containers/FilteringIterator.java @@ -28,14 +28,14 @@ import java.util.NoSuchElementException; * @author dyoma */ public class FilteringIterator implements PeekableIterator { - private final Iterator myDelegate; + private final Iterator myDelegate; private final Condition myCondition; private boolean myNextObtained; private boolean myCurrentIsValid; private Dom myCurrent; private Boolean myCurrentPassedFilter; - public FilteringIterator(@NotNull Iterator delegate, @NotNull Condition condition) { + public FilteringIterator(@NotNull Iterator delegate, @NotNull Condition condition) { myDelegate = delegate; myCondition = condition; } diff --git a/platform/util/src/com/intellij/util/containers/JBIterable.java b/platform/util/src/com/intellij/util/containers/JBIterable.java index 7221aa44f274..919d1c1be848 100644 --- a/platform/util/src/com/intellij/util/containers/JBIterable.java +++ b/platform/util/src/com/intellij/util/containers/JBIterable.java @@ -851,7 +851,7 @@ public abstract class JBIterable implements Iterable { */ @Deprecated @NotNull - public final JBIterable sorted(@NotNull Comparator comparator) { + public final JBIterable sorted(@NotNull Comparator comparator) { return sort(comparator); } diff --git a/platform/util/src/com/intellij/util/containers/JBTreeTraverser.java b/platform/util/src/com/intellij/util/containers/JBTreeTraverser.java index 070154df83fc..e976983a39d6 100644 --- a/platform/util/src/com/intellij/util/containers/JBTreeTraverser.java +++ b/platform/util/src/com/intellij/util/containers/JBTreeTraverser.java @@ -31,7 +31,7 @@ public class JBTreeTraverser extends FilteredTraverserBase(Functions.compose(treeStructure, Functions.wrapArray())); } - public JBTreeTraverser(Function> treeStructure) { + public JBTreeTraverser(Function> treeStructure) { super(null, treeStructure); } diff --git a/platform/util/src/com/intellij/util/containers/OrderedSet.java b/platform/util/src/com/intellij/util/containers/OrderedSet.java index 2f61a1010fa7..8f7cc03f8d25 100644 --- a/platform/util/src/com/intellij/util/containers/OrderedSet.java +++ b/platform/util/src/com/intellij/util/containers/OrderedSet.java @@ -29,7 +29,7 @@ public class OrderedSet extends ArrayList implements Set, RandomAccess this(ContainerUtil.canonicalStrategy()); } - public OrderedSet(@NotNull Collection set) { + public OrderedSet(@NotNull Collection set) { super(set.size()); myHashSet = new OpenTHashSet(set.size()); addAll(set); diff --git a/platform/util/src/com/intellij/util/containers/TransferToEDTQueue.java b/platform/util/src/com/intellij/util/containers/TransferToEDTQueue.java index 5c884d41e3fe..7ae4dae87fa4 100644 --- a/platform/util/src/com/intellij/util/containers/TransferToEDTQueue.java +++ b/platform/util/src/com/intellij/util/containers/TransferToEDTQueue.java @@ -48,7 +48,7 @@ public class TransferToEDTQueue { */ private static final int DEFAULT_THRESHOLD = 30; private final String myName; - private final Processor myProcessor; + private final Processor myProcessor; private volatile boolean stopped; private final Condition myShutUpCondition; private final int myMaxUnitOfWorkThresholdMs; //-1 means indefinite @@ -85,7 +85,7 @@ public class TransferToEDTQueue { } public TransferToEDTQueue(@NotNull @NonNls String name, - @NotNull Processor processor, + @NotNull Processor processor, @NotNull Condition shutUpCondition, int maxUnitOfWorkThresholdMs) { myName = name; diff --git a/platform/util/src/com/intellij/util/containers/WeakInterner.java b/platform/util/src/com/intellij/util/containers/WeakInterner.java index 83e96ece802f..2c6e7dde890e 100644 --- a/platform/util/src/com/intellij/util/containers/WeakInterner.java +++ b/platform/util/src/com/intellij/util/containers/WeakInterner.java @@ -34,7 +34,7 @@ public class WeakInterner { public WeakInterner() { myMap = ContainerUtil.createConcurrentWeakKeyWeakValueMap(); } - public WeakInterner(@NotNull TObjectHashingStrategy strategy) { + public WeakInterner(@NotNull TObjectHashingStrategy strategy) { myMap = ContainerUtil.createConcurrentWeakKeyWeakValueMap(strategy); } diff --git a/platform/util/src/com/intellij/util/indexing/impl/UpdateData.java b/platform/util/src/com/intellij/util/indexing/impl/UpdateData.java index 939ebafda50f..1be5adf2f794 100644 --- a/platform/util/src/com/intellij/util/indexing/impl/UpdateData.java +++ b/platform/util/src/com/intellij/util/indexing/impl/UpdateData.java @@ -31,12 +31,12 @@ public class UpdateData { private final Map myNewData; private final ThrowableComputable, IOException> myCurrentDataEvaluator; private final IndexId myIndexId; - private final ThrowableRunnable myForwardIndexUpdate; + private final ThrowableRunnable myForwardIndexUpdate; public UpdateData(@NotNull Map newData, @NotNull ThrowableComputable, IOException> currentDataEvaluator, @NotNull IndexId indexId, - @Nullable ThrowableRunnable forwardIndexUpdate) { + @Nullable ThrowableRunnable forwardIndexUpdate) { myNewData = newData; myCurrentDataEvaluator = currentDataEvaluator; myIndexId = indexId; diff --git a/platform/util/src/com/intellij/util/io/FileAccessorCache.java b/platform/util/src/com/intellij/util/io/FileAccessorCache.java index 5f526424a299..e16f52ef9588 100644 --- a/platform/util/src/com/intellij/util/io/FileAccessorCache.java +++ b/platform/util/src/com/intellij/util/io/FileAccessorCache.java @@ -138,12 +138,12 @@ public abstract class FileAccessorCache implements com.intellij.util.conta } public static final class Handle extends ResourceHandle { - private final FileAccessorCache myOwner; + private final FileAccessorCache myOwner; @NotNull private final T myResource; private final AtomicInteger myRefCount = new AtomicInteger(1); - public Handle(@NotNull T fileAccessor, @NotNull FileAccessorCache owner) { + public Handle(@NotNull T fileAccessor, @NotNull FileAccessorCache owner) { myResource = fileAccessor; myOwner = owner; } diff --git a/platform/util/src/com/intellij/util/ui/tree/WideSelectionTreeUI.java b/platform/util/src/com/intellij/util/ui/tree/WideSelectionTreeUI.java index 3173b760406b..8fe4840b351c 100644 --- a/platform/util/src/com/intellij/util/ui/tree/WideSelectionTreeUI.java +++ b/platform/util/src/com/intellij/util/ui/tree/WideSelectionTreeUI.java @@ -49,7 +49,7 @@ public class WideSelectionTreeUI extends BasicTreeUI { private static final Border LIST_SELECTION_BACKGROUND_PAINTER = UIManager.getBorder("List.sourceListSelectionBackgroundPainter"); private static final Border LIST_FOCUSED_SELECTION_BACKGROUND_PAINTER = UIManager.getBorder("List.sourceListFocusedSelectionBackgroundPainter"); - @NotNull private final Condition myWideSelectionCondition; + @NotNull private final Condition myWideSelectionCondition; private final boolean myWideSelection; private boolean myOldRepaintAllRowValue; private boolean myForceDontPaintLines = false; @@ -67,7 +67,7 @@ public class WideSelectionTreeUI extends BasicTreeUI { * @param wideSelectionCondition strategy that determine if wide selection should be used for a target row (it's zero-based index * is given to the condition as an argument) */ - public WideSelectionTreeUI(final boolean wideSelection, @NotNull Condition wideSelectionCondition) { + public WideSelectionTreeUI(final boolean wideSelection, @NotNull Condition wideSelectionCondition) { myWideSelection = wideSelection; myWideSelectionCondition = wideSelectionCondition; } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java index 41b3d94586b7..04bd246a2e72 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/AbstractVcs.java @@ -463,8 +463,10 @@ public abstract class AbstractVcs extends S } @NotNull - public static List filterUniqueRootsDefault(@NotNull List in, @NotNull Function convertor) { - new FilterDescendantVirtualFileConvertible<>(convertor, FilePathComparator.getInstance()).doFilter(in); + public static List filterUniqueRootsDefault(@NotNull List in, @NotNull Function convertor) { + FilterDescendantVirtualFileConvertible convertible = + new FilterDescendantVirtualFileConvertible<>(convertor, FilePathComparator.getInstance()); + convertible.doFilter(in); return in; } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/FilterDescendantVirtualFileConvertible.java b/platform/vcs-api/src/com/intellij/openapi/vcs/FilterDescendantVirtualFileConvertible.java index e2a83ed6200e..62014cdebab7 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/FilterDescendantVirtualFileConvertible.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/FilterDescendantVirtualFileConvertible.java @@ -28,10 +28,10 @@ import static java.util.Collections.sort; import static java.util.Comparator.comparing; public class FilterDescendantVirtualFileConvertible extends AbstractFilterChildren { - @NotNull private final Comparator myComparator; - @NotNull private final Function myConvertor; + @NotNull private final Comparator myComparator; + @NotNull private final Function myConvertor; - public FilterDescendantVirtualFileConvertible(@NotNull Function convertor, @NotNull Comparator comparator) { + public FilterDescendantVirtualFileConvertible(@NotNull Function convertor, @NotNull Comparator comparator) { myConvertor = convertor; myComparator = comparing(myConvertor, comparator); } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/FileAnnotation.java b/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/FileAnnotation.java index f5917c045b3b..da6b7549bb68 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/FileAnnotation.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/FileAnnotation.java @@ -44,7 +44,7 @@ public abstract class FileAnnotation { private boolean myIsClosed; private Runnable myCloser; - private Consumer myReloader; + private Consumer myReloader; protected FileAnnotation(@NotNull Project project) { myProject = project; @@ -215,7 +215,7 @@ public abstract class FileAnnotation { /** * @see #reload(FileAnnotation) */ - public synchronized final void setReloader(@Nullable Consumer reloader) { + public synchronized final void setReloader(@Nullable Consumer reloader) { if (myIsClosed) return; myReloader = reloader; } diff --git a/platform/vcs-api/src/com/intellij/util/ui/VcsSynchronousProgressWrapper.java b/platform/vcs-api/src/com/intellij/util/ui/VcsSynchronousProgressWrapper.java index 346720d08dab..8667888b8663 100644 --- a/platform/vcs-api/src/com/intellij/util/ui/VcsSynchronousProgressWrapper.java +++ b/platform/vcs-api/src/com/intellij/util/ui/VcsSynchronousProgressWrapper.java @@ -29,7 +29,7 @@ public class VcsSynchronousProgressWrapper { private VcsSynchronousProgressWrapper() { } - public static boolean wrap(final ThrowableRunnable runnable, final Project project, final String title) { + public static boolean wrap(final ThrowableRunnable runnable, final Project project, final String title) { final VcsException[] exc = new VcsException[1]; final Runnable process = () -> { try { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveModifierFix.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveModifierFix.java index 9a99e3e7eae2..ca3aaf51287d 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveModifierFix.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/fixes/RemoveModifierFix.java @@ -18,7 +18,6 @@ package com.siyeh.ig.fixes; import com.intellij.codeInspection.ProblemDescriptor; import com.intellij.openapi.project.Project; import com.intellij.psi.PsiElement; -import com.intellij.psi.PsiKeyword; import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.InspectionGadgetsFix; import org.jetbrains.annotations.NotNull; @@ -47,8 +46,8 @@ public class RemoveModifierFix extends InspectionGadgetsFix { @Override public void doFix(Project project, ProblemDescriptor descriptor) { final PsiElement modifierElement = descriptor.getPsiElement(); - if (modifierElement instanceof PsiKeyword) { + //if (modifierElement instanceof PsiKeyword) { deleteElement(modifierElement); - } + //} } } \ No newline at end of file diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IgnoreClassFix.java b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IgnoreClassFix.java index aff761458945..1ca48b7ac3bf 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IgnoreClassFix.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/fixes/IgnoreClassFix.java @@ -20,11 +20,11 @@ import java.util.Collection; */ public class IgnoreClassFix extends InspectionGadgetsFix implements LowPriorityAction { - final Collection myIgnoredClasses; + final Collection myIgnoredClasses; final String myQualifiedName; private final String myFixName; - public IgnoreClassFix(String qualifiedName, Collection ignoredClasses, String fixName) { + public IgnoreClassFix(String qualifiedName, Collection ignoredClasses, String fixName) { myIgnoredClasses = ignoredClasses; myQualifiedName = qualifiedName; myFixName = fixName; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntClasspathEntry.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntClasspathEntry.java index 44931e324ebf..fc32fb7d0922 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntClasspathEntry.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntClasspathEntry.java @@ -60,11 +60,11 @@ public interface AntClasspathEntry { abstract class AddEntriesFactory implements NullableFactory> { private final JComponent myParentComponent; private final FileChooserDescriptor myDescriptor; - private final Function myMapper; + private final Function myMapper; public AddEntriesFactory(final JComponent parentComponent, final FileChooserDescriptor descriptor, - final Function mapper) { + final Function mapper) { myParentComponent = parentComponent; myDescriptor = descriptor; myMapper = mapper; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntReference.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntReference.java index 43c50e61b076..16f0f8db10a2 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntReference.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntReference.java @@ -140,7 +140,7 @@ public abstract class AntReference { } @Nullable - public static AntInstallation findAnt(AbstractProperty property, AbstractProperty.AbstractPropertyContainer container) { + public static AntInstallation findAnt(AbstractProperty property, AbstractProperty.AbstractPropertyContainer container) { GlobalAntConfiguration antConfiguration = GlobalAntConfiguration.INSTANCE.get(container); LOG.assertTrue(antConfiguration != null); AntReference antReference = property.get(container); @@ -151,7 +151,7 @@ public abstract class AntReference { return antReference.find(antConfiguration); } - public static AntInstallation findNotNullAnt(AbstractProperty property, + public static AntInstallation findNotNullAnt(AbstractProperty property, AbstractProperty.AbstractPropertyContainer container, GlobalAntConfiguration antConfiguration) throws CantRunException { AntReference antReference = property.get(container); diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/ChooseAndEditComboBoxController.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/ChooseAndEditComboBoxController.java index 48eba1436ecd..e0bae2c6c294 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/ChooseAndEditComboBoxController.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/ChooseAndEditComboBoxController.java @@ -30,12 +30,12 @@ import java.util.Map; public abstract class ChooseAndEditComboBoxController { private final ComboboxWithBrowseButton myCombobox; - private final Convertor myToString; + private final Convertor myToString; private final Map myItems = new HashMap<>(); public ChooseAndEditComboBoxController(ComboboxWithBrowseButton combobox, - Convertor toRef, - Comparator comparator) { + Convertor toRef, + Comparator comparator) { myCombobox = combobox; myToString = toRef; myCombobox.addActionListener(new ActionListener() { diff --git a/plugins/coverage-common/src/com/intellij/coverage/CoverageLineMarkerRenderer.java b/plugins/coverage-common/src/com/intellij/coverage/CoverageLineMarkerRenderer.java index bfe4281942f8..f1ca24c7f8fb 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/CoverageLineMarkerRenderer.java +++ b/plugins/coverage-common/src/com/intellij/coverage/CoverageLineMarkerRenderer.java @@ -74,15 +74,15 @@ public class CoverageLineMarkerRenderer implements ActiveGutterRenderer, LineMar private final String myClassName; private final TreeMap myLines; private final boolean myCoverageByTestApplicable; - private final Function myNewToOldConverter; - private final Function myOldToNewConverter; + private final Function myNewToOldConverter; + private final Function myOldToNewConverter; private final CoverageSuitesBundle myCoverageSuite; private final boolean mySubCoverageActive; protected CoverageLineMarkerRenderer(final TextAttributesKey textAttributesKey, @Nullable final String className, final TreeMap lines, final boolean coverageByTestApplicable, - final Function newToOldConverter, - final Function oldToNewConverter, + final Function newToOldConverter, + final Function oldToNewConverter, final CoverageSuitesBundle coverageSuite, boolean subCoverageActive) { myKey = textAttributesKey; myClassName = className; @@ -116,8 +116,8 @@ public class CoverageLineMarkerRenderer implements ActiveGutterRenderer, LineMar final TreeMap lines, final boolean coverageByTestApplicable, @NotNull final CoverageSuitesBundle coverageSuite, - final Function newToOldConverter, - final Function oldToNewConverter, boolean subCoverageActive) { + final Function newToOldConverter, + final Function oldToNewConverter, boolean subCoverageActive) { return new CoverageLineMarkerRenderer(getAttributesKey(lineNumber, lines), className, lines, coverageByTestApplicable, newToOldConverter, oldToNewConverter, coverageSuite, subCoverageActive); } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/DelegatingCallInfo.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/DelegatingCallInfo.java index e16817d8f64b..20a80c2ea4b8 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/DelegatingCallInfo.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/assignment/DelegatingCallInfo.java @@ -15,9 +15,9 @@ import org.jetbrains.plugins.groovy.lang.psi.api.statements.blocks.GrClosableBlo import org.jetbrains.plugins.groovy.lang.psi.api.statements.expressions.GrExpression; public class DelegatingCallInfo implements CallInfo { - private final CallInfo myDelegate; + private final CallInfo myDelegate; - public DelegatingCallInfo(CallInfo delegate) { + public DelegatingCallInfo(CallInfo delegate) { myDelegate = delegate; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GrModifierFix.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GrModifierFix.java index 1e3f9a38f7ed..1ca1d43466a0 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GrModifierFix.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/bugs/GrModifierFix.java @@ -51,12 +51,12 @@ public class GrModifierFix extends GroovyFix { private final String myModifier; private final String myText; private final boolean myDoSet; - private final Function myModifierListProvider; + private final Function myModifierListProvider; public GrModifierFix(@NotNull GrVariable member, @GrModifier.GrModifierConstant String modifier, boolean doSet, - @NotNull Function modifierListProvider) { + @NotNull Function modifierListProvider) { this(initText(doSet, member.getName(), modifier), modifier, doSet, modifierListProvider); } @@ -64,14 +64,14 @@ public class GrModifierFix extends GroovyFix { @GrModifier.GrModifierConstant String modifier, boolean showContainingClass, boolean doSet, - @NotNull Function modifierListProvider) { + @NotNull Function modifierListProvider) { this(initText(doSet, getMemberName(member, showContainingClass), modifier), modifier, doSet, modifierListProvider); } public GrModifierFix(@NotNull String text, @GrModifier.GrModifierConstant String modifier, boolean doSet, - @NotNull Function modifierListProvider) { + @NotNull Function modifierListProvider) { myText = text; myModifier = modifier; myModifierListProvider = modifierListProvider; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/fixes/RemoveElementQuickFix.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/fixes/RemoveElementQuickFix.java index 4c06dfddd29f..3d1920ab1c28 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/fixes/RemoveElementQuickFix.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/codeInspection/fixes/RemoveElementQuickFix.java @@ -13,13 +13,13 @@ import org.jetbrains.annotations.NotNull; public class RemoveElementQuickFix implements LocalQuickFix { private final String myName; - private final Function myElementFunction; + private final Function myElementFunction; public RemoveElementQuickFix(@NotNull String name) { this(name, Functions.identity()); } - public RemoveElementQuickFix(@NotNull String name, @NotNull Function function) { + public RemoveElementQuickFix(@NotNull String name, @NotNull Function function) { myName = name; myElementFunction = function; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/PointcutContextFilter.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/PointcutContextFilter.java index 89bb80ff2fa3..0bc537d01cf6 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/PointcutContextFilter.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/dsl/PointcutContextFilter.java @@ -22,9 +22,9 @@ import org.jetbrains.plugins.groovy.dsl.toplevel.ContextFilter; * @author peter */ public class PointcutContextFilter implements ContextFilter { - private final DslPointcut myPointcut; + private final DslPointcut myPointcut; - public PointcutContextFilter(DslPointcut pointcut) { + public PointcutContextFilter(DslPointcut pointcut) { myPointcut = pointcut; } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/ext/spock/SpockUnrollReferenceProvider.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/ext/spock/SpockUnrollReferenceProvider.java index 892ce0dac5fd..61ac4b180687 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/ext/spock/SpockUnrollReferenceProvider.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/ext/spock/SpockUnrollReferenceProvider.java @@ -86,10 +86,10 @@ public class SpockUnrollReferenceProvider extends PsiReferenceProvider { private static class SpockVariableReference extends PsiReferenceBase { private final PsiElement myLeafElement; - private final List myReferences; + private final List myReferences; private final GrMethod myMethod; - SpockVariableReference(PsiElement element, TextRange range, List references, GrMethod method) { + SpockVariableReference(PsiElement element, TextRange range, List references, GrMethod method) { super(element, range); myReferences = references; myMethod = method; diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyMethodResultImpl.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyMethodResultImpl.java index 1c3139cb998f..012d69cc20b1 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyMethodResultImpl.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyMethodResultImpl.java @@ -23,7 +23,7 @@ public class GroovyMethodResultImpl extends GroovyResolveResultImpl implements G @Nullable PsiElement resolveContext, @Nullable SpreadState spreadState, @NotNull PsiSubstitutor partialSubstitutor, - @NotNull NotNullComputable substitutorComputer, + @NotNull NotNullComputable substitutorComputer, boolean isAccessible, boolean isStaticsOK) { this(method, resolveContext, spreadState, partialSubstitutor, substitutorComputer, null, true, isAccessible, isStaticsOK, true); } @@ -32,7 +32,7 @@ public class GroovyMethodResultImpl extends GroovyResolveResultImpl implements G @Nullable PsiElement resolveContext, @Nullable SpreadState spreadState, @NotNull PsiSubstitutor partialSubstitutor, - @NotNull NotNullComputable substitutorComputer, + @NotNull NotNullComputable substitutorComputer, boolean isAccessible, boolean isStaticsOK, boolean isApplicable) { this(method, resolveContext, spreadState, partialSubstitutor, substitutorComputer, null, false, isAccessible, isStaticsOK, isApplicable); } @@ -41,7 +41,7 @@ public class GroovyMethodResultImpl extends GroovyResolveResultImpl implements G @Nullable PsiElement resolveContext, @Nullable SpreadState spreadState, @NotNull PsiSubstitutor partialSubstitutor, - @NotNull NotNullComputable substitutorComputer, + @NotNull NotNullComputable substitutorComputer, @Nullable MethodCandidate candidate, boolean isInvokedOnProperty, boolean isAccessible, boolean isStaticsOk, boolean isApplicable) { diff --git a/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovyCompilerWrapper.java b/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovyCompilerWrapper.java index 57fc3a305a68..cd9f24e8f4f5 100644 --- a/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovyCompilerWrapper.java +++ b/plugins/groovy/rt/src/org/jetbrains/groovy/compiler/rt/GroovyCompilerWrapper.java @@ -45,10 +45,10 @@ public class GroovyCompilerWrapper { "A groovyc error occurred while trying to load one of the classes in project dependencies. " + "Please ensure its version is compatible with other jars (including Groovy ones) in the dependencies. " + "See the message and the stack trace below for reference\n\n"; - private final List collector; + private final List collector; private boolean forStubs; - public GroovyCompilerWrapper(List collector, boolean forStubs) { + public GroovyCompilerWrapper(List collector, boolean forStubs) { this.collector = collector; this.forStubs = forStubs; } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrDynamicImplicitMethod.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrDynamicImplicitMethod.java index 613880f13a6a..8f0b5d307f98 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrDynamicImplicitMethod.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/intentions/dynamic/GrDynamicImplicitMethod.java @@ -50,14 +50,14 @@ public class GrDynamicImplicitMethod extends GrLightMethodBuilder implements GrD private static final Logger LOG = Logger.getInstance(GrDynamicImplicitMethod.class); private final String myContainingClassName; - private final List myParamInfos; + private final List myParamInfos; private final String myReturnType; public GrDynamicImplicitMethod(PsiManager manager, String name, String containingClassName, boolean isStatic, - List paramInfos, + List paramInfos, String returnType) { super(manager, name); myContainingClassName = containingClassName; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/BuildAndRestartConsoleAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/BuildAndRestartConsoleAction.java index 2b8b56d74d50..1826916eba02 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/console/BuildAndRestartConsoleAction.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/console/BuildAndRestartConsoleAction.java @@ -36,13 +36,13 @@ public class BuildAndRestartConsoleAction extends AnAction { private final Project myProject; private final Executor myExecutor; private final RunContentDescriptor myContentDescriptor; - private final Consumer myRestarter; + private final Consumer myRestarter; public BuildAndRestartConsoleAction(@NotNull Module module, @NotNull Project project, @NotNull Executor executor, @NotNull RunContentDescriptor contentDescriptor, - @NotNull Consumer restarter) { + @NotNull Consumer restarter) { super("Build and restart", "Build module '" + module.getName() + "' and restart", AllIcons.Actions.Restart); myModule = module; myProject = project; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrAbstractInplaceIntroducer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrAbstractInplaceIntroducer.java index a022462cb7a2..331b44369aad 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrAbstractInplaceIntroducer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/introduce/GrAbstractInplaceIntroducer.java @@ -185,7 +185,7 @@ public abstract class GrAbstractInplaceIntroducer computable) { + protected final GrVariable refactorInWriteAction(Computable computable) { SmartPsiElementPointer pointer = WriteAction.compute(() -> { GrVariable var = computable.compute(); return var != null ? SmartPointerManager.getInstance(myProject).createSmartPsiElementPointer(var) : null; diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java index 13491fc63569..c9c9c7f4b49c 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java @@ -17,10 +17,10 @@ public class AnnotationExprent extends Exprent { public static final int ANNOTATION_SINGLE_ELEMENT = 3; private final String className; - private final List parNames; - private final List parValues; + private final List parNames; + private final List parValues; - public AnnotationExprent(String className, List parNames, List parValues) { + public AnnotationExprent(String className, List parNames, List parValues) { super(EXPRENT_ANNOTATION); this.className = className; this.parNames = parNames; diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java index 0ae9feeddb83..0dcb63d34c03 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java @@ -10,9 +10,9 @@ import java.util.List; public class AssertExprent extends Exprent { - private final List parameters; + private final List parameters; - public AssertExprent(List parameters) { + public AssertExprent(List parameters) { super(EXPRENT_ASSERT); this.parameters = parameters; } diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java index 8472cef3d828..1abaf327aeeb 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java @@ -66,7 +66,7 @@ public class InvocationExprent extends Exprent { public InvocationExprent(int opcode, LinkConstant cn, List bootstrapArguments, - ListStack stack, + ListStack stack, Set bytecodeOffsets) { this(); diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java index 56ada55eb7b1..0891a4758e43 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java @@ -18,7 +18,7 @@ public class GeneralStatement extends Statement { type = Statement.TYPE_GENERAL; } - public GeneralStatement(Statement head, Collection statements, Statement post) { + public GeneralStatement(Statement head, Collection statements, Statement post) { this(); diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java index 7acad0c0edf8..8aa6adc71cfb 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java @@ -22,7 +22,7 @@ public class SequenceStatement extends Statement { type = Statement.TYPE_SEQUENCE; } - public SequenceStatement(List lst) { + public SequenceStatement(List lst) { this(); diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java index 08bf1564cb55..b95513987a78 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java @@ -14,7 +14,7 @@ public class FastSparseSetFactory { private int lastMask; - public FastSparseSetFactory(Collection set) { + public FastSparseSetFactory(Collection set) { int block = -1; int mask = -1; diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/util/ListStack.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/util/ListStack.java index d5ae774b9714..ac0dad90c993 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/util/ListStack.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/util/ListStack.java @@ -10,7 +10,7 @@ public class ListStack extends ArrayList { super(); } - public ListStack(ArrayList list) { + public ListStack(ArrayList list) { super(list); } diff --git a/plugins/junit/src/com/intellij/execution/junit/TestMethods.java b/plugins/junit/src/com/intellij/execution/junit/TestMethods.java index 09571d383ed7..f9b1ecaf9cbf 100644 --- a/plugins/junit/src/com/intellij/execution/junit/TestMethods.java +++ b/plugins/junit/src/com/intellij/execution/junit/TestMethods.java @@ -44,11 +44,11 @@ import java.util.Collection; public class TestMethods extends TestMethod { private static final Logger LOG = Logger.getInstance(TestMethods.class); - private final Collection myFailedTests; + private final Collection myFailedTests; public TestMethods(@NotNull JUnitConfiguration configuration, @NotNull ExecutionEnvironment environment, - @NotNull Collection failedTests) { + @NotNull Collection failedTests) { super(configuration, environment); myFailedTests = failedTests; diff --git a/plugins/tasks/tasks-api/src/com/intellij/tasks/config/BaseRepositoryEditor.java b/plugins/tasks/tasks-api/src/com/intellij/tasks/config/BaseRepositoryEditor.java index 5052ab42f5dd..875054c48bd5 100644 --- a/plugins/tasks/tasks-api/src/com/intellij/tasks/config/BaseRepositoryEditor.java +++ b/plugins/tasks/tasks-api/src/com/intellij/tasks/config/BaseRepositoryEditor.java @@ -63,12 +63,12 @@ public class BaseRepositoryEditor extends TaskReposito private boolean myApplying; protected Project myProject; protected final T myRepository; - private final Consumer myChangeListener; + private final Consumer myChangeListener; private final Document myDocument; private final Editor myEditor; private JComponent myAnchor; - public BaseRepositoryEditor(final Project project, final T repository, Consumer changeListener) { + public BaseRepositoryEditor(final Project project, final T repository, Consumer changeListener) { myProject = project; myRepository = repository; myChangeListener = changeListener; diff --git a/plugins/ui-designer-core/src/com/intellij/designer/actions/MorphingAction.java b/plugins/ui-designer-core/src/com/intellij/designer/actions/MorphingAction.java index fb2fd7e10f33..6ffde5d1b0db 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/actions/MorphingAction.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/actions/MorphingAction.java @@ -35,10 +35,10 @@ import java.util.List; public class MorphingAction extends AnAction { private final DesignerEditorPanel myDesigner; private final EditableArea myArea; - private final List myComponents; + private final List myComponents; private final MetaModel myTarget; - public MorphingAction(DesignerEditorPanel designer, EditableArea area, List components, MetaModel target) { + public MorphingAction(DesignerEditorPanel designer, EditableArea area, List components, MetaModel target) { super(target.getTag(), null, target.getIcon()); myDesigner = designer; myArea = area; diff --git a/plugins/ui-designer-core/src/com/intellij/designer/inspection/AbstractQuickFixManager.java b/plugins/ui-designer-core/src/com/intellij/designer/inspection/AbstractQuickFixManager.java index e8f28b3bca9a..18c8f5dc877d 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/inspection/AbstractQuickFixManager.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/inspection/AbstractQuickFixManager.java @@ -35,7 +35,6 @@ import com.intellij.ui.LightweightHint; import com.intellij.ui.RowIcon; import com.intellij.util.Alarm; import com.intellij.util.IJSwingUtilities; -import com.intellij.util.ThrowableRunnable; import com.intellij.util.ui.EmptyIcon; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -289,7 +288,7 @@ public abstract class AbstractQuickFixManager { } private class SecondStep extends BaseListPopupStep { - SecondStep(List fixList) { + SecondStep(List fixList) { super(null, fixList); } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java index c640e242d538..c7d8a29d4cdc 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java @@ -526,7 +526,7 @@ class XsltRunSettingsEditor extends SettingsEditor { ParamTableModel() { } - ParamTableModel(List> params) { + ParamTableModel(List> params) { for (Pair pair : params) { myParams.add(new Param(pair.getFirst(), pair.getSecond())); } diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/XPathUsageSearcher.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/XPathUsageSearcher.java index 20b333b2cf91..6179dbc85114 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/XPathUsageSearcher.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/search/XPathUsageSearcher.java @@ -84,13 +84,13 @@ class XPathUsageSearcher implements UsageSearcher { } private class MyProcessor extends BaseProcessor { - private final Processor myProcessor; + private final Processor myProcessor; private final int myTotalFileCount; private int myFileCount; private int myMatchCount; - MyProcessor(Processor processor, int fileCount) { + MyProcessor(Processor processor, int fileCount) { myProcessor = processor; myTotalFileCount = fileCount; } diff --git a/xml/dom-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconBuilder.java b/xml/dom-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconBuilder.java index e934220c030c..5a9031bba6b5 100644 --- a/xml/dom-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconBuilder.java +++ b/xml/dom-impl/src/com/intellij/codeInsight/navigation/NavigationGutterIconBuilder.java @@ -58,7 +58,7 @@ public class NavigationGutterIconBuilder { ContainerUtil::createMaybeSingletonList; private final Icon myIcon; - private final NotNullFunction> myConverter; + private final NotNullFunction> myConverter; protected NotNullLazyValue> myTargets; private boolean myLazy; @@ -69,7 +69,7 @@ public class NavigationGutterIconBuilder { private GutterIconRenderer.Alignment myAlignment = GutterIconRenderer.Alignment.CENTER; private Computable myCellRenderer; private NullableFunction myNamer = ElementPresentationManager.namer(); - private final NotNullFunction> myGotoRelatedItemProvider; + private final NotNullFunction> myGotoRelatedItemProvider; public static final NotNullFunction> DEFAULT_DOM_CONVERTOR = o -> ContainerUtil.createMaybeSingletonList(o.getXmlElement()); public static final NotNullFunction> DOM_GOTO_RELATED_ITEM_PROVIDER = dom -> { @@ -81,13 +81,13 @@ public class NavigationGutterIconBuilder { protected static final NotNullFunction> PSI_GOTO_RELATED_ITEM_PROVIDER = dom -> Collections.singletonList(new GotoRelatedItem(dom, "XML")); - protected NavigationGutterIconBuilder(@NotNull final Icon icon, @NotNull NotNullFunction> converter) { + protected NavigationGutterIconBuilder(@NotNull final Icon icon, @NotNull NotNullFunction> converter) { this(icon, converter, null); } protected NavigationGutterIconBuilder(@NotNull final Icon icon, - @NotNull NotNullFunction> converter, - @Nullable final NotNullFunction> gotoRelatedItemProvider) { + @NotNull NotNullFunction> converter, + @Nullable final NotNullFunction> gotoRelatedItemProvider) { myIcon = icon; myConverter = converter; myGotoRelatedItemProvider = gotoRelatedItemProvider; @@ -100,14 +100,14 @@ public class NavigationGutterIconBuilder { @NotNull public static NavigationGutterIconBuilder create(@NotNull final Icon icon, - @NotNull NotNullFunction> converter) { + @NotNull NotNullFunction> converter) { return create(icon, converter, null); } @NotNull public static NavigationGutterIconBuilder create(@NotNull final Icon icon, - @NotNull NotNullFunction> converter, - @Nullable final NotNullFunction> gotoRelatedItemProvider) { + @NotNull NotNullFunction> converter, + @Nullable final NotNullFunction> gotoRelatedItemProvider) { return new NavigationGutterIconBuilder<>(icon, converter, gotoRelatedItemProvider); }