From 92aa03326d83089361cdf36e37e8e4c76078f561 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 23 Jan 2019 15:39:37 +0300 Subject: [PATCH] cleanup: make fields final --- .../images/editor/impl/ImageFileEditorProvider.java | 2 +- images/src/org/intellij/images/vfs/IfsUtil.java | 2 +- .../evaluation/expression/NewArrayInstanceEvaluator.java | 4 ++-- .../impl/src/com/intellij/debugger/ui/ValueHint.java | 2 +- .../intellij/debugger/ui/tree/render/NodeRendererImpl.java | 2 +- .../intellij/openapi/roots/ui/configuration/SidePanel.java | 2 +- .../codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java | 4 ++-- .../codeInspection/ex/GlobalJavaInspectionContextImpl.java | 2 +- .../refactoring/extractclass/ExtractClassProcessor.java | 2 +- .../typeCook/deductive/builder/ReductionSystem.java | 4 ++-- .../rules/guava/FluentIterableConversionUtil.java | 2 +- .../intellij/codeInsight/completion/OffsetTranslator.java | 2 +- .../dvcs-impl/src/com/intellij/dvcs/ui/CloneDvcsDialog.java | 2 +- .../openapi/externalSystem/model/project/ModuleData.java | 2 +- .../codeInsight/hint/actions/ShowImplementationsAction.java | 2 +- .../template/impl/LiveTemplateCompletionContributor.java | 2 +- .../EnvironmentVariablesTextFieldWithBrowseButton.java | 2 +- .../src/com/intellij/find/impl/FindPopupPanel.java | 2 +- .../impl/exclude/DetectionExcludesConfigurable.java | 2 +- .../src/com/intellij/ide/scratch/ScratchFileActions.java | 2 +- .../com/intellij/ide/util/gotoByName/ChooseByNameBase.java | 2 +- .../util/gotoByName/DefaultChooseByNameItemProvider.java | 2 +- .../fileEditor/impl/FileEditorPsiTreeChangeListener.java | 2 +- .../profile/codeInspection/ui/table/SeverityRenderer.java | 2 +- .../util/indexing/FileBasedIndexProjectHandler.java | 2 +- .../src/com/intellij/openapi/ui/DialogWrapper.java | 4 ++-- .../com/intellij/ui/speedSearch/FilteringTableModel.java | 2 +- .../src/com/intellij/application/ExperimentsDialog.java | 2 +- .../src/com/intellij/ide/actions/ActivityMonitorAction.java | 2 +- .../src/com/intellij/ide/actions/Switcher.java | 4 ++-- .../src/com/intellij/internal/GrayFilterConfig.java | 2 +- .../com/intellij/internal/anomalies/TopAnomaliesAction.java | 4 ++-- .../fus/actions/persistence/ActionsCollectorImpl.java | 2 +- .../fus/actions/persistence/IntentionsCollector.java | 2 +- .../fus/actions/persistence/MainMenuCollector.java | 2 +- .../fus/actions/persistence/ToolWindowCollector.java | 2 +- .../collectors/fus/ui/persistence/ShortcutsCollector.java | 2 +- .../fus/ui/persistence/ToolbarClicksCollector.java | 2 +- .../internal/statistic/utils/StatisticsUploadAssistant.java | 2 +- .../src/com/intellij/openapi/project/DumbServiceImpl.java | 2 +- .../src/com/intellij/openapi/ui/JBListUpdater.java | 2 +- .../com/intellij/troubleshooting/ProblemTypeAdapter.java | 2 +- .../src/com/intellij/ui/ComboBoxCompositeEditor.java | 4 ++-- .../src/com/intellij/ui/ShowUIDefaultsAction.java | 4 ++-- .../platform-impl/src/com/intellij/ui/mac/touchbar/NST.java | 2 +- .../src/com/intellij/ui/mac/touchbar/ProjectData.java | 2 +- .../src/com/intellij/ui/mac/touchbar/TBItemPopover.java | 6 +++--- .../src/com/intellij/ui/popup/PopupTableAdapter.java | 2 +- .../src/com/intellij/ui/popup/PopupTreeAdapter.java | 2 +- .../src/com/intellij/execution/rmi/RemoteServer.java | 2 +- .../openapi/util/io/win32/WindowsElevationUtil.java | 4 ++-- .../com/intellij/util/containers/ConcurrentFactoryMap.java | 2 +- .../intellij/openapi/vcs/changes/ChangesViewManager.java | 2 +- .../log/ui/filter/MultipleValueFilterPopupComponent.java | 2 +- .../src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java | 2 +- .../src/com/siyeh/ig/psiutils/InheritanceUtil.java | 2 +- plugins/git4idea/src/git4idea/vfs/GitVFSListener.java | 2 +- .../jetbrains/plugins/github/util/GithubAuthDataHolder.java | 2 +- .../gradle/service/project/GradleProjectResolverUtil.java | 6 +++--- .../decompiler/modules/decompiler/FinallyProcessor.java | 6 +++--- .../decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java | 2 +- .../modules/decompiler/sforms/FlattenStatementsHelper.java | 6 +++--- .../idea/maven/server/embedder/ExecutorManager.java | 2 +- .../org/jetbrains/idea/maven/server/ExecutorManager.java | 2 +- .../dom/refactorings/introduce/IntroducePropertyAction.java | 2 +- .../MavenCompilerAnnotationProcessorPathsImporter.java | 2 +- .../com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java | 2 +- .../application/options/editor/WebEditorOptions.java | 2 +- 68 files changed, 85 insertions(+), 85 deletions(-) diff --git a/images/src/org/intellij/images/editor/impl/ImageFileEditorProvider.java b/images/src/org/intellij/images/editor/impl/ImageFileEditorProvider.java index f4b2f9278fa0..7eeffa99ae4f 100644 --- a/images/src/org/intellij/images/editor/impl/ImageFileEditorProvider.java +++ b/images/src/org/intellij/images/editor/impl/ImageFileEditorProvider.java @@ -55,7 +55,7 @@ final class ImageFileEditorProvider implements FileEditorProvider, DumbAware { if (IfsUtil.isSVG(file)) { TextEditor editor = (TextEditor)TextEditorProvider.getInstance().createEditor(project, file); editor.getEditor().getDocument().addDocumentListener(new DocumentListener() { - Alarm myAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, editor); + final Alarm myAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, editor); @Override public void documentChanged(@NotNull DocumentEvent event) { myAlarm.cancelAllRequests(); diff --git a/images/src/org/intellij/images/vfs/IfsUtil.java b/images/src/org/intellij/images/vfs/IfsUtil.java index 5f78b5b03b81..416f9ef8c021 100644 --- a/images/src/org/intellij/images/vfs/IfsUtil.java +++ b/images/src/org/intellij/images/vfs/IfsUtil.java @@ -116,7 +116,7 @@ public final class IfsUtil { file.putUserData(FORMAT_KEY, SVG_FORMAT); file.putUserData(IMAGE_PROVIDER_REF_KEY, new SoftReference<>(new ImageDocument.CachedScaledImageProvider() { - ScaleContext.Cache cache = new ScaleContext.Cache<>((ctx) -> { + final ScaleContext.Cache cache = new ScaleContext.Cache<>((ctx) -> { try { return SVGLoader.loadHiDPI(url.get(), new ByteArrayInputStream(content), ctx); } diff --git a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewArrayInstanceEvaluator.java b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewArrayInstanceEvaluator.java index 1f8a48634982..692a918cb2c6 100644 --- a/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewArrayInstanceEvaluator.java +++ b/java/debugger/impl/src/com/intellij/debugger/engine/evaluation/expression/NewArrayInstanceEvaluator.java @@ -18,8 +18,8 @@ import java.util.Arrays; class NewArrayInstanceEvaluator implements Evaluator { private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.engine.evaluation.expression.NewArrayInstanceEvaluator"); private final Evaluator myArrayTypeEvaluator; - private Evaluator myDimensionEvaluator; - private Evaluator myInitializerEvaluator; + private final Evaluator myDimensionEvaluator; + private final Evaluator myInitializerEvaluator; /** * either dimensionEvaluator or initializerEvaluators must be null! diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/ValueHint.java b/java/debugger/impl/src/com/intellij/debugger/ui/ValueHint.java index acb7b57c2d17..404e9d4b906f 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/ValueHint.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/ValueHint.java @@ -53,7 +53,7 @@ import java.awt.event.KeyEvent; */ public class ValueHint extends AbstractValueHint { private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.ValueHint"); - private PsiElement myCurrentExpression; + private final PsiElement myCurrentExpression; private Value myValueToShow = null; private ValueHint(Project project, Editor editor, Point point, ValueHintType type, final PsiElement selectedExpression, final TextRange textRange) { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/NodeRendererImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/NodeRendererImpl.java index 9acc6b69a6ad..a3d1da672816 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/NodeRendererImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/tree/render/NodeRendererImpl.java @@ -22,7 +22,7 @@ public abstract class NodeRendererImpl implements NodeRenderer { public static final String DEFAULT_NAME = "unnamed"; protected BasicRendererProperties myProperties; - private String myDefaultName; + private final String myDefaultName; protected NodeRendererImpl() { this(DEFAULT_NAME, false); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java index dc97aa9aeb04..42f1fa4e5c22 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/SidePanel.java @@ -82,7 +82,7 @@ public class SidePanel extends JPanel { myList.setCellRenderer(new GroupedItemsListRenderer(descriptor) { JPanel myExtraPanel; SidePanelCountLabel myCountLabel; - CellRendererPane myValidationParent = new CellRendererPane(); + final CellRendererPane myValidationParent = new CellRendererPane(); { mySeparatorComponent.setCaptionCentered(false); myList.add(myValidationParent); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java index 6f2648b4089b..de9fe61ac88e 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RenameWrongRefFix.java @@ -80,8 +80,8 @@ public class RenameWrongRefFix implements IntentionAction { } } else { class MyScopeProcessor implements PsiScopeProcessor { - ArrayList myResult = new ArrayList<>(); - boolean myFilterMethods; + final ArrayList myResult = new ArrayList<>(); + final boolean myFilterMethods; boolean myFilterStatics; MyScopeProcessor(PsiReferenceExpression refExpression) { diff --git a/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java index 6ec833027918..4a3281fa88e2 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java +++ b/java/java-impl/src/com/intellij/codeInspection/ex/GlobalJavaInspectionContextImpl.java @@ -323,7 +323,7 @@ public class GlobalJavaInspectionContextImpl extends GlobalJavaInspectionContext }; final DelegatingGlobalSearchScope globalSearchScope = new DelegatingGlobalSearchScope(projectScope) { - Set fileTypes = javaManager.getLanguages().stream().map(l -> l.getAssociatedFileType()).collect(Collectors.toSet()); + final Set fileTypes = javaManager.getLanguages().stream().map(l -> l.getAssociatedFileType()).collect(Collectors.toSet()); @Override public boolean contains(@NotNull VirtualFile file) { diff --git a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java index 2f07a8849757..fb182fef43e7 100644 --- a/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java +++ b/java/java-impl/src/com/intellij/refactoring/extractclass/ExtractClassProcessor.java @@ -83,7 +83,7 @@ public class ExtractClassProcessor extends FixableUsagesRefactoringProcessor { private boolean delegationRequired; private final ExtractEnumProcessor myExtractEnumProcessor; private final PsiClass myClass; - private boolean extractInnerClass; + private final boolean extractInnerClass; public ExtractClassProcessor(PsiClass sourceClass, List fields, diff --git a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/ReductionSystem.java b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/ReductionSystem.java index e3da221aab62..c722e43b4480 100644 --- a/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/ReductionSystem.java +++ b/java/java-impl/src/com/intellij/refactoring/typeCook/deductive/builder/ReductionSystem.java @@ -162,8 +162,8 @@ public class ReductionSystem { public ReductionSystem[] isolate() { class Node { int myComponent = -1; - Constraint myConstraint; - Set myNeighbours = new HashSet<>(); + final Constraint myConstraint; + final Set myNeighbours = new HashSet<>(); Node() { myConstraint = null; diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/FluentIterableConversionUtil.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/FluentIterableConversionUtil.java index f89100fec085..a28ef46863ce 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/FluentIterableConversionUtil.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/rules/guava/FluentIterableConversionUtil.java @@ -73,7 +73,7 @@ public class FluentIterableConversionUtil { } if (PsiTypesUtil.compareTypes(parameters[0], targetParameters[0], false)) { return new TypeConversionDescriptor("$q$.toArray($type$)", null) { - PsiType myType = parameters[0]; + final PsiType myType = parameters[0]; @Override public PsiExpression replace(PsiExpression expression, @NotNull TypeEvaluator evaluator) throws IncorrectOperationException { diff --git a/platform/core-impl/src/com/intellij/codeInsight/completion/OffsetTranslator.java b/platform/core-impl/src/com/intellij/codeInsight/completion/OffsetTranslator.java index f5822cc886a9..1bd103c3f8ee 100644 --- a/platform/core-impl/src/com/intellij/codeInsight/completion/OffsetTranslator.java +++ b/platform/core-impl/src/com/intellij/codeInsight/completion/OffsetTranslator.java @@ -45,7 +45,7 @@ class OffsetTranslator implements Disposable { }, this); originalFile.getProject().getMessageBus().connect(this).subscribe(PsiModificationTracker.TOPIC, new PsiModificationTracker.Listener() { - long lastModCount = originalFile.getViewProvider().getModificationStamp(); + final long lastModCount = originalFile.getViewProvider().getModificationStamp(); @Override public void modificationCountChanged() { if (isUpToDate() && lastModCount != originalFile.getViewProvider().getModificationStamp()) { diff --git a/platform/dvcs-impl/src/com/intellij/dvcs/ui/CloneDvcsDialog.java b/platform/dvcs-impl/src/com/intellij/dvcs/ui/CloneDvcsDialog.java index a3887cc7ece9..b2b4cac6cb2f 100644 --- a/platform/dvcs-impl/src/com/intellij/dvcs/ui/CloneDvcsDialog.java +++ b/platform/dvcs-impl/src/com/intellij/dvcs/ui/CloneDvcsDialog.java @@ -96,7 +96,7 @@ public abstract class CloneDvcsDialog extends DialogWrapper { @NotNull private final List myLoadedRepositoryHostingServicesNames; @Nullable private Alarm myRepositoryUrlAutoCompletionTooltipAlarm; @NotNull private final Set myUniqueAvailableRepositories; - @NotNull private List myRepositoryListLoadingErrors = new ArrayList<>(); + @NotNull private final List myRepositoryListLoadingErrors = new ArrayList<>(); public CloneDvcsDialog(@NotNull Project project, @NotNull String displayName, @NotNull String vcsDirectoryName) { this(project, displayName, vcsDirectoryName, null); diff --git a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java index 80f54469c905..057409d13ea1 100644 --- a/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java +++ b/platform/external-system-api/src/com/intellij/openapi/externalSystem/model/project/ModuleData.java @@ -26,7 +26,7 @@ public class ModuleData extends AbstractNamedData implements Named, ExternalConf @NotNull private final String myId; @NotNull private final String myModuleTypeId; @NotNull private final String myExternalConfigPath; - @NotNull private String myModuleFileDirectoryPath; + @NotNull private final String myModuleFileDirectoryPath; @Nullable private String myGroup; @Nullable private String myVersion; @Nullable private String myDescription; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java index b083c6b5b8d3..badcdcce50ac 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowImplementationsAction.java @@ -206,7 +206,7 @@ public class ShowImplementationsAction extends AnAction implements PopupAction { private static class ImplementationViewComponentUpdater implements ListComponentUpdater { private final ImplementationViewComponent myComponent; - private int myIncludeSelfIdx; + private final int myIncludeSelfIdx; ImplementationViewComponentUpdater(ImplementationViewComponent component, int includeSelfIdx) { myComponent = component; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java index 4d77bf42daa8..1cb60e5bc507 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplateCompletionContributor.java @@ -36,7 +36,7 @@ import static com.intellij.codeInsight.template.impl.ListTemplatesHandler.filter * @author peter */ public class LiveTemplateCompletionContributor extends CompletionContributor { - private static Key ourShowTemplatesInTests = Key.create("ShowTemplatesInTests"); + private static final Key ourShowTemplatesInTests = Key.create("ShowTemplatesInTests"); @TestOnly public static void setShowTemplatesInTests(boolean show, @NotNull Disposable parentDisposable) { diff --git a/platform/lang-impl/src/com/intellij/execution/configuration/EnvironmentVariablesTextFieldWithBrowseButton.java b/platform/lang-impl/src/com/intellij/execution/configuration/EnvironmentVariablesTextFieldWithBrowseButton.java index 067b34dd4db9..9299b84550ff 100644 --- a/platform/lang-impl/src/com/intellij/execution/configuration/EnvironmentVariablesTextFieldWithBrowseButton.java +++ b/platform/lang-impl/src/com/intellij/execution/configuration/EnvironmentVariablesTextFieldWithBrowseButton.java @@ -42,7 +42,7 @@ import java.util.*; public class EnvironmentVariablesTextFieldWithBrowseButton extends TextFieldWithBrowseButton implements UserActivityProviderComponent { private EnvironmentVariablesData myData = EnvironmentVariablesData.DEFAULT; - private Map myParentDefaults = new LinkedHashMap<>(); + private final Map myParentDefaults = new LinkedHashMap<>(); private final List myListeners = ContainerUtil.createLockFreeCopyOnWriteList(); public EnvironmentVariablesTextFieldWithBrowseButton() { diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java index 3a330e60fdf2..ca157fabaf7c 100644 --- a/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java +++ b/platform/lang-impl/src/com/intellij/find/impl/FindPopupPanel.java @@ -137,7 +137,7 @@ public class FindPopupPanel extends JBPanel implements FindUI { private String myUsagesCount; private String myFilesCount; private UsageViewPresentation myUsageViewPresentation; - private ComponentValidator myComponentValidator; + private final ComponentValidator myComponentValidator; FindPopupPanel(@NotNull FindUIHelper helper) { myHelper = helper; diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurable.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurable.java index 4e48677ab3cc..1919418c2ae4 100644 --- a/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/exclude/DetectionExcludesConfigurable.java @@ -74,7 +74,7 @@ public class DetectionExcludesConfigurable implements Configurable { myEnabledDetectionCheckBox.setBorder(new EmptyBorder(10, 10, 0, 0)); final JBList excludesList = new JBList(myModel); final ColoredListCellRenderer renderer = new ColoredListCellRenderer() { - JPanel panel = new JPanel(new BorderLayout()); + final JPanel panel = new JPanel(new BorderLayout()); { panel.setBorder(new EmptyBorder(2, 10, 2, 0)); panel.add(this); diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java index 1b6c22263ca2..a472cf9a1082 100644 --- a/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java +++ b/platform/lang-impl/src/com/intellij/ide/scratch/ScratchFileActions.java @@ -272,7 +272,7 @@ public class ScratchFileActions { @NotNull protected Function fileLanguage(@NotNull Project project) { return new Function() { - ScratchFileService fileService = ScratchFileService.getInstance(); + final ScratchFileService fileService = ScratchFileService.getInstance(); @Override public Language fun(VirtualFile file) { diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java index a4f7538b9e80..f0ab0727fe8c 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java @@ -134,7 +134,7 @@ public abstract class ChooseByNameBase implements ChooseByNameViewModel { private final int myRebuildDelay; private final Alarm myHideAlarm = new Alarm(); - private boolean myShowListAfterCompletionKeyStroke = false; + private final boolean myShowListAfterCompletionKeyStroke = false; protected JBPopup myTextPopup; protected JBPopup myDropdownPopup; diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java index f90550468c08..33078753c15b 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/DefaultChooseByNameItemProvider.java @@ -199,7 +199,7 @@ public class DefaultChooseByNameItemProvider implements ChooseByNameItemProvider ChooseByNameModel model = base.getModel(); Comparator weightComparator = new Comparator() { - @SuppressWarnings("unchecked") + @SuppressWarnings("unchecked") final Comparator modelComparator = model instanceof Comparator ? (Comparator)model : new PathProximityComparator(context); diff --git a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorPsiTreeChangeListener.java b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorPsiTreeChangeListener.java index 0d3e234055f8..2cf134c069a7 100644 --- a/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorPsiTreeChangeListener.java +++ b/platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorPsiTreeChangeListener.java @@ -17,7 +17,7 @@ import org.jetbrains.annotations.NotNull; public final class FileEditorPsiTreeChangeListener extends PsiTreeChangeAdapter { private static final Logger LOG = Logger.getInstance(FileEditorPsiTreeChangeListener.class); - private FileEditorManagerEx myFileEditorManager; + private final FileEditorManagerEx myFileEditorManager; public FileEditorPsiTreeChangeListener(FileEditorManagerEx psiAwareFileEditorManager) { myFileEditorManager = psiAwareFileEditorManager; diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/SeverityRenderer.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/SeverityRenderer.java index ea2756ba445b..f18e6f4a97cb 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/SeverityRenderer.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/table/SeverityRenderer.java @@ -30,7 +30,7 @@ public class SeverityRenderer extends ComboBoxTableRenderer { static final HighlightSeverity EDIT_SEVERITIES = new HighlightSeverity(InspectionsBundle.message("inspection.edit.severities.text"), -1); @NotNull private final Runnable myOnClose; - private ScopesAndSeveritiesTable myTable; + private final ScopesAndSeveritiesTable myTable; @NotNull private final Icon myDisabledIcon; @NotNull diff --git a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java index db7b46e8f6d4..b42242b47740 100644 --- a/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java +++ b/platform/lang-impl/src/com/intellij/util/indexing/FileBasedIndexProjectHandler.java @@ -154,7 +154,7 @@ public class FileBasedIndexProjectHandler implements IndexableFileSet, Disposabl index.processChangedFiles(project, new Processor() { int filesInProjectToBeIndexed; - String projectBasePath = project.getBasePath(); + final String projectBasePath = project.getBasePath(); @Override public boolean process(VirtualFile file) { diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java index 2eb1af8c4c20..f615532188b6 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java @@ -2050,8 +2050,8 @@ public abstract class DialogWrapper { } new Thread("DialogWrapper resizer") { - int time = 200; - int steps = 7; + final int time = 200; + final int steps = 7; @Override public void run() { diff --git a/platform/platform-api/src/com/intellij/ui/speedSearch/FilteringTableModel.java b/platform/platform-api/src/com/intellij/ui/speedSearch/FilteringTableModel.java index 3becc9e86a4d..d4f3cee03a83 100644 --- a/platform/platform-api/src/com/intellij/ui/speedSearch/FilteringTableModel.java +++ b/platform/platform-api/src/com/intellij/ui/speedSearch/FilteringTableModel.java @@ -29,7 +29,7 @@ public class FilteringTableModel extends AbstractTableModel { private final List> myData = new ArrayList<>(); private final Class myClz; private Condition myCondition = null; - private ArrayList myIndex = new ArrayList<>(); + private final ArrayList myIndex = new ArrayList<>(); private final TableModelListener myListDataListener = e -> refilter(); diff --git a/platform/platform-impl/src/com/intellij/application/ExperimentsDialog.java b/platform/platform-impl/src/com/intellij/application/ExperimentsDialog.java index 809b18eb5a0f..d319990ef24b 100644 --- a/platform/platform-impl/src/com/intellij/application/ExperimentsDialog.java +++ b/platform/platform-impl/src/com/intellij/application/ExperimentsDialog.java @@ -74,7 +74,7 @@ public class ExperimentsDialog extends DialogWrapper { private TableModel createModel(ExperimentalFeature[] experimentalFeatures) { return new AbstractTableModel() { - ExperimentalFeature[] features = experimentalFeatures; + final ExperimentalFeature[] features = experimentalFeatures; @Override public int getRowCount() { diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ActivityMonitorAction.java b/platform/platform-impl/src/com/intellij/ide/actions/ActivityMonitorAction.java index 147205fbb656..2edb96992da2 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ActivityMonitorAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ActivityMonitorAction.java @@ -40,7 +40,7 @@ class ActivityMonitorAction extends DumbAwareAction { CompilationMXBean jitBean = ManagementFactory.getCompilationMXBean(); ScheduledFuture future = AppExecutorUtil.getAppScheduledExecutorService().scheduleWithFixedDelay(new Runnable() { final TLongLongHashMap lastThreadTimes = new TLongLongHashMap(); - TObjectLongHashMap subsystemToSamples = new TObjectLongHashMap<>(); + final TObjectLongHashMap subsystemToSamples = new TObjectLongHashMap<>(); long lastGcTime = totalGcTime(); long lastJitTime = jitBean.getTotalCompilationTime(); long lastUiUpdate = System.currentTimeMillis(); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java index 58becd2644ff..5f2b49eb252e 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java @@ -453,8 +453,8 @@ public class Switcher extends AnAction implements DumbAware { } final VirtualFilesRenderer filesRenderer = new VirtualFilesRenderer(this) { - JPanel myPanel = new JPanel(new BorderLayout()); - JLabel myLabel = createPaleLabel("* "); + final JPanel myPanel = new JPanel(new BorderLayout()); + final JLabel myLabel = createPaleLabel("* "); { myPanel.setOpaque(false); diff --git a/platform/platform-impl/src/com/intellij/internal/GrayFilterConfig.java b/platform/platform-impl/src/com/intellij/internal/GrayFilterConfig.java index 99cd385c6288..b3326bdc5dc3 100644 --- a/platform/platform-impl/src/com/intellij/internal/GrayFilterConfig.java +++ b/platform/platform-impl/src/com/intellij/internal/GrayFilterConfig.java @@ -68,7 +68,7 @@ public class GrayFilterConfig extends AnAction implements DumbAware { }; table.getColumnModel().getColumn(1).setCellEditor(new AbstractTableCellEditor() { - JTextField component = new JTextField(); + final JTextField component = new JTextField(); @Override public Object getCellEditorValue() { diff --git a/platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java b/platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java index 036f965ed37f..98714ad35f7d 100644 --- a/platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java +++ b/platform/platform-impl/src/com/intellij/internal/anomalies/TopAnomaliesAction.java @@ -43,7 +43,7 @@ public class TopAnomaliesAction extends ActionGroup { private static final int LIMIT = 10; private static final ResettableAction TOP_PARENTS = new ResettableAction("Parents") { - TreeSet> top = new TreeSet<>(COMPARATOR); + final TreeSet> top = new TreeSet<>(COMPARATOR); TreeSet> old = new TreeSet<>(COMPARATOR); @Override @@ -91,7 +91,7 @@ public class TopAnomaliesAction extends ActionGroup { }; private static final ResettableAction TOP_UI_PROPERTIES = new ResettableAction("ClientProperties") { - TreeSet> top = new TreeSet<>(COMPARATOR); + final TreeSet> top = new TreeSet<>(COMPARATOR); TreeSet> old = new TreeSet<>(COMPARATOR); @Override diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ActionsCollectorImpl.java b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ActionsCollectorImpl.java index 6f9d36bacf31..5a1d77048e1a 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ActionsCollectorImpl.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/ActionsCollectorImpl.java @@ -99,7 +99,7 @@ public class ActionsCollectorImpl extends ActionsCollector implements Persistent return action.isGlobal() ? ActionManager.getInstance().getId(action) : null; } - private State myState = new State(); + private final State myState = new State(); @Nullable @Override diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/IntentionsCollector.java b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/IntentionsCollector.java index 972c17ed14d8..d289a0abd5c1 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/IntentionsCollector.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/actions/persistence/IntentionsCollector.java @@ -35,7 +35,7 @@ public class IntentionsCollector implements PersistentStateComponent myValues = new HashMap<>(); } - private MyState myState = new MyState(); + private final MyState myState = new MyState(); @Override @NotNull diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/persistence/ToolbarClicksCollector.java b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/persistence/ToolbarClicksCollector.java index eac9d5fb45b2..fb145e7bb5e4 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/persistence/ToolbarClicksCollector.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/ui/persistence/ToolbarClicksCollector.java @@ -38,7 +38,7 @@ public class ToolbarClicksCollector implements PersistentStateComponent myValues = new HashMap<>(); } - private ClicksState myState = new ClicksState(); + private final ClicksState myState = new ClicksState(); @Override public ClicksState getState() { diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/utils/StatisticsUploadAssistant.java b/platform/platform-impl/src/com/intellij/internal/statistic/utils/StatisticsUploadAssistant.java index 511a3fbca700..7ddce4a46026 100755 --- a/platform/platform-impl/src/com/intellij/internal/statistic/utils/StatisticsUploadAssistant.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/utils/StatisticsUploadAssistant.java @@ -26,7 +26,7 @@ import com.intellij.util.Time; public class StatisticsUploadAssistant { private static final String IDEA_SUPPRESS_REPORT_STATISTICS = "idea.suppress.statistics.report"; public static final Object LOCK = new Object(); - private static EventLogStatisticsService logStatisticsService = new EventLogStatisticsService(); + private static final EventLogStatisticsService logStatisticsService = new EventLogStatisticsService(); private StatisticsUploadAssistant(){} diff --git a/platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java index 1f1ae6c5408c..afa44d86da2a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/DumbServiceImpl.java @@ -79,7 +79,7 @@ public class DumbServiceImpl extends DumbService implements Disposable, Modifica ApplicationManager.getApplication().getMessageBus().connect(project) .subscribe(BatchFileChangeListener.TOPIC, new BatchFileChangeListener() { - @SuppressWarnings("UnnecessaryFullyQualifiedName") // synchronized, can be accessed from different threads + @SuppressWarnings("UnnecessaryFullyQualifiedName") final // synchronized, can be accessed from different threads java.util.Stack stack = new Stack<>(); @Override diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/JBListUpdater.java b/platform/platform-impl/src/com/intellij/openapi/ui/JBListUpdater.java index ef60a58650a4..426b65a7430a 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/JBListUpdater.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/JBListUpdater.java @@ -11,7 +11,7 @@ import javax.swing.*; import java.util.List; public class JBListUpdater implements ListComponentUpdater { - private JBList myComponent; + private final JBList myComponent; public JBListUpdater(JBList component) { myComponent = component; diff --git a/platform/platform-impl/src/com/intellij/troubleshooting/ProblemTypeAdapter.java b/platform/platform-impl/src/com/intellij/troubleshooting/ProblemTypeAdapter.java index 530740835f56..a1a364a91b82 100644 --- a/platform/platform-impl/src/com/intellij/troubleshooting/ProblemTypeAdapter.java +++ b/platform/platform-impl/src/com/intellij/troubleshooting/ProblemTypeAdapter.java @@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull; @SuppressWarnings("deprecation") public class ProblemTypeAdapter implements TroubleInfoCollector { - private ProblemType myProblemType; + private final ProblemType myProblemType; public ProblemTypeAdapter(ProblemType problemType) { myProblemType = problemType; diff --git a/platform/platform-impl/src/com/intellij/ui/ComboBoxCompositeEditor.java b/platform/platform-impl/src/com/intellij/ui/ComboBoxCompositeEditor.java index e105474f9033..ef3c01eb6e62 100644 --- a/platform/platform-impl/src/com/intellij/ui/ComboBoxCompositeEditor.java +++ b/platform/platform-impl/src/com/intellij/ui/ComboBoxCompositeEditor.java @@ -75,7 +75,7 @@ public class ComboBoxCompositeEditor extends JPanel imp private final ComboBoxCompositeEditorStrategy editorTextFieldStrategy = new ComboBoxCompositeEditorStrategy () { - BiConsumer defaultOnSetHandler = (anObject, component) -> component.setText((anObject == null) ? "" : anObject.toString()); + final BiConsumer defaultOnSetHandler = (anObject, component) -> component.setText((anObject == null) ? "" : anObject.toString()); @Override public void setItem(F component, I anObject) { @@ -113,7 +113,7 @@ public class ComboBoxCompositeEditor extends JPanel imp private final ComboBoxCompositeEditorStrategy jTextFieldStrategy = new ComboBoxCompositeEditorStrategy() { - BiConsumer defaultOnSetHandler = (anObject, component) -> component.setText((anObject ==null) ? "" : anObject.toString()); + final BiConsumer defaultOnSetHandler = (anObject, component) -> component.setText((anObject == null) ? "" : anObject.toString()); @Override public void setItem(F component, I anObject) { diff --git a/platform/platform-impl/src/com/intellij/ui/ShowUIDefaultsAction.java b/platform/platform-impl/src/com/intellij/ui/ShowUIDefaultsAction.java index b6842ee70534..38678cc558ec 100644 --- a/platform/platform-impl/src/com/intellij/ui/ShowUIDefaultsAction.java +++ b/platform/platform-impl/src/com/intellij/ui/ShowUIDefaultsAction.java @@ -261,8 +261,8 @@ public class ShowUIDefaultsAction extends AnAction implements DumbAware { private void addNewValue() { ApplicationManager.getApplication().invokeLater(() -> new DialogWrapper(myTable, true) { - JBTextField name = new JBTextField(40); - JBTextField value = new JBTextField(40); + final JBTextField name = new JBTextField(40); + final JBTextField value = new JBTextField(40); { setTitle("Add New Value"); init(); diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java index e836cbf619ae..6db00a81825b 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/NST.java @@ -27,7 +27,7 @@ public class NST { private static final String ourRegistryKeyTouchbar = "ide.mac.touchbar.use"; private static NSTLibrary ourNSTLibrary = null; // NOTE: JNA is stateless (doesn't have any limitations of multi-threaded use) - private static String MIN_OS_VERSION = "10.12.2"; + private static final String MIN_OS_VERSION = "10.12.2"; static boolean isSupportedOS() { return SystemInfo.isMac && SystemInfo.isOsVersionAtLeast(MIN_OS_VERSION); } private static final boolean ourHeadless = GraphicsEnvironment.isHeadless(); diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ProjectData.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ProjectData.java index 53ad7302cc9c..0b89c613d355 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ProjectData.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/ProjectData.java @@ -40,7 +40,7 @@ class ProjectData { private final Map myEditors = new HashMap<>(); private final Map myToolWindows = new HashMap<>(); - private AtomicInteger myActiveDebugSessions = new AtomicInteger(0); + private final AtomicInteger myActiveDebugSessions = new AtomicInteger(0); ProjectData(@NotNull Project project) { myProject = project; diff --git a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemPopover.java b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemPopover.java index 45911847e7ae..cee2ec6f40de 100644 --- a/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemPopover.java +++ b/platform/platform-impl/src/com/intellij/ui/mac/touchbar/TBItemPopover.java @@ -9,9 +9,9 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; class TBItemPopover extends TBItem { - private Icon myIcon; - private String myText; - private int myWidthPix; + private final Icon myIcon; + private final String myText; + private final int myWidthPix; private TouchBar myExpandTB; private TouchBar myTapAndHoldTB; diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupTableAdapter.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupTableAdapter.java index 49ccd32eeeeb..6f83d9938755 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/PopupTableAdapter.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupTableAdapter.java @@ -17,7 +17,7 @@ import java.util.Set; * @author yole */ class PopupTableAdapter implements PopupChooserBuilder.PopupComponentAdapter { - private PopupChooserBuilder myBuilder; + private final PopupChooserBuilder myBuilder; private final JTable myTable; PopupTableAdapter(PopupChooserBuilder builder, JTable table) { diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupTreeAdapter.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupTreeAdapter.java index 262366aa743e..29ae4bbcbd91 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/PopupTreeAdapter.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupTreeAdapter.java @@ -18,7 +18,7 @@ import java.util.Set; * @author yole */ class PopupTreeAdapter implements PopupChooserBuilder.PopupComponentAdapter { - private PopupChooserBuilder myBuilder; + private final PopupChooserBuilder myBuilder; private final JTree myTree; PopupTreeAdapter(PopupChooserBuilder builder, JTree tree) { diff --git a/platform/util-rt/src/com/intellij/execution/rmi/RemoteServer.java b/platform/util-rt/src/com/intellij/execution/rmi/RemoteServer.java index 5dd2921b092c..949590ef987b 100644 --- a/platform/util-rt/src/com/intellij/execution/rmi/RemoteServer.java +++ b/platform/util-rt/src/com/intellij/execution/rmi/RemoteServer.java @@ -59,7 +59,7 @@ public class RemoteServer { RMIClientSocketFactory clientSocketFactory = RMISocketFactory.getDefaultSocketFactory(); RMIServerSocketFactory serverSocketFactory = new RMIServerSocketFactory() { - InetAddress loopbackAddress = InetAddress.getByName(getLoopbackAddress()); + final InetAddress loopbackAddress = InetAddress.getByName(getLoopbackAddress()); public ServerSocket createServerSocket(int port) throws IOException { return new ServerSocket(port, 0, loopbackAddress); } diff --git a/platform/util/src/com/intellij/openapi/util/io/win32/WindowsElevationUtil.java b/platform/util/src/com/intellij/openapi/util/io/win32/WindowsElevationUtil.java index 07bee467f4a9..5f84dbf774c6 100644 --- a/platform/util/src/com/intellij/openapi/util/io/win32/WindowsElevationUtil.java +++ b/platform/util/src/com/intellij/openapi/util/io/win32/WindowsElevationUtil.java @@ -11,7 +11,7 @@ import org.jetbrains.annotations.NotNull; import java.util.List; public class WindowsElevationUtil { - private static Logger LOG = Logger.getInstance(WindowsElevationUtil.class); + private static final Logger LOG = Logger.getInstance(WindowsElevationUtil.class); private WindowsElevationUtil() { } @@ -79,6 +79,6 @@ public class WindowsElevationUtil { return FIELDS; } - private static List FIELDS = createFieldsOrder("TokenIsElevated"); + private static final List FIELDS = createFieldsOrder("TokenIsElevated"); } } diff --git a/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java index 2dbb40863d64..4a8ed6da46de 100644 --- a/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java +++ b/platform/util/src/com/intellij/util/containers/ConcurrentFactoryMap.java @@ -232,7 +232,7 @@ public abstract class ConcurrentFactoryMap implements ConcurrentMap { @Override public Iterator iterator() { return new Iterator() { - Iterator it = myDelegate.iterator(); + final Iterator it = myDelegate.iterator(); @Override public boolean hasNext() { return it.hasNext(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java index 41dbd4d81d94..e250b0708a87 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java @@ -111,7 +111,7 @@ public class ChangesViewManager implements ChangesViewI, ProjectComponent, Persi @NotNull private final PropertyChangeListener myGroupingChangeListener; private MyChangeViewContent myContent; private boolean myModelUpdateInProgress; - private MyTreeExpander myTreeExpander; + private final MyTreeExpander myTreeExpander; @NotNull public static ChangesViewI getInstance(@NotNull Project project) { diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/MultipleValueFilterPopupComponent.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/MultipleValueFilterPopupComponent.java index 624c46f1a4fd..a6ba52e69e36 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/MultipleValueFilterPopupComponent.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/filter/MultipleValueFilterPopupComponent.java @@ -102,7 +102,7 @@ abstract class MultipleValueFilterPopupComponent ex protected class PredefinedValueAction extends DumbAwareAction { @NotNull protected final List myValues; - private boolean myAddToRecent; + private final boolean myAddToRecent; public PredefinedValueAction(@NotNull String value) { this(Collections.singletonList(value)); diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java index 7363749a19d7..f1cb8cf841e9 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/XDebuggerUtilImpl.java @@ -617,7 +617,7 @@ public class XDebuggerUtilImpl extends XDebuggerUtil { XExecutionStack activeExecutionStack = suspendContext.getActiveExecutionStack(); if (activeExecutionStack != null) { activeExecutionStack.computeStackFrames(0, new XStackFrameContainerEx() { - List myFrames = new ArrayList<>(); + final List myFrames = new ArrayList<>(); @Override public void addStackFrames(@NotNull List stackFrames, boolean last) { diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InheritanceUtil.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InheritanceUtil.java index 439e55b53364..230e1f406767 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InheritanceUtil.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/ig/psiutils/InheritanceUtil.java @@ -65,7 +65,7 @@ public class InheritanceUtil { final Query search = ClassInheritorsSearch.search(class1, scope, true); final boolean[] result = new boolean[1]; search.forEach(new Processor() { - AtomicInteger count = new AtomicInteger(0); + final AtomicInteger count = new AtomicInteger(0); @Override public boolean process(PsiClass inheritor) { diff --git a/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java b/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java index 12f3fae352a2..47e692476f87 100644 --- a/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java +++ b/plugins/git4idea/src/git4idea/vfs/GitVFSListener.java @@ -183,7 +183,7 @@ public class GitVFSListener extends VcsVFSListener { @Override protected void performDeletion(@NotNull final List filesToDelete) { performBackgroundOperation(filesToDelete, GitBundle.getString("remove.removing"), new LongOperationPerRootExecutor() { - Set filesToRefresh = newHashSet(); + final Set filesToRefresh = newHashSet(); @Override public void execute(@NotNull VirtualFile root, @NotNull List files) throws VcsException { diff --git a/plugins/github/src/org/jetbrains/plugins/github/util/GithubAuthDataHolder.java b/plugins/github/src/org/jetbrains/plugins/github/util/GithubAuthDataHolder.java index 999672e87f0c..2f413594e7ee 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/util/GithubAuthDataHolder.java +++ b/plugins/github/src/org/jetbrains/plugins/github/util/GithubAuthDataHolder.java @@ -22,7 +22,7 @@ import org.jetbrains.annotations.NotNull; */ @Deprecated public class GithubAuthDataHolder { - @NotNull private GithubAuthData myAuthData; + @NotNull private final GithubAuthData myAuthData; public GithubAuthDataHolder(@NotNull GithubAuthData auth) { myAuthData = auth; diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java index 6c4bd40df3e3..267325af4e2d 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/GradleProjectResolverUtil.java @@ -535,9 +535,9 @@ public class GradleProjectResolverUtil { DataNode depOwnerDataNode = null; if (mergedDependency instanceof ExternalProjectDependency) { class ProjectDependencyInfo { - @NotNull ModuleData myModuleData; - @Nullable ExternalSourceSet mySourceSet; - Collection dependencyArtifacts; + @NotNull final ModuleData myModuleData; + @Nullable final ExternalSourceSet mySourceSet; + final Collection dependencyArtifacts; ProjectDependencyInfo(@NotNull ModuleData moduleData, @Nullable ExternalSourceSet sourceSet, diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java index 7a431d703979..240ee3e49c33 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java @@ -547,11 +547,11 @@ public class FinallyProcessor { Map mapLast, boolean skippedFirst) { class BlockStackEntry { - public BasicBlock blockCatch; - public BasicBlock blockSample; + public final BasicBlock blockCatch; + public final BasicBlock blockSample; // TODO: correct handling (merging) of multiple paths - public List lstStoreVars; + public final List lstStoreVars; BlockStackEntry(BasicBlock blockCatch, BasicBlock blockSample, List lstStoreVars) { this.blockCatch = blockCatch; diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java index 4017b3e8cd46..7fecbd9f8589 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java @@ -16,7 +16,7 @@ public class IrreducibleCFGDeobfuscator { public static boolean isStatementIrreducible(Statement statement) { class Node { - public Integer id; + public final Integer id; public final Set preds = new HashSet<>(); public final Set succs = new HashSet<>(); diff --git a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java index 2db1e301219b..b9abd119f2e4 100644 --- a/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java +++ b/plugins/java-decompiler/engine/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java @@ -56,9 +56,9 @@ public class FlattenStatementsHelper { private void flattenStatement() { class StatementStackEntry { - public Statement statement; - public LinkedList stackFinally; - public List tailExprents; + public final Statement statement; + public final LinkedList stackFinally; + public final List tailExprents; public int statementIndex; public int edgeIndex; diff --git a/plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/ExecutorManager.java b/plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/ExecutorManager.java index e6a528827d0a..71f172fe5bf0 100644 --- a/plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/ExecutorManager.java +++ b/plugins/maven/maven2-server-impl/src/org/jetbrains/idea/maven/server/embedder/ExecutorManager.java @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class ExecutorManager { private static final ExecutorService myExecutor = new ThreadPoolExecutor(3, Integer.MAX_VALUE, 30 * 60L, TimeUnit.SECONDS, new SynchronousQueue(),new ThreadFactory() { - AtomicInteger num = new AtomicInteger(); + final AtomicInteger num = new AtomicInteger(); @Override public Thread newThread(Runnable r) { return new Thread(r, "Maven Embedder "+num.getAndIncrement()); diff --git a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/ExecutorManager.java b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/ExecutorManager.java index a28f5c4da6db..ec8778fe9c9a 100644 --- a/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/ExecutorManager.java +++ b/plugins/maven/maven3-server-common/src/org/jetbrains/idea/maven/server/ExecutorManager.java @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicInteger; public class ExecutorManager { private static final ExecutorService myExecutor = new ThreadPoolExecutor(3, Integer.MAX_VALUE, 30 * 60L, TimeUnit.SECONDS, new SynchronousQueue(),new ThreadFactory() { - AtomicInteger num = new AtomicInteger(); + final AtomicInteger num = new AtomicInteger(); @Override public Thread newThread(Runnable r) { return new Thread(r, "Maven Embedder "+num.getAndIncrement()); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java index 95aca29b74d3..49eba15fa972 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/refactorings/introduce/IntroducePropertyAction.java @@ -248,7 +248,7 @@ public class IntroducePropertyAction extends BaseRefactoringAction { @Override public UsageSearcher create() { return new UsageSearcher() { - Set usages = new HashSet<>(); + final Set usages = new HashSet<>(); @Override public void generate(@NotNull final Processor processor) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerAnnotationProcessorPathsImporter.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerAnnotationProcessorPathsImporter.java index 99eb8cc7f130..5603325cc1bf 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerAnnotationProcessorPathsImporter.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/importing/MavenCompilerAnnotationProcessorPathsImporter.java @@ -25,7 +25,7 @@ import java.util.Map; public class MavenCompilerAnnotationProcessorPathsImporter extends MavenImporter { - private Logger LOG = Logger.getInstance("#org.jetbrains.idea.maven.importing.MavenCompilerAnnotationProcessorPathsImporter"); + private final Logger LOG = Logger.getInstance("#org.jetbrains.idea.maven.importing.MavenCompilerAnnotationProcessorPathsImporter"); public MavenCompilerAnnotationProcessorPathsImporter() { super("org.apache.maven.plugins", "maven-compiler-plugin"); diff --git a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java index dae4a7461e81..10a02102d746 100644 --- a/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java +++ b/xml/impl/src/com/intellij/xml/breadcrumbs/BreadcrumbsXmlWrapper.java @@ -68,7 +68,7 @@ public class BreadcrumbsXmlWrapper extends JComponent implements Disposable { private boolean myUserCaretChange = true; private final MergingUpdateQueue myQueue = new MergingUpdateQueue("Breadcrumbs.Queue", 200, true, breadcrumbs); - private List myBreadcrumbListeners = new ArrayList<>(); + private final List myBreadcrumbListeners = new ArrayList<>(); private final Update myUpdate = new Update(this) { @Override diff --git a/xml/xml-analysis-impl/src/com/intellij/application/options/editor/WebEditorOptions.java b/xml/xml-analysis-impl/src/com/intellij/application/options/editor/WebEditorOptions.java index 418c01f872f0..61df0b54b68c 100644 --- a/xml/xml-analysis-impl/src/com/intellij/application/options/editor/WebEditorOptions.java +++ b/xml/xml-analysis-impl/src/com/intellij/application/options/editor/WebEditorOptions.java @@ -15,7 +15,7 @@ import org.jetbrains.annotations.Nullable; storages = @Storage("editor.xml") ) public class WebEditorOptions implements PersistentStateComponent { - private boolean myShowCssColorPreviewInGutter = true; + private final boolean myShowCssColorPreviewInGutter = true; private boolean mySelectWholeCssIdentifierOnDoubleClick = true; private boolean myShowCssInlineColorPreview = false; private boolean myAutomaticallyInsertClosingTag = true;