From 227d75a1fcac385e2a413b8b3641858c7c37ea82 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Fri, 5 May 2023 08:11:48 +0200 Subject: [PATCH] don't extend DynamicBundle GitOrigin-RevId: 49cbebd629a92877dbeeffba8d97b0631fb9407e --- .../intellij/lang/regexp/RegExpBundle.java | 13 +- .../lang/regexp/RegExpLanguageHosts.java | 41 ++-- .../src/org/intellij/images/ImagesBundle.java | 14 +- .../openapi/compiler/JavaCompilerBundle.java | 14 +- .../intellij/debugger/JavaDebuggerBundle.java | 16 +- .../src/com/intellij/ide/JavaUiBundle.java | 7 +- .../ide/starters/JavaStartersBundle.java | 10 +- .../java/analysis/JavaAnalysisBundle.java | 13 +- .../codeInsight/daemon/QuickFixBundle.java | 14 +- .../com/intellij/psi/util/PsiMatcherImpl.java | 2 +- .../java/generate/config/CancelPolicy.java | 1 - .../com/intellij/javadoc/JavadocHelper.java | 21 +- .../impl/providers/JavaClassReference.java | 62 ++---- .../intellij/refactoring/RefactorJBundle.java | 7 +- .../java/indexing/JavaIndexingBundle.java | 5 +- .../src/com/intellij/core/JavaPsiBundle.java | 20 +- .../com/intellij/psi/EmptySubstitutor.java | 17 +- .../com/intellij/psi/JVMElementFactories.java | 6 +- .../AllVariablesControlFlowPolicy.java | 4 +- .../psi/impl/source/PsiFieldImpl.java | 2 +- .../PsiImportStaticReferenceElementImpl.java | 14 +- .../impl/java/JavaStructureViewBundle.java | 13 +- .../lang/manifest/ManifestBundle.java | 16 +- .../src/com/intellij/java/JavaBundle.java | 13 +- .../refactoring/JavaRefactoringBundle.java | 13 +- .../typeMigration/TypeMigrationBundle.java | 13 +- .../jps/builders/JpsBuildBundle.java | 12 +- json/src/com/intellij/json/JsonBundle.java | 13 +- .../JsonCompletionContributor.java | 3 +- .../impl/JsonSchemaBaseReference.java | 11 +- .../com/intellij/analysis/AnalysisBundle.java | 13 +- .../codeInspection/CommonQuickFixBundle.java | 14 +- .../codeInspection/InspectionsBundle.java | 14 +- .../InspectionsDeprecatedMessagesBundle.java | 12 +- .../src/com/intellij/find/FindBundle.java | 5 +- .../jetbrains/ide/BuiltInServerBundle.java | 13 +- .../src/com/intellij/CodeStyleBundle.java | 13 +- .../messages/CollaborationToolsBundle.java | 15 +- .../src/ConfigurationStoreBundle.java | 13 +- .../reference/impl/CachingReference.java | 11 +- .../impl/PsiPolyVariantCachingReference.java | 2 +- .../RecursiveTreeElementWalkingVisitor.java | 1 - .../com/intellij/openapi/diff/DiffBundle.java | 14 +- .../diff/impl/DiffRequestProcessor.java | 204 +++++++----------- .../intellij/dupLocator/DupLocatorBundle.java | 13 +- .../src/com/intellij/dvcs/ui/DvcsBundle.java | 14 +- .../openapi/editor/PlatformEditorBundle.java | 13 +- .../process/elevation/ElevationBundle.java | 15 +- .../UnknownConfigurationType.java | 14 +- .../ExternalProcessAuthHelperBundle.java | 17 +- .../src/com/intellij/CommonBundle.java | 17 +- .../ide/IdeDeprecatedMessagesBundle.java | 10 +- .../openapi/project/ProjectBundle.java | 14 +- .../psi/search/searches/ReferencesSearch.java | 29 +-- .../util/indexing/IndexingBundle.java | 13 +- .../indexing/impl/storage/KeyHashLog.java | 33 +-- .../codeInsight/CodeInsightBundle.java | 14 +- .../codeInsight/daemon/DaemonBundle.java | 14 +- .../src/com/intellij/lang/LangBundle.java | 13 +- .../src/com/intellij/lang/LangCoreBundle.java | 13 +- .../toolWindow/ProblemsViewBundle.java | 5 +- .../src/com/intellij/build/BuildBundle.java | 13 +- .../DocRenderDummyLineMarkerProvider.java | 5 +- .../intellij/ide/bookmark/BookmarkBundle.java | 5 +- .../ide/bookmarks/BookmarkBundle.java | 5 +- .../src/com/intellij/tools/ToolsBundle.java | 13 +- .../integration/LocalHistoryBundle.java | 5 +- .../FeatureStatisticsBundle.java | 10 +- .../src/com/intellij/ide/IdeBundle.java | 5 +- .../src/com/intellij/idea/ActionsBundle.java | 5 +- .../idea/ActionsDeprecatedMessagesBundle.java | 5 +- .../intellij/openapi/editor/EditorBundle.java | 14 +- .../intellij/openapi/keymap/KeyMapBundle.java | 14 +- .../src/com/intellij/ui/UIBundle.java | 5 +- .../intellij/diagnostic/DiagnosticBundle.java | 6 +- .../project/LightEditDirectoryIndex.java | 17 +- .../internal/InternalActionsBundle.java | 13 +- .../editor/impl/view/IterationState.java | 21 +- .../openapi/fileTypes/FileTypesBundle.java | 13 +- .../ui/MonospaceEditorCustomization.java | 7 +- .../ProcessHandshakeBundle.java | 15 +- .../openapi/editor/impl/EditorStressTest.java | 2 +- .../com/intellij/util/io/IdeUtilIoBundle.java | 13 +- .../projectModel/ProjectModelBundle.java | 13 +- .../refactoring/RefactoringBundle.java | 19 +- .../remote-core/src/remote/RemoteBundle.java | 14 +- .../intellij/remoteServer/CloudBundle.java | 14 +- .../src/debugger/ScriptDebuggerBundle.java | 15 +- .../testframework/sm/SmRunnerBundle.java | 14 +- .../EventLogAppConnectionSettings.java | 22 +- .../intellij/structuralsearch/SSRBundle.java | 14 +- .../structureView/StructureViewBundle.java | 13 +- .../src/com/intellij/tasks/TaskApiBundle.java | 14 +- .../src/com/intellij/tasks/TaskBundle.java | 14 +- .../testFramework/EmptyFileBasedIndex.java | 5 +- .../testframework/TestRunnerBundle.java | 13 +- .../intellij/usageView/UsageViewBundle.java | 17 +- .../util/containers/EmptyIterator.java | 2 + .../history/VcsRevisionNumberArrayRule.java | 15 +- .../com/intellij/vcs/log/VcsLogBundle.java | 13 +- .../vcs/log/visible/EmptyVisibleGraph.java | 5 +- .../intellij/webSymbols/WebSymbolsBundle.java | 16 +- .../intellij/xdebugger/XDebuggerBundle.java | 14 +- .../JavaByteCodeViewerBundle.java | 13 +- .../com/siyeh/InspectionGadgetsBundle.java | 14 +- ...jectEqualsCanBeEqualityInspectionTest.java | 3 +- .../intelliLang/IntelliLangBundle.java | 14 +- .../com/siyeh/IntentionPowerPackBundle.java | 14 +- .../org/jetbrains/jps/ant/AntJpsBundle.java | 10 +- .../src/com/intellij/lang/ant/AntBundle.java | 14 +- .../lang/ant/resources/AntActionsBundle.java | 14 +- .../builtInHelp/BuiltInHelpBundle.java | 17 +- .../changeReminder/ChangeReminderBundle.java | 13 +- .../ide/commander/CommanderBundle.java | 14 +- .../src/ConfigurationScriptBundle.java | 5 +- .../intellij/copyright/CopyrightBundle.java | 13 +- .../com/intellij/coverage/CoverageBundle.java | 15 +- .../java/coverage/JavaCoverageBundle.java | 13 +- .../jetbrains/jps/devkit/DevKitJpsBundle.java | 10 +- .../jetbrains/idea/eclipse/EclipseBundle.java | 14 +- .../src/org/editorconfig/Utils.kt | 4 +- .../language/messages/EditorConfigBundle.kt | 11 +- .../messages/EmojiCategoriesBundle.java | 15 +- .../messages/EmojipickerBundle.java | 15 +- .../java/generate/config/ReplacePolicy.java | 2 - .../git4idea/src/git4idea/i18n/GitBundle.java | 17 +- .../plugins/github/i18n/GithubBundle.java | 14 +- .../GradleInspectionBundle.java | 14 +- .../jetbrains/jps/gradle/GradleJpsBundle.java | 14 +- .../plugins/groovy/GroovyBundle.java | 6 +- .../GroovyDeprecatedMessagesBundle.java | 6 +- .../intentions/GroovyIntentionsBundle.java | 14 +- .../impl/GrAllVarsInitializedPolicy.java | 2 +- .../impl/GrFieldControlFlowPolicy.java | 2 +- .../controlFlow/impl/GrResolverPolicy.java | 2 +- .../incremental/groovy/GroovyJpsBundle.java | 14 +- .../refactoring/GroovyRefactoringBundle.java | 14 +- .../src/org/zmlx/hg4idea/HgBundle.java | 14 +- .../intellij/htmltools/HtmlToolsBundle.java | 13 +- .../java/decompiler/IdeaDecompilerBundle.kt | 6 +- .../intellij/java/i18n/JavaI18nBundle.java | 5 +- .../plugins/javaFX/JavaFXCommonBundle.java | 15 +- .../plugins/javaFX/JavaFXJpsBundle.java | 14 +- .../plugins/javaFX/JavaFXBundle.java | 13 +- .../com/intellij/execution/JUnitBundle.java | 13 +- ...MoveFilesWithDeclarationsViewDescriptor.kt | 3 +- .../plugins/markdown/MarkdownBundle.java | 14 +- .../jetbrains/jps/maven/MavenJpsBundle.java | 6 +- .../idea/maven/dom/MavenDomBundle.java | 14 +- .../idea/maven/indices/IndicesBundle.java | 14 +- .../project/MavenConfigurableBundle.java | 11 +- .../maven/project/MavenProjectBundle.java | 14 +- .../idea/maven/tasks/TasksBundle.java | 14 +- .../idea/maven/wizards/MavenWizardBundle.java | 14 +- .../PerformanceTestingBundle.java | 14 +- .../lang/properties/PropertiesBundle.java | 14 +- .../editor/ResourceBundleEditorBundle.java | 14 +- .../JavaRareRefactoringsBundle.java | 18 +- .../settingsSync/SettingsSyncBundle.kt | 6 +- .../sh/core/src/com/intellij/sh/ShBundle.java | 14 +- .../streams/StreamDebuggerBundle.java | 9 +- .../src/org/jetbrains/idea/svn/SvnBundle.java | 18 +- .../theoryinpractice/testng/TestngBundle.java | 13 +- .../plugins/textmate/TextMateBundle.java | 12 +- .../com/intellij/designer/DesignerBundle.java | 14 +- .../jps/uiDesigner/compiler/FormBundle.java | 5 +- .../intellij/uiDesigner/UIDesignerBundle.java | 15 +- .../lang/xpath/TestNamespaceContext.java | 2 +- .../plugins/xpathView/XPathBundle.java | 13 +- .../xsltDebugger/XsltDebuggerBundle.java | 16 +- .../src/org/jetbrains/yaml/YAMLBundle.java | 15 +- .../PyCharmCommunityCustomizationBundle.java | 11 +- .../newProject/welcome/PyWelcomeBundle.java | 11 +- .../python/sdk/PyTerminalBundle.java | 13 +- .../src/com/jetbrains/rest/RestBundle.java | 14 +- .../debugger/PyDebuggerEditorsProvider.java | 21 +- .../debugger/PyUnitTestsDebuggingService.java | 8 +- .../inspections/CommentSplitter.java | 2 +- .../inspections/PropertiesSplitter.java | 5 +- .../inspections/WordSplitter.java | 6 +- .../com/intellij/util/xml/XmlDomBundle.java | 16 +- .../src/com/intellij/xml/XmlBundle.java | 14 +- .../plugins/relaxNG/RelaxngBundle.java | 13 +- .../validation/RngSchemaValidator.java | 13 +- .../xml/analysis/XmlAnalysisBundle.java | 13 +- .../com/intellij/xml/psi/XmlPsiBundle.java | 5 +- 186 files changed, 968 insertions(+), 1474 deletions(-) diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpBundle.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpBundle.java index d01184b731de..7dcf865c0333 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpBundle.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class RegExpBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.RegExpBundle"; - private static final RegExpBundle INSTANCE = new RegExpBundle(); +public final class RegExpBundle { + private static final @NonNls String BUNDLE = "messages.RegExpBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(RegExpBundle.class, BUNDLE); private RegExpBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java index cbecd9c13575..a1db81af5104 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpLanguageHosts.java @@ -13,7 +13,6 @@ import org.jetbrains.annotations.Nullable; import java.util.Collection; import java.util.Collections; - public final class RegExpLanguageHosts extends ClassExtension { private static final RegExpLanguageHosts INSTANCE = new RegExpLanguageHosts(); private final DefaultRegExpPropertiesProvider myDefaultProvider; @@ -28,8 +27,7 @@ public final class RegExpLanguageHosts extends ClassExtension null") - @Nullable - private static RegExpLanguageHost findRegExpHost(@Nullable final PsiElement element) { + private static @Nullable RegExpLanguageHost findRegExpHost(final @Nullable PsiElement element) { if (element == null) { return null; } @@ -44,7 +42,7 @@ public final class RegExpLanguageHosts extends ClassExtension messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/java/compiler/openapi/src/com/intellij/openapi/compiler/JavaCompilerBundle.java b/java/compiler/openapi/src/com/intellij/openapi/compiler/JavaCompilerBundle.java index 6136b52ddf24..dff4bf664552 100644 --- a/java/compiler/openapi/src/com/intellij/openapi/compiler/JavaCompilerBundle.java +++ b/java/compiler/openapi/src/com/intellij/openapi/compiler/JavaCompilerBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaCompilerBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.JavaCompilerBundle"; - private static final JavaCompilerBundle INSTANCE = new JavaCompilerBundle(); +public final class JavaCompilerBundle { + public static final @NonNls String BUNDLE = "messages.JavaCompilerBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaCompilerBundle.class, BUNDLE); - private JavaCompilerBundle() { super(BUNDLE); } + private JavaCompilerBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/java/debugger/openapi/src/com/intellij/debugger/JavaDebuggerBundle.java b/java/debugger/openapi/src/com/intellij/debugger/JavaDebuggerBundle.java index 71e75c92a195..e370f8317383 100644 --- a/java/debugger/openapi/src/com/intellij/debugger/JavaDebuggerBundle.java +++ b/java/debugger/openapi/src/com/intellij/debugger/JavaDebuggerBundle.java @@ -11,20 +11,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaDebuggerBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.JavaDebuggerBundle"; - private static final JavaDebuggerBundle INSTANCE = new JavaDebuggerBundle(); +public final class JavaDebuggerBundle { + private static final @NonNls String BUNDLE = "messages.JavaDebuggerBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaDebuggerBundle.class, BUNDLE); - private JavaDebuggerBundle() { super(BUNDLE); } + private JavaDebuggerBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } diff --git a/java/idea-ui/src/com/intellij/ide/JavaUiBundle.java b/java/idea-ui/src/com/intellij/ide/JavaUiBundle.java index 2122380d47ed..c4577ad13bff 100644 --- a/java/idea-ui/src/com/intellij/ide/JavaUiBundle.java +++ b/java/idea-ui/src/com/intellij/ide/JavaUiBundle.java @@ -9,11 +9,12 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaUiBundle extends DynamicBundle { +public final class JavaUiBundle { @NonNls private static final String BUNDLE = "messages.JavaUiBundle"; - private static final JavaUiBundle INSTANCE = new JavaUiBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaUiBundle.class, BUNDLE); - private JavaUiBundle() { super(BUNDLE); } + private JavaUiBundle() { + } @NotNull public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { diff --git a/java/idea-ui/src/com/intellij/ide/starters/JavaStartersBundle.java b/java/idea-ui/src/com/intellij/ide/starters/JavaStartersBundle.java index c2ac54470adc..144b9f806a13 100644 --- a/java/idea-ui/src/com/intellij/ide/starters/JavaStartersBundle.java +++ b/java/idea-ui/src/com/intellij/ide/starters/JavaStartersBundle.java @@ -7,16 +7,14 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; -public final class JavaStartersBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.JavaStartersBundle"; - private static final JavaStartersBundle INSTANCE = new JavaStartersBundle(); +public final class JavaStartersBundle { + private static final @NonNls String BUNDLE = "messages.JavaStartersBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaStartersBundle.class, BUNDLE); private JavaStartersBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } } diff --git a/java/java-analysis-api/src/com/intellij/java/analysis/JavaAnalysisBundle.java b/java/java-analysis-api/src/com/intellij/java/analysis/JavaAnalysisBundle.java index c2028253a579..4ed0af4de318 100644 --- a/java/java-analysis-api/src/com/intellij/java/analysis/JavaAnalysisBundle.java +++ b/java/java-analysis-api/src/com/intellij/java/analysis/JavaAnalysisBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaAnalysisBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.JavaAnalysisBundle"; - private static final JavaAnalysisBundle INSTANCE = new JavaAnalysisBundle(); +public final class JavaAnalysisBundle { + public static final @NonNls String BUNDLE = "messages.JavaAnalysisBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaAnalysisBundle.class, BUNDLE); private JavaAnalysisBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/QuickFixBundle.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/QuickFixBundle.java index 251c49384b5c..f22a8ed7e618 100644 --- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/QuickFixBundle.java +++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/QuickFixBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class QuickFixBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.QuickFixBundle"; - private static final QuickFixBundle INSTANCE = new QuickFixBundle(); +public final class QuickFixBundle { + public static final @NonNls String BUNDLE = "messages.QuickFixBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(QuickFixBundle.class, BUNDLE); - private QuickFixBundle() { super(BUNDLE); } + private QuickFixBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/java/java-analysis-impl/src/com/intellij/psi/util/PsiMatcherImpl.java b/java/java-analysis-impl/src/com/intellij/psi/util/PsiMatcherImpl.java index 6c62daa7ef5f..9828b92167b4 100644 --- a/java/java-analysis-impl/src/com/intellij/psi/util/PsiMatcherImpl.java +++ b/java/java-analysis-impl/src/com/intellij/psi/util/PsiMatcherImpl.java @@ -17,7 +17,7 @@ package com.intellij.psi.util; import com.intellij.psi.PsiElement; -public class PsiMatcherImpl implements PsiMatcher { +public final class PsiMatcherImpl implements PsiMatcher { private PsiElement myElement; public PsiMatcherImpl(PsiElement element) { diff --git a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/CancelPolicy.java b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/CancelPolicy.java index dd8d93c4c914..008c550784a1 100644 --- a/java/java-analysis-impl/src/org/jetbrains/java/generate/config/CancelPolicy.java +++ b/java/java-analysis-impl/src/org/jetbrains/java/generate/config/CancelPolicy.java @@ -24,7 +24,6 @@ import org.jetbrains.annotations.NotNull; * This policy is to cancel. */ public final class CancelPolicy implements ConflictResolutionPolicy { - private static final CancelPolicy instance = new CancelPolicy(); private CancelPolicy() {} diff --git a/java/java-impl/src/com/intellij/javadoc/JavadocHelper.java b/java/java-impl/src/com/intellij/javadoc/JavadocHelper.java index 851e94a6dbe5..c7aa375cc3b1 100644 --- a/java/java-impl/src/com/intellij/javadoc/JavadocHelper.java +++ b/java/java-impl/src/com/intellij/javadoc/JavadocHelper.java @@ -44,16 +44,14 @@ import java.util.List; /** * This class is not singleton but provides {@link #getInstance() single-point-of-usage field}. */ -public class JavadocHelper { - +public final class JavadocHelper { private static final String PARAM_TEXT = "param"; private static final Pair> EMPTY = new Pair<>(null, Collections.emptyList()); private static final JavadocHelper INSTANCE = new JavadocHelper(); - @NotNull - public static JavadocHelper getInstance() { + public static @NotNull JavadocHelper getInstance() { return INSTANCE; } @@ -64,7 +62,7 @@ public class JavadocHelper { * @param editor target editor * @param project target project */ - public void navigate(@NotNull LogicalPosition position, @NotNull Editor editor, @NotNull final Project project) { + public void navigate(@NotNull LogicalPosition position, @NotNull Editor editor, final @NotNull Project project) { final Document document = editor.getDocument(); final CaretModel caretModel = editor.getCaretModel(); final int endLineOffset = document.getLineEndOffset(position.line); @@ -88,8 +86,7 @@ public class JavadocHelper { * @param anchor descriptor for the target parameter * @return logical position that points to the desired parameter description start location */ - @NotNull - public LogicalPosition calculateDescriptionStartPosition(@NotNull PsiFile psiFile, + public @NotNull LogicalPosition calculateDescriptionStartPosition(@NotNull PsiFile psiFile, @NotNull Collection data, @NotNull JavadocHelper.JavadocParameterInfo anchor) { @@ -125,8 +122,7 @@ public class JavadocHelper { * @return pair like (javadoc info for the line identified by the given offset; list of javadoc parameter infos for * adjacent lines if any */ - @NotNull - public Pair> parse(@NotNull PsiFile psiFile, @NotNull Editor editor, int offset) { + public @NotNull Pair> parse(@NotNull PsiFile psiFile, @NotNull Editor editor, int offset) { List result = new ArrayList<>(); PsiDocumentManager.getInstance(psiFile.getProject()).commitDocument(editor.getDocument()); final PsiElement elementAtCaret = psiFile.findElementAt(offset); @@ -181,8 +177,7 @@ public class JavadocHelper { return Pair.create(anchorInfo, result); } - @Nullable - private static JavadocParameterInfo parse(@NotNull PsiElement element, @NotNull Editor editor) { + private static @Nullable JavadocParameterInfo parse(@NotNull PsiElement element, @NotNull Editor editor) { final PsiDocTag tag = PsiTreeUtil.getParentOfType(element, PsiDocTag.class, false); if (tag == null || !PARAM_TEXT.equals(tag.getName())) { return null; @@ -232,8 +227,8 @@ public class JavadocHelper { * */ * */ - @NotNull public final LogicalPosition parameterNameEndPosition; - @Nullable public final LogicalPosition parameterDescriptionStartPosition; + public final @NotNull LogicalPosition parameterNameEndPosition; + public final @Nullable LogicalPosition parameterDescriptionStartPosition; /** Last logical line occupied by the current javadoc parameter. */ public final int lastLine; diff --git a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java index 2dbaaa256417..6c859838eff0 100644 --- a/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java +++ b/java/java-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/providers/JavaClassReference.java @@ -51,8 +51,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer private static final Logger LOG = Logger.getInstance(JavaClassReference.class); protected final int myIndex; private TextRange myRange; - @NotNull - private final String myText; + private final @NotNull String myText; private final boolean myInStaticImport; private final JavaClassReferenceSet myJavaClassReferenceSet; @@ -67,8 +66,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer } @Override - @Nullable - public PsiElement getContext() { + public @Nullable PsiElement getContext() { PsiReference contextRef = getContextReference(); assert contextRef != this : getCanonicalText(); return contextRef != null ? contextRef.resolve() : null; @@ -131,8 +129,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer } @Override - @Nullable - public PsiReference getContextReference() { + public @Nullable PsiReference getContextReference() { return myIndex > 0 ? myJavaClassReferenceSet.getReference(myIndex - 1) : null; } @@ -140,9 +137,8 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return myJavaClassReferenceSet.canReferencePackage(myIndex); } - @NotNull @Override - public PsiElement getElement() { + public @NotNull PsiElement getElement() { return myJavaClassReferenceSet.getElement(); } @@ -151,15 +147,13 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return (element instanceof PsiMember || element instanceof PsiPackage) && super.isReferenceTo(element); } - @NotNull @Override - public TextRange getRangeInElement() { + public @NotNull TextRange getRangeInElement() { return myRange; } @Override - @NotNull - public String getCanonicalText() { + public @NotNull String getCanonicalText() { return myText; } @@ -249,8 +243,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return result; } - @Nullable - public PsiElement getCompletionContext() { + public @Nullable PsiElement getCompletionContext() { PsiReference contextRef = getContextReference(); if (contextRef == null) { return JavaPsiFacade.getInstance(getElement().getProject()).findPackage(""); @@ -258,14 +251,12 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return contextRef.resolve(); } - @NotNull - public List getSuperClasses() { + public @NotNull List getSuperClasses() { List values = JavaClassReferenceProvider.SUPER_CLASSES.getValue(getOptions()); return values == null ? Collections.emptyList() : values; } - @NotNull - private List processPackage(@NotNull PsiPackage aPackage) { + private @NotNull List processPackage(@NotNull PsiPackage aPackage) { ArrayList list = new ArrayList<>(); int startOffset = StringUtil.isEmpty(aPackage.getName()) ? 0 : aPackage.getQualifiedName().length() + 1; GlobalSearchScope scope = getScope(getJavaContextFile()); @@ -299,8 +290,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return list; } - @Nullable - public ClassKind getClassKind() { + public @Nullable ClassKind getClassKind() { return JavaClassReferenceProvider.CLASS_KIND.getValue(getOptions()); } @@ -340,8 +330,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer } @Override - @NotNull - public JavaResolveResult advancedResolve(boolean incompleteCode) { + public @NotNull JavaResolveResult advancedResolve(boolean incompleteCode) { PsiFile file = getJavaContextFile(); ResolveCache resolveCache = ResolveCache.getInstance(file.getProject()); return (JavaResolveResult) resolveCache.resolveWithCaching(this, MyResolver.INSTANCE, false, false,file)[0]; @@ -351,8 +340,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return myJavaClassReferenceSet.getProvider().getContextFile(getElement()); } - @NotNull - private JavaResolveResult doAdvancedResolve(@NotNull PsiFile containingFile) { + private @NotNull JavaResolveResult doAdvancedResolve(@NotNull PsiFile containingFile) { PsiElement psiElement = getElement(); if (!psiElement.isValid()) return JavaResolveResult.EMPTY; @@ -456,8 +444,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer : JavaResolveResult.EMPTY; } - @NotNull - private GlobalSearchScope getScope(@NotNull PsiFile containingFile) { + private @NotNull GlobalSearchScope getScope(@NotNull PsiFile containingFile) { Project project = containingFile.getProject(); GlobalSearchScope scope = myJavaClassReferenceSet.getProvider().getScope(project); if (scope == null) { @@ -467,8 +454,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return scope; } - @Nullable - private Map getOptions() { + private @Nullable Map getOptions() { return myJavaClassReferenceSet.getOptions(); } @@ -479,8 +465,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return new JavaResolveResult[]{javaResolveResult}; } - @NotNull - private List registerFixes() { + private @NotNull List registerFixes() { List list = QuickFixFactory.getInstance().registerOrderEntryFixes(this, new ArrayList<>()); String extendClass = ContainerUtil.getFirstItem(getSuperClasses()); @@ -545,8 +530,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer } } - @NotNull - private LookupElementBuilder createSubclassLookupValue(@NotNull PsiClass clazz) { + private @NotNull LookupElementBuilder createSubclassLookupValue(@NotNull PsiClass clazz) { return JavaLookupElementBuilder.forClass(clazz, getQualifiedClassNameToInsert(clazz), true) .withPresentableText(Objects.requireNonNull(clazz.getName())); } @@ -557,8 +541,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return list.toArray(LocalQuickFix.EMPTY_ARRAY); } - @Nullable - public static PsiElement resolveMember(@NotNull String fqn, @NotNull PsiManager manager, GlobalSearchScope resolveScope) { + public static @Nullable PsiElement resolveMember(@NotNull String fqn, @NotNull PsiManager manager, GlobalSearchScope resolveScope) { PsiClass aClass = JavaPsiFacade.getInstance(manager.getProject()).findClass(fqn, resolveScope); if (aClass != null) return aClass; int i = fqn.lastIndexOf('.'); @@ -570,8 +553,7 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return doResolveMember(aClass, memberName); } - @Nullable - private static PsiElement doResolveMember(@NotNull PsiClass aClass, @NotNull String memberName) { + private static @Nullable PsiElement doResolveMember(@NotNull PsiClass aClass, @NotNull String memberName) { PsiMember member = aClass.findFieldByName(memberName, true); if (member != null) return member; @@ -579,18 +561,16 @@ public class JavaClassReference extends GenericReference implements PsiJavaRefer return methods.length == 0 ? null : methods[0]; } - @NotNull - public JavaClassReferenceSet getJavaClassReferenceSet() { + public @NotNull JavaClassReferenceSet getJavaClassReferenceSet() { return myJavaClassReferenceSet; } - @NotNull @Override - public String getUnresolvedMessagePattern() { + public @NotNull String getUnresolvedMessagePattern() { return myJavaClassReferenceSet.getUnresolvedMessagePattern(myIndex); } - private static class MyResolver implements ResolveCache.PolyVariantContextResolver { + private static final class MyResolver implements ResolveCache.PolyVariantContextResolver { private static final MyResolver INSTANCE = new MyResolver(); @Override diff --git a/java/java-impl/src/com/intellij/refactoring/RefactorJBundle.java b/java/java-impl/src/com/intellij/refactoring/RefactorJBundle.java index 9f51a980e56c..7bd619b239f3 100644 --- a/java/java-impl/src/com/intellij/refactoring/RefactorJBundle.java +++ b/java/java-impl/src/com/intellij/refactoring/RefactorJBundle.java @@ -9,11 +9,12 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class RefactorJBundle extends DynamicBundle { +public final class RefactorJBundle { @NonNls private static final String BUNDLE = "messages.RefactorJBundle"; - private static final RefactorJBundle INSTANCE = new RefactorJBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(RefactorJBundle.class, BUNDLE); - private RefactorJBundle() { super(BUNDLE); } + private RefactorJBundle() { + } @NotNull public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { diff --git a/java/java-indexing-api/src/com/intellij/java/indexing/JavaIndexingBundle.java b/java/java-indexing-api/src/com/intellij/java/indexing/JavaIndexingBundle.java index 8e3b337cbc48..86c314f44995 100644 --- a/java/java-indexing-api/src/com/intellij/java/indexing/JavaIndexingBundle.java +++ b/java/java-indexing-api/src/com/intellij/java/indexing/JavaIndexingBundle.java @@ -9,12 +9,11 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaIndexingBundle extends DynamicBundle { +public final class JavaIndexingBundle { @NonNls private static final String BUNDLE = "messages.JavaIndexingBundle"; - private static final JavaIndexingBundle INSTANCE = new JavaIndexingBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaIndexingBundle.class, BUNDLE); private JavaIndexingBundle() { - super(BUNDLE); } @NotNull diff --git a/java/java-psi-api/src/com/intellij/core/JavaPsiBundle.java b/java/java-psi-api/src/com/intellij/core/JavaPsiBundle.java index 93c426ad8d8e..2a80c1fdc2d7 100644 --- a/java/java-psi-api/src/com/intellij/core/JavaPsiBundle.java +++ b/java/java-psi-api/src/com/intellij/core/JavaPsiBundle.java @@ -11,19 +11,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaPsiBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.JavaPsiBundle"; - public static final JavaPsiBundle INSTANCE = new JavaPsiBundle(); +public final class JavaPsiBundle { + public static final @NonNls String BUNDLE = "messages.JavaPsiBundle"; + public static final DynamicBundle INSTANCE = new DynamicBundle(JavaPsiBundle.class, BUNDLE); - private JavaPsiBundle() { super(BUNDLE); } + private JavaPsiBundle() { } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } @@ -35,10 +33,10 @@ public final class JavaPsiBundle extends DynamicBundle { * @param modifier modifier string constant * @return modifier to display to the user. * Note that it's not localized in the usual sense: modifiers returned from this method are kept in English, - * regardless of the active language pack. It's believed that this way it's more clear. + * regardless of the active language pack. + * It's believed that this way it's clearer. */ - @NotNull - public static @NlsSafe String visibilityPresentation(@NotNull @PsiModifier.ModifierConstant String modifier) { + public static @NotNull @NlsSafe String visibilityPresentation(@NotNull @PsiModifier.ModifierConstant String modifier) { return modifier.equals(PsiModifier.PACKAGE_LOCAL) ? "package-private" : modifier; } } \ No newline at end of file diff --git a/java/java-psi-api/src/com/intellij/psi/EmptySubstitutor.java b/java/java-psi-api/src/com/intellij/psi/EmptySubstitutor.java index f690333487f8..f5cc0e8d8ba6 100644 --- a/java/java-psi-api/src/com/intellij/psi/EmptySubstitutor.java +++ b/java/java-psi-api/src/com/intellij/psi/EmptySubstitutor.java @@ -46,37 +46,32 @@ public final class EmptySubstitutor implements PsiSubstitutor { return JavaPsiFacade.getElementFactory(typeParameter.getProject()).createType(typeParameter); } - @NotNull @Override - public PsiSubstitutor put(@NotNull PsiTypeParameter classParameter, PsiType mapping){ + public @NotNull PsiSubstitutor put(@NotNull PsiTypeParameter classParameter, PsiType mapping){ if (mapping != null) { PsiUtil.ensureValidType(mapping); } return PsiSubstitutorFactory.getInstance().createSubstitutor(classParameter, mapping); } - @NotNull @Override - public PsiSubstitutor putAll(@NotNull PsiClass parentClass, PsiType[] mappings){ + public @NotNull PsiSubstitutor putAll(@NotNull PsiClass parentClass, PsiType[] mappings){ if(!parentClass.hasTypeParameters()) return this; return PsiSubstitutorFactory.getInstance().createSubstitutor(parentClass, mappings); } - @NotNull @Override - public PsiSubstitutor putAll(@NotNull PsiSubstitutor another) { + public @NotNull PsiSubstitutor putAll(@NotNull PsiSubstitutor another) { return another; } - @NotNull @Override - public PsiSubstitutor putAll(@NotNull Map map) { + public @NotNull PsiSubstitutor putAll(@NotNull Map map) { return map.isEmpty() ? EMPTY : PsiSubstitutorFactory.getInstance().createSubstitutor(map); } @Override - @NotNull - public Map getSubstitutionMap() { + public @NotNull Map getSubstitutionMap() { return Collections.emptyMap(); } @@ -93,7 +88,7 @@ public final class EmptySubstitutor implements PsiSubstitutor { return "EmptySubstitutor"; } - private static class Holder { + private static final class Holder { private static final EmptySubstitutor INSTANCE = new EmptySubstitutor(); } } diff --git a/java/java-psi-api/src/com/intellij/psi/JVMElementFactories.java b/java/java-psi-api/src/com/intellij/psi/JVMElementFactories.java index 0baeaa29e175..387b25d11015 100644 --- a/java/java-psi-api/src/com/intellij/psi/JVMElementFactories.java +++ b/java/java-psi-api/src/com/intellij/psi/JVMElementFactories.java @@ -17,14 +17,12 @@ public final class JVMElementFactories extends LanguageExtension implements Ps return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon); } - private static class OurConstValueComputer implements JavaResolveCache.ConstValueComputer { + private static final class OurConstValueComputer implements JavaResolveCache.ConstValueComputer { private static final OurConstValueComputer INSTANCE = new OurConstValueComputer(); @Override diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java index 3fb79b629666..9794ef5e5068 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/source/PsiImportStaticReferenceElementImpl.java @@ -33,7 +33,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.util.IncorrectOperationException; import org.jetbrains.annotations.NotNull; -public class PsiImportStaticReferenceElementImpl extends CompositePsiElement implements PsiImportStaticReferenceElement { +public final class PsiImportStaticReferenceElementImpl extends CompositePsiElement implements PsiImportStaticReferenceElement { private static final Logger LOG = Logger.getInstance(PsiImportStaticReferenceElementImpl.class); private volatile String myCanonicalText; @@ -166,15 +166,13 @@ public class PsiImportStaticReferenceElementImpl extends CompositePsiElement imp return childByRole.getText(); } - @NotNull @Override - public PsiElement getElement() { + public @NotNull PsiElement getElement() { return this; } - @NotNull @Override - public TextRange getRangeInElement() { + public @NotNull TextRange getRangeInElement() { TreeElement nameChild = (TreeElement)findChildByRole(ChildRole.REFERENCE_NAME); if (nameChild == null) return new TextRange(0, getTextLength()); int startOffset = nameChild.getStartOffsetInParent(); @@ -182,8 +180,7 @@ public class PsiImportStaticReferenceElementImpl extends CompositePsiElement imp } @Override - @NotNull - public String getCanonicalText() { + public @NotNull String getCanonicalText() { String canonicalText = myCanonicalText; if (canonicalText == null) { myCanonicalText = canonicalText = calcCanonicalText(); @@ -207,8 +204,7 @@ public class PsiImportStaticReferenceElementImpl extends CompositePsiElement imp } @Override - @NotNull - public JavaResolveResult advancedResolve(boolean incompleteCode) { + public @NotNull JavaResolveResult advancedResolve(boolean incompleteCode) { JavaResolveResult[] results = multiResolve(incompleteCode); if (results.length == 1) return results[0]; return JavaResolveResult.EMPTY; diff --git a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaStructureViewBundle.java b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaStructureViewBundle.java index a203edc99dcf..25d1f040a5f5 100644 --- a/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaStructureViewBundle.java +++ b/java/java-structure-view/src/com/intellij/ide/structureView/impl/java/JavaStructureViewBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaStructureViewBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.JavaStructureViewBundle"; - private static final JavaStructureViewBundle INSTANCE = new JavaStructureViewBundle(); +public final class JavaStructureViewBundle { + private static final @NonNls String BUNDLE = "messages.JavaStructureViewBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaStructureViewBundle.class, BUNDLE); private JavaStructureViewBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/java/manifest/src/org/jetbrains/lang/manifest/ManifestBundle.java b/java/manifest/src/org/jetbrains/lang/manifest/ManifestBundle.java index fdd9eb7d36f4..67ed9036825a 100644 --- a/java/manifest/src/org/jetbrains/lang/manifest/ManifestBundle.java +++ b/java/manifest/src/org/jetbrains/lang/manifest/ManifestBundle.java @@ -6,16 +6,14 @@ import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; -public final class ManifestBundle extends DynamicBundle { - - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = PATH_TO_BUNDLE) String key, Object @NotNull ... params) { - return BUNDLE.getMessage(key, params); - } - - public static final String PATH_TO_BUNDLE = "messages.ManifestBundle"; - private static final ManifestBundle BUNDLE = new ManifestBundle(); +public final class ManifestBundle { + private static final String BUNDLE = "messages.ManifestBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(ManifestBundle.class, BUNDLE); private ManifestBundle() { - super(PATH_TO_BUNDLE); + } + + public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + return INSTANCE.getMessage(key, params); } } diff --git a/java/openapi/src/com/intellij/java/JavaBundle.java b/java/openapi/src/com/intellij/java/JavaBundle.java index 24e9d8ddfe1c..a02937f8e929 100644 --- a/java/openapi/src/com/intellij/java/JavaBundle.java +++ b/java/openapi/src/com/intellij/java/JavaBundle.java @@ -9,16 +9,14 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.JavaBundle"; - private static final JavaBundle INSTANCE = new JavaBundle(); +public final class JavaBundle { + public static final @NonNls String BUNDLE = "messages.JavaBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaBundle.class, BUNDLE); private JavaBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } @@ -28,8 +26,7 @@ public final class JavaBundle extends DynamicBundle { return INSTANCE.getPartialMessage(key, unassignedParams, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/java/openapi/src/com/intellij/java/refactoring/JavaRefactoringBundle.java b/java/openapi/src/com/intellij/java/refactoring/JavaRefactoringBundle.java index 11dc3133c69c..30066eca2c89 100644 --- a/java/openapi/src/com/intellij/java/refactoring/JavaRefactoringBundle.java +++ b/java/openapi/src/com/intellij/java/refactoring/JavaRefactoringBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaRefactoringBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.JavaRefactoringBundle"; - private static final JavaRefactoringBundle INSTANCE = new JavaRefactoringBundle(); +public final class JavaRefactoringBundle { + private static final @NonNls String BUNDLE = "messages.JavaRefactoringBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaRefactoringBundle.class, BUNDLE); private JavaRefactoringBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationBundle.java b/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationBundle.java index 08ff04509aff..1af4a502c5e1 100644 --- a/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationBundle.java +++ b/java/typeMigration/src/com/intellij/refactoring/typeMigration/TypeMigrationBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class TypeMigrationBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.TypeMigrationBundle"; - private static final TypeMigrationBundle INSTANCE = new TypeMigrationBundle(); +public final class TypeMigrationBundle { + private static final @NonNls String BUNDLE = "messages.TypeMigrationBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(TypeMigrationBundle.class, BUNDLE); private TypeMigrationBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/jps/jps-builders/src/org/jetbrains/jps/builders/JpsBuildBundle.java b/jps/jps-builders/src/org/jetbrains/jps/builders/JpsBuildBundle.java index c33c62a34a7c..883b31a1001a 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/builders/JpsBuildBundle.java +++ b/jps/jps-builders/src/org/jetbrains/jps/builders/JpsBuildBundle.java @@ -9,21 +9,19 @@ import org.jetbrains.jps.api.JpsDynamicBundle; import java.util.function.Supplier; -public class JpsBuildBundle extends JpsDynamicBundle { - @NonNls private static final String BUNDLE = "messages.JpsBuildBundle"; - private static final JpsBuildBundle INSTANCE = new JpsBuildBundle(); +public final class JpsBuildBundle extends JpsDynamicBundle { + private static final @NonNls String BUNDLE = "messages.JpsBuildBundle"; + private static final JpsDynamicBundle INSTANCE = new JpsDynamicBundle(JpsBuildBundle.class, BUNDLE); private JpsBuildBundle() { super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/json/src/com/intellij/json/JsonBundle.java b/json/src/com/intellij/json/JsonBundle.java index a94223ea5ba2..6afb06a40bad 100644 --- a/json/src/com/intellij/json/JsonBundle.java +++ b/json/src/com/intellij/json/JsonBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JsonBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.JsonBundle"; - private static final JsonBundle INSTANCE = new JsonBundle(); +public final class JsonBundle { + public static final @NonNls String BUNDLE = "messages.JsonBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JsonBundle.class, BUNDLE); private JsonBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/json/src/com/intellij/json/codeinsight/JsonCompletionContributor.java b/json/src/com/intellij/json/codeinsight/JsonCompletionContributor.java index 4d05bf5102f0..44a0ddb171a7 100644 --- a/json/src/com/intellij/json/codeinsight/JsonCompletionContributor.java +++ b/json/src/com/intellij/json/codeinsight/JsonCompletionContributor.java @@ -31,7 +31,6 @@ import static com.intellij.patterns.PlatformPatterns.psiElement; * @author Mikhail Golubev */ public class JsonCompletionContributor extends CompletionContributor { - private static final PsiElementPattern.Capture AFTER_COLON_IN_PROPERTY = psiElement() .afterLeaf(":").withSuperParent(2, JsonProperty.class) .andNot(psiElement().withParent(JsonStringLiteral.class)); @@ -45,7 +44,7 @@ public class JsonCompletionContributor extends CompletionContributor { extend(CompletionType.BASIC, AFTER_COMMA_OR_BRACKET_IN_ARRAY, MyKeywordsCompletionProvider.INSTANCE); } - private static class MyKeywordsCompletionProvider extends CompletionProvider { + private static final class MyKeywordsCompletionProvider extends CompletionProvider { private static final MyKeywordsCompletionProvider INSTANCE = new MyKeywordsCompletionProvider(); private static final String[] KEYWORDS = new String[]{"null", "true", "false"}; diff --git a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaBaseReference.java b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaBaseReference.java index 54278be4c0c2..85d58c8b3332 100644 --- a/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaBaseReference.java +++ b/json/src/com/jetbrains/jsonSchema/impl/JsonSchemaBaseReference.java @@ -14,14 +14,12 @@ public abstract class JsonSchemaBaseReference extends PsiR super(element, textRange, true); } - @Nullable @Override - public PsiElement resolve() { + public @Nullable PsiElement resolve() { return ResolveCache.getInstance(getElement().getProject()).resolveWithCaching(this, MyResolver.INSTANCE, false, false); } - @Nullable - public abstract PsiElement resolveInner(); + public abstract @Nullable PsiElement resolveInner(); @Override @@ -43,12 +41,11 @@ public abstract class JsonSchemaBaseReference extends PsiR return myElement.hashCode(); } - private static class MyResolver implements ResolveCache.Resolver { + private static final class MyResolver implements ResolveCache.Resolver { private static final MyResolver INSTANCE = new MyResolver(); @Override - @Nullable - public PsiElement resolve(@NotNull PsiReference ref, boolean incompleteCode) { + public @Nullable PsiElement resolve(@NotNull PsiReference ref, boolean incompleteCode) { return ((JsonSchemaBaseReference)ref).resolveInner(); } } diff --git a/platform/analysis-api/src/com/intellij/analysis/AnalysisBundle.java b/platform/analysis-api/src/com/intellij/analysis/AnalysisBundle.java index ef8e2d4b19a9..5af6baca6d1f 100644 --- a/platform/analysis-api/src/com/intellij/analysis/AnalysisBundle.java +++ b/platform/analysis-api/src/com/intellij/analysis/AnalysisBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class AnalysisBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.AnalysisBundle"; - private static final AnalysisBundle INSTANCE = new AnalysisBundle(); +public final class AnalysisBundle { + public static final @NonNls String BUNDLE = "messages.AnalysisBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(AnalysisBundle.class, BUNDLE); private AnalysisBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/analysis-api/src/com/intellij/codeInspection/CommonQuickFixBundle.java b/platform/analysis-api/src/com/intellij/codeInspection/CommonQuickFixBundle.java index 277d971a3408..cfe6894fb40d 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/CommonQuickFixBundle.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/CommonQuickFixBundle.java @@ -10,19 +10,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class CommonQuickFixBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.CommonQuickFixBundle"; - private static final CommonQuickFixBundle INSTANCE = new CommonQuickFixBundle(); +public final class CommonQuickFixBundle { + public static final @NonNls String BUNDLE = "messages.CommonQuickFixBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(CommonQuickFixBundle.class, BUNDLE); - private CommonQuickFixBundle() { super(BUNDLE); } + private CommonQuickFixBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, @NlsSafe Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, @NlsSafe Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/platform/analysis-api/src/com/intellij/codeInspection/InspectionsBundle.java b/platform/analysis-api/src/com/intellij/codeInspection/InspectionsBundle.java index 26f2df62bb90..8ad7a7f6cfe7 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/InspectionsBundle.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/InspectionsBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class InspectionsBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.InspectionsBundle"; - private static final InspectionsBundle INSTANCE = new InspectionsBundle(); +public final class InspectionsBundle { + public static final @NonNls String BUNDLE = "messages.InspectionsBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(InspectionsBundle.class, BUNDLE); - private InspectionsBundle() { super(BUNDLE); } + private InspectionsBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.containsKey(key) ? INSTANCE.getMessage(key, params) : InspectionsDeprecatedMessagesBundle.message(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.containsKey(key) ? INSTANCE.getLazyMessage(key, params) : InspectionsDeprecatedMessagesBundle.messagePointer(key, params); } } \ No newline at end of file diff --git a/platform/analysis-api/src/com/intellij/codeInspection/InspectionsDeprecatedMessagesBundle.java b/platform/analysis-api/src/com/intellij/codeInspection/InspectionsDeprecatedMessagesBundle.java index e1e75a92fcb4..c039926e52e4 100644 --- a/platform/analysis-api/src/com/intellij/codeInspection/InspectionsDeprecatedMessagesBundle.java +++ b/platform/analysis-api/src/com/intellij/codeInspection/InspectionsDeprecatedMessagesBundle.java @@ -9,22 +9,20 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public class InspectionsDeprecatedMessagesBundle extends AbstractBundle { - @NonNls private static final String BUNDLE = "messages.InspectionsDeprecatedMessagesBundle"; +public final class InspectionsDeprecatedMessagesBundle extends AbstractBundle { + private static final @NonNls String BUNDLE = "messages.InspectionsDeprecatedMessagesBundle"; private static final InspectionsDeprecatedMessagesBundle INSTANCE = new InspectionsDeprecatedMessagesBundle(); private InspectionsDeprecatedMessagesBundle() { super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/analysis-impl/src/com/intellij/find/FindBundle.java b/platform/analysis-impl/src/com/intellij/find/FindBundle.java index 850b55ed3190..ad43860946b2 100644 --- a/platform/analysis-impl/src/com/intellij/find/FindBundle.java +++ b/platform/analysis-impl/src/com/intellij/find/FindBundle.java @@ -9,13 +9,12 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class FindBundle extends DynamicBundle { +public final class FindBundle { public static final String BUNDLE = "messages.FindBundle"; - private static final FindBundle INSTANCE = new FindBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(FindBundle.class, BUNDLE); private FindBundle() { - super(BUNDLE); } public static @Nls @NotNull String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { diff --git a/platform/built-in-server-api/src/org/jetbrains/ide/BuiltInServerBundle.java b/platform/built-in-server-api/src/org/jetbrains/ide/BuiltInServerBundle.java index 885676380444..99d5d82312d3 100644 --- a/platform/built-in-server-api/src/org/jetbrains/ide/BuiltInServerBundle.java +++ b/platform/built-in-server-api/src/org/jetbrains/ide/BuiltInServerBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class BuiltInServerBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.BuiltInServerBundle"; - private static final BuiltInServerBundle INSTANCE = new BuiltInServerBundle(); +public final class BuiltInServerBundle { + private static final @NonNls String BUNDLE = "messages.BuiltInServerBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(BuiltInServerBundle.class, BUNDLE); private BuiltInServerBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/code-style-api/src/com/intellij/CodeStyleBundle.java b/platform/code-style-api/src/com/intellij/CodeStyleBundle.java index 2979ea355c85..d4f380b3e1eb 100644 --- a/platform/code-style-api/src/com/intellij/CodeStyleBundle.java +++ b/platform/code-style-api/src/com/intellij/CodeStyleBundle.java @@ -8,21 +8,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public class CodeStyleBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.CodeStyleBundle"; - private static final CodeStyleBundle INSTANCE = new CodeStyleBundle(); +public final class CodeStyleBundle { + public static final @NonNls String BUNDLE = "messages.CodeStyleBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(CodeStyleBundle.class, BUNDLE); private CodeStyleBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/collaboration-tools/src/com/intellij/collaboration/messages/CollaborationToolsBundle.java b/platform/collaboration-tools/src/com/intellij/collaboration/messages/CollaborationToolsBundle.java index a736c039f3dd..84ba32fc5938 100644 --- a/platform/collaboration-tools/src/com/intellij/collaboration/messages/CollaborationToolsBundle.java +++ b/platform/collaboration-tools/src/com/intellij/collaboration/messages/CollaborationToolsBundle.java @@ -9,22 +9,19 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public class CollaborationToolsBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.CollaborationToolsBundle"; - private static final CollaborationToolsBundle INSTANCE = new CollaborationToolsBundle(); +public final class CollaborationToolsBundle { + private static final @NonNls String BUNDLE = "messages.CollaborationToolsBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(CollaborationToolsBundle.class, BUNDLE); private CollaborationToolsBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/configuration-store-impl/src/ConfigurationStoreBundle.java b/platform/configuration-store-impl/src/ConfigurationStoreBundle.java index 273669ea0087..5112a962d41a 100644 --- a/platform/configuration-store-impl/src/ConfigurationStoreBundle.java +++ b/platform/configuration-store-impl/src/ConfigurationStoreBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class ConfigurationStoreBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.ConfigurationStoreBundle"; - private static final ConfigurationStoreBundle INSTANCE = new ConfigurationStoreBundle(); +public final class ConfigurationStoreBundle { + private static final @NonNls String BUNDLE = "messages.ConfigurationStoreBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(ConfigurationStoreBundle.class, BUNDLE); private ConfigurationStoreBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/CachingReference.java b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/CachingReference.java index 6364baef3898..2df07c80a042 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/CachingReference.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/CachingReference.java @@ -30,8 +30,7 @@ public abstract class CachingReference implements PsiReference { return ResolveCache.getInstance(getElement().getProject()).resolveWithCaching(this, MyResolver.INSTANCE, false, false); } - @Nullable - public abstract PsiElement resolveInner(); + public abstract @Nullable PsiElement resolveInner(); @Override public boolean isReferenceTo(@NotNull PsiElement element) { @@ -43,8 +42,7 @@ public abstract class CachingReference implements PsiReference { return false; } - @NotNull - public static ElementManipulator getManipulator(T currentElement){ + public static @NotNull ElementManipulator getManipulator(T currentElement){ ElementManipulator manipulator = ElementManipulators.getManipulator(currentElement); if (manipulator == null) { throw new IncorrectOperationException("Manipulator for this element is not defined: " + currentElement + "; " + currentElement.getClass()); @@ -52,11 +50,10 @@ public abstract class CachingReference implements PsiReference { return manipulator; } - private static class MyResolver implements ResolveCache.Resolver { + private static final class MyResolver implements ResolveCache.Resolver { private static final MyResolver INSTANCE = new MyResolver(); @Override - @Nullable - public PsiElement resolve(@NotNull PsiReference ref, boolean incompleteCode) { + public @Nullable PsiElement resolve(@NotNull PsiReference ref, boolean incompleteCode) { return ((CachingReference)ref).resolveInner(); } } diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiPolyVariantCachingReference.java b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiPolyVariantCachingReference.java index d59c587631a0..c44711862f5a 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiPolyVariantCachingReference.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/resolve/reference/impl/PsiPolyVariantCachingReference.java @@ -34,7 +34,7 @@ public abstract class PsiPolyVariantCachingReference implements PsiPolyVariantRe return false; } - private static class MyResolver implements ResolveCache.PolyVariantContextResolver { + private static final class MyResolver implements ResolveCache.PolyVariantContextResolver { private static final MyResolver INSTANCE = new MyResolver(); @Override diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/tree/RecursiveTreeElementWalkingVisitor.java b/platform/core-impl/src/com/intellij/psi/impl/source/tree/RecursiveTreeElementWalkingVisitor.java index 73085873db1b..d517056b7c6a 100644 --- a/platform/core-impl/src/com/intellij/psi/impl/source/tree/RecursiveTreeElementWalkingVisitor.java +++ b/platform/core-impl/src/com/intellij/psi/impl/source/tree/RecursiveTreeElementWalkingVisitor.java @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.intellij.psi.impl.source.tree; import com.intellij.lang.ASTNode; diff --git a/platform/diff-api/src/com/intellij/openapi/diff/DiffBundle.java b/platform/diff-api/src/com/intellij/openapi/diff/DiffBundle.java index 5e4570847c90..91e1f536cfe7 100644 --- a/platform/diff-api/src/com/intellij/openapi/diff/DiffBundle.java +++ b/platform/diff-api/src/com/intellij/openapi/diff/DiffBundle.java @@ -9,20 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class DiffBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.DiffBundle"; +public final class DiffBundle { + public static final @NonNls String BUNDLE = "messages.DiffBundle"; - private static final DiffBundle INSTANCE = new DiffBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(DiffBundle.class, BUNDLE); - private DiffBundle() { super(BUNDLE); } + private DiffBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java index 10a73822f135..4e97adfdada0 100644 --- a/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java +++ b/platform/diff-impl/src/com/intellij/diff/impl/DiffRequestProcessor.java @@ -81,39 +81,39 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { private boolean myDisposed; - @Nullable private final Project myProject; - @NotNull private final DiffContext myContext; + private final @Nullable Project myProject; + private final @NotNull DiffContext myContext; - @NotNull private final DiffSettings mySettings; - @NotNull private final List myAvailableTools = new ArrayList<>(); - @NotNull private final List myToolOrder = new ArrayList<>(); - @Nullable private final DiffTool myForcedDiffTool; + private final @NotNull DiffSettings mySettings; + private final @NotNull List myAvailableTools = new ArrayList<>(); + private final @NotNull List myToolOrder = new ArrayList<>(); + private final @Nullable DiffTool myForcedDiffTool; - @NotNull private final DefaultActionGroup myToolbarGroup; - @NotNull private final DefaultActionGroup myRightToolbarGroup; - @NotNull private final DefaultActionGroup myPopupActionGroup; - @NotNull private final DefaultActionGroup myTouchbarActionGroup; + private final @NotNull DefaultActionGroup myToolbarGroup; + private final @NotNull DefaultActionGroup myRightToolbarGroup; + private final @NotNull DefaultActionGroup myPopupActionGroup; + private final @NotNull DefaultActionGroup myTouchbarActionGroup; - @NotNull private final JPanel myPanel; - @NotNull private final MyPanel myMainPanel; - @NotNull private final Wrapper myContentPanel; - @NotNull private final JPanel myTopPanel; - @NotNull private final ActionToolbar myToolbar; - @NotNull private final ActionToolbar myRightToolbar; - @NotNull protected final Wrapper myToolbarWrapper; - @NotNull protected final Wrapper myDiffInfoWrapper; - @NotNull protected final Wrapper myRightToolbarWrapper; - @NotNull private final Wrapper myToolbarStatusPanel; - @NotNull private final MyProgressBar myProgressBar; + private final @NotNull JPanel myPanel; + private final @NotNull MyPanel myMainPanel; + private final @NotNull Wrapper myContentPanel; + private final @NotNull JPanel myTopPanel; + private final @NotNull ActionToolbar myToolbar; + private final @NotNull ActionToolbar myRightToolbar; + protected final @NotNull Wrapper myToolbarWrapper; + protected final @NotNull Wrapper myDiffInfoWrapper; + protected final @NotNull Wrapper myRightToolbarWrapper; + private final @NotNull Wrapper myToolbarStatusPanel; + private final @NotNull MyProgressBar myProgressBar; - @NotNull private final EventDispatcher myEventDispatcher = + private final @NotNull EventDispatcher myEventDispatcher = EventDispatcher.create(DiffRequestProcessorListener.class); - @NotNull private DiffRequest myActiveRequest; + private @NotNull DiffRequest myActiveRequest; - @NotNull private ViewerState myState; + private @NotNull ViewerState myState; - @Nullable private ScrollToPolicy myCurrentScrollToPolicy; + private @Nullable ScrollToPolicy myCurrentScrollToPolicy; private final boolean myIsNewToolbar; @@ -193,8 +193,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { myContentPanel.setContent(DiffUtil.createMessagePanel(((LoadingDiffRequest)myActiveRequest).getMessage())); } - @NotNull - private BorderLayoutPanel buildTopPanel() { + private @NotNull BorderLayoutPanel buildTopPanel() { BorderLayoutPanel topPanel; if (myIsNewToolbar) { BorderLayoutPanel rightPanel = JBUI.Panels.simplePanel(myRightToolbarWrapper).addToLeft(myProgressBar); @@ -246,8 +245,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { @RequiresEdt public abstract void updateRequest(boolean force, @Nullable ScrollToPolicy scrollToChangePolicy); - @NotNull - private FrameDiffTool getFittedTool(boolean applySubstitutor) { + private @NotNull FrameDiffTool getFittedTool(boolean applySubstitutor) { if (myForcedDiffTool instanceof FrameDiffTool) { return myForcedDiffTool.canShow(myContext, myActiveRequest) ? (FrameDiffTool)myForcedDiffTool @@ -265,13 +263,11 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { return tool; } - @NotNull - private List getAvailableFittedTools() { + private @NotNull List getAvailableFittedTools() { return filterFittedTools(myAvailableTools); } - @NotNull - private List filterFittedTools(@NotNull List tools) { + private @NotNull List filterFittedTools(@NotNull List tools) { List result = new ArrayList<>(); for (DiffTool tool : tools) { try { @@ -325,8 +321,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { updateToolOrderSettings(myToolOrder); } - @NotNull - private ViewerState createState() { + private @NotNull ViewerState createState() { FrameDiffTool frameTool = getFittedTool(true); DiffViewer viewer = frameTool.createComponent(myContext, myActiveRequest); @@ -353,7 +348,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { // Abstract // - @Nullable private ApplyData myQueuedApplyRequest; + private @Nullable ApplyData myQueuedApplyRequest; @RequiresEdt protected void applyRequest(@NotNull DiffRequest request, boolean force, @Nullable ScrollToPolicy scrollToChangePolicy) { @@ -436,8 +431,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { protected void onDispose() { } - @Nullable - public T getContextUserData(@NotNull Key key) { + public @Nullable T getContextUserData(@NotNull Key key) { return myContext.getUserData(key); } @@ -445,8 +439,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { myContext.putUserData(key, value); } - @NotNull - protected List getNavigationActions() { + protected @NotNull List getNavigationActions() { List actions = List.of( new MyPrevDifferenceAction(), new MyNextDifferenceAction(), new MyOpenInEditorAction(), Separator.getInstance(), @@ -486,14 +479,12 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { DiffUtil.requestFocusInWindow(getPreferredFocusedComponent()); } - @NotNull - protected List getToolOrderFromSettings(@NotNull List availableTools) { + protected @NotNull List getToolOrderFromSettings(@NotNull List availableTools) { return getToolOrderFromSettings(getSettings(), availableTools); } - @NotNull - public static List getToolOrderFromSettings(@NotNull DiffSettings diffSettings, - @NotNull List availableTools) { + public static @NotNull List getToolOrderFromSettings(@NotNull DiffSettings diffSettings, + @NotNull List availableTools) { List result = new ArrayList<>(); List savedOrder = diffSettings.getDiffToolsOrder(); @@ -618,8 +609,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { } } - @NotNull - public ActionToolbar getToolbar() { + public @NotNull ActionToolbar getToolbar() { return myToolbar; } @@ -639,13 +629,11 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { // Getters // - @NotNull - public JComponent getComponent() { + public @NotNull JComponent getComponent() { return myPanel; } - @NotNull - public JComponent getPreferredFocusedComponent() { + public @NotNull JComponent getPreferredFocusedComponent() { JComponent component = myState.getPreferredFocusedComponent(); JComponent fallback = myToolbar.getComponent(); if (component == null || !component.isFocusable()) return fallback; @@ -653,23 +641,19 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { return component; } - @Nullable - public Project getProject() { + public @Nullable Project getProject() { return myProject; } - @Nullable - public DiffRequest getActiveRequest() { + public @Nullable DiffRequest getActiveRequest() { return myActiveRequest; } - @NotNull - public DiffContext getContext() { + public @NotNull DiffContext getContext() { return myContext; } - @Nullable - public DiffViewer getActiveViewer() { + public @Nullable DiffViewer getActiveViewer() { if (myState instanceof DefaultState) { return ((DefaultState)myState).myViewer; } @@ -679,8 +663,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { return null; } - @NotNull - protected DiffSettings getSettings() { + protected @NotNull DiffSettings getSettings() { return mySettings; } @@ -694,7 +677,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { // private class ShowInExternalToolAction extends DumbAwareAction { - @NotNull private final ExternalDiffSettings.ExternalTool myExternalTool; + private final @NotNull ExternalDiffSettings.ExternalTool myExternalTool; private ShowInExternalToolAction(ExternalDiffSettings.@NotNull ExternalTool externalTool) { super(DiffBundle.message("action.use.external.tool.text", externalTool.getName())); @@ -755,8 +738,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { return actions.toArray(AnAction.EMPTY_ARRAY); } - @NotNull - private List getShowActions() { + private @NotNull List getShowActions() { Map> externalTools = ExternalDiffSettings.getInstance().getExternalTools(); List diffTools = externalTools.getOrDefault(ExternalToolGroup.DIFF_TOOL, Collections.emptyList()); @@ -777,21 +759,18 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { updateRequest(true); } - @NotNull @Override - public List getTools() { + public @NotNull List getTools() { return new ArrayList<>(getAvailableFittedTools()); } - @NotNull @Override - public DiffTool getActiveTool() { + public @NotNull DiffTool getActiveTool() { return myState.getActiveTool(); } - @Nullable @Override - public DiffTool getForcedDiffTool() { + public @Nullable DiffTool getForcedDiffTool() { return myForcedDiffTool; } } @@ -826,9 +805,8 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { presentation.setEnabledAndVisible(false); } - @NotNull @Override - protected DefaultActionGroup createPopupActionGroup(@NotNull JComponent button, @NotNull DataContext context) { + protected @NotNull DefaultActionGroup createPopupActionGroup(@NotNull JComponent button, @NotNull DataContext context) { DefaultActionGroup group = new DefaultActionGroup(); for (DiffTool tool : getAvailableFittedTools()) { group.add(new DiffToolToggleAction(tool)); @@ -839,7 +817,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { } private final class DiffToolToggleAction extends AnAction implements DumbAware { - @NotNull private final DiffTool myDiffTool; + private final @NotNull DiffTool myDiffTool; private DiffToolToggleAction(@NotNull DiffTool tool) { //noinspection DialogTitleCapitalization @@ -898,7 +876,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { private enum IterationState {NEXT, PREV, NONE} - @NotNull private IterationState myIterationState = IterationState.NONE; + private @NotNull IterationState myIterationState = IterationState.NONE; @RequiresEdt protected boolean hasNextChange(boolean fromUpdate) { @@ -1114,8 +1092,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { } } - @NotNull - private static HintHint createNotifyHint(@NotNull JComponent component, @NotNull Point point, boolean above) { + private static @NotNull HintHint createNotifyHint(@NotNull JComponent component, @NotNull Point point, boolean above) { return new HintHint(component, point) .setPreferredPosition(above ? Balloon.Position.above : Balloon.Position.below) .setAwtTooltip(true) @@ -1218,9 +1195,8 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { return new Dimension(Math.max(windowSize.width, size.width), Math.max(windowSize.height, size.height)); } - @Nullable @Override - public Object getData(@NotNull @NonNls String dataId) { + public @Nullable Object getData(@NotNull @NonNls String dataId) { Object data; DataProvider contentProvider = DataManagerImpl.getDataProviderEx(myContentPanel.getTargetComponent()); @@ -1295,16 +1271,15 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { return IdeFocusTraversalPolicy.getPreferredFocusedComponent(component, this); } - @Nullable @Override - protected Project getProject() { + protected @Nullable Project getProject() { return myProject; } } private class MyDiffContext extends DiffContextEx { - @NotNull private final UserDataHolder myInitialContext; - @NotNull private final UserDataHolder myOwnContext = new UserDataHolderBase(); + private final @NotNull UserDataHolder myInitialContext; + private final @NotNull UserDataHolder myOwnContext = new UserDataHolderBase(); MyDiffContext(@NotNull UserDataHolder initialContext) { myInitialContext = initialContext; @@ -1335,9 +1310,8 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { setTitle(title); } - @Nullable @Override - public Project getProject() { + public @Nullable Project getProject() { return DiffRequestProcessor.this.getProject(); } @@ -1356,9 +1330,8 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { DiffRequestProcessor.this.requestFocusInWindow(); } - @Nullable @Override - public T getUserData(@NotNull Key key) { + public @Nullable T getUserData(@NotNull Key key) { T data = myOwnContext.getUserData(key); if (data != null) return data; return myInitialContext.getUserData(key); @@ -1371,9 +1344,9 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { } private static class ApplyData { - @NotNull private final DiffRequest request; + private final @NotNull DiffRequest request; private final boolean force; - @Nullable private final ScrollToPolicy scrollToChangePolicy; + private final @Nullable ScrollToPolicy scrollToChangePolicy; ApplyData(@NotNull DiffRequest request, boolean force, @Nullable ScrollToPolicy scrollToChangePolicy) { this.request = request; @@ -1412,7 +1385,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { DiffTool getActiveTool(); } - private static class EmptyState implements ViewerState { + private static final class EmptyState implements ViewerState { private static final EmptyState INSTANCE = new EmptyState(); @Override @@ -1423,29 +1396,26 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { public void destroy() { } - @Nullable @Override - public JComponent getPreferredFocusedComponent() { + public @Nullable JComponent getPreferredFocusedComponent() { return null; } - @Nullable @Override - public Object getData(@NotNull @NonNls String dataId) { + public @Nullable Object getData(@NotNull @NonNls String dataId) { return null; } - @NotNull @Override - public DiffTool getActiveTool() { + public @NotNull DiffTool getActiveTool() { return ErrorDiffTool.INSTANCE; } } private class ErrorState implements ViewerState { - @Nullable private final DiffTool myDiffTool; + private final @Nullable DiffTool myDiffTool; - @NotNull private final DiffViewer myViewer; + private final @NotNull DiffViewer myViewer; ErrorState(@NotNull MessageDiffRequest request, @Nullable DiffTool diffTool) { myDiffTool = diffTool; @@ -1472,28 +1442,25 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { } } - @Nullable @Override - public JComponent getPreferredFocusedComponent() { + public @Nullable JComponent getPreferredFocusedComponent() { return null; } - @Nullable @Override - public Object getData(@NotNull @NonNls String dataId) { + public @Nullable Object getData(@NotNull @NonNls String dataId) { return null; } - @NotNull @Override - public DiffTool getActiveTool() { + public @NotNull DiffTool getActiveTool() { return myDiffTool != null ? myDiffTool : ErrorDiffTool.INSTANCE; } } private class DefaultState implements ViewerState { - @NotNull private final DiffViewer myViewer; - @NotNull private final FrameDiffTool myTool; + private final @NotNull DiffViewer myViewer; + private final @NotNull FrameDiffTool myTool; DefaultState(@NotNull DiffViewer viewer, @NotNull FrameDiffTool tool) { myViewer = viewer; @@ -1534,21 +1501,18 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { } } - @Nullable @Override - public JComponent getPreferredFocusedComponent() { + public @Nullable JComponent getPreferredFocusedComponent() { return myViewer.getPreferredFocusedComponent(); } - @NotNull @Override - public DiffTool getActiveTool() { + public @NotNull DiffTool getActiveTool() { return myTool; } - @Nullable @Override - public Object getData(@NotNull @NonNls String dataId) { + public @Nullable Object getData(@NotNull @NonNls String dataId) { if (DiffDataKeys.DIFF_VIEWER.is(dataId)) { return myViewer; } @@ -1557,10 +1521,10 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { } private class WrapperState implements ViewerState { - @NotNull private final DiffViewer myViewer; - @NotNull private final FrameDiffTool myTool; + private final @NotNull DiffViewer myViewer; + private final @NotNull FrameDiffTool myTool; - @NotNull private final DiffViewer myWrapperViewer; + private final @NotNull DiffViewer myWrapperViewer; WrapperState(@NotNull DiffViewer viewer, @NotNull FrameDiffTool tool, @NotNull DiffViewerWrapper wrapper) { myViewer = viewer; @@ -1587,8 +1551,7 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { } } - @Nullable - private static List mergeActions(@Nullable List actions1, @Nullable List actions2) { + private static @Nullable List mergeActions(@Nullable List actions1, @Nullable List actions2) { if (actions1 == null && actions2 == null) return null; if (ContainerUtil.isEmpty(actions1)) return actions2; if (ContainerUtil.isEmpty(actions2)) return actions1; @@ -1618,21 +1581,18 @@ public abstract class DiffRequestProcessor implements CheckedDisposable { } } - @Nullable @Override - public JComponent getPreferredFocusedComponent() { + public @Nullable JComponent getPreferredFocusedComponent() { return myWrapperViewer.getPreferredFocusedComponent(); } - @NotNull @Override - public DiffTool getActiveTool() { + public @NotNull DiffTool getActiveTool() { return myTool; } - @Nullable @Override - public Object getData(@NotNull @NonNls String dataId) { + public @Nullable Object getData(@NotNull @NonNls String dataId) { if (DiffDataKeys.WRAPPING_DIFF_VIEWER.is(dataId)) { return myWrapperViewer; } diff --git a/platform/duplicates-analysis/src/com/intellij/dupLocator/DupLocatorBundle.java b/platform/duplicates-analysis/src/com/intellij/dupLocator/DupLocatorBundle.java index 0058b58d83d7..64711251a17d 100644 --- a/platform/duplicates-analysis/src/com/intellij/dupLocator/DupLocatorBundle.java +++ b/platform/duplicates-analysis/src/com/intellij/dupLocator/DupLocatorBundle.java @@ -8,22 +8,19 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class DupLocatorBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.DupLocatorBundle"; +public final class DupLocatorBundle { + private static final @NonNls String BUNDLE = "messages.DupLocatorBundle"; - private static final DupLocatorBundle INSTANCE = new DupLocatorBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(DupLocatorBundle.class, BUNDLE); private DupLocatorBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/platform/dvcs-api/src/com/intellij/dvcs/ui/DvcsBundle.java b/platform/dvcs-api/src/com/intellij/dvcs/ui/DvcsBundle.java index b9d87b23085d..ab921120c7b7 100644 --- a/platform/dvcs-api/src/com/intellij/dvcs/ui/DvcsBundle.java +++ b/platform/dvcs-api/src/com/intellij/dvcs/ui/DvcsBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class DvcsBundle extends DynamicBundle { - @NonNls static final String BUNDLE = "messages.DvcsBundle"; - private static final DvcsBundle INSTANCE = new DvcsBundle(); +public final class DvcsBundle { + static final @NonNls String BUNDLE = "messages.DvcsBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(DvcsBundle.class, BUNDLE); - private DvcsBundle() { super(BUNDLE); } + private DvcsBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/editor-ui-api/src/com/intellij/openapi/editor/PlatformEditorBundle.java b/platform/editor-ui-api/src/com/intellij/openapi/editor/PlatformEditorBundle.java index 1ef020a39759..1c2f6d62499f 100644 --- a/platform/editor-ui-api/src/com/intellij/openapi/editor/PlatformEditorBundle.java +++ b/platform/editor-ui-api/src/com/intellij/openapi/editor/PlatformEditorBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class PlatformEditorBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.PlatformEditorBundle"; - private static final PlatformEditorBundle INSTANCE = new PlatformEditorBundle(); +public final class PlatformEditorBundle { + public static final @NonNls String BUNDLE = "messages.PlatformEditorBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(PlatformEditorBundle.class, BUNDLE); private PlatformEditorBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/elevation/src/com/intellij/execution/process/elevation/ElevationBundle.java b/platform/elevation/src/com/intellij/execution/process/elevation/ElevationBundle.java index c4991f57cd5a..165ff414e5bb 100644 --- a/platform/elevation/src/com/intellij/execution/process/elevation/ElevationBundle.java +++ b/platform/elevation/src/com/intellij/execution/process/elevation/ElevationBundle.java @@ -9,22 +9,19 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public class ElevationBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.ElevationBundle"; - private static final ElevationBundle INSTANCE = new ElevationBundle(); +public final class ElevationBundle { + private static final @NonNls String BUNDLE = "messages.ElevationBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(ElevationBundle.class, BUNDLE); private ElevationBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/execution/src/com/intellij/execution/configurations/UnknownConfigurationType.java b/platform/execution/src/com/intellij/execution/configurations/UnknownConfigurationType.java index 04616309d4d9..25299d5250f5 100644 --- a/platform/execution/src/com/intellij/execution/configurations/UnknownConfigurationType.java +++ b/platform/execution/src/com/intellij/execution/configurations/UnknownConfigurationType.java @@ -8,8 +8,7 @@ import com.intellij.openapi.util.NotNullLazyValue; import org.jetbrains.annotations.NotNull; public final class UnknownConfigurationType extends SimpleConfigurationType { - @NotNull - private static final UnknownConfigurationType INSTANCE = new UnknownConfigurationType(); + private static final @NotNull UnknownConfigurationType INSTANCE = new UnknownConfigurationType(); private static final String NAME = "Unknown"; @@ -18,21 +17,18 @@ public final class UnknownConfigurationType extends SimpleConfigurationType { NotNullLazyValue.createValue(() -> AllIcons.Actions.Help)); } - @NotNull - public static UnknownConfigurationType getInstance() { + public static @NotNull UnknownConfigurationType getInstance() { return INSTANCE; } - @NotNull @Override - public RunConfiguration createTemplateConfiguration(@NotNull Project project) { + public @NotNull RunConfiguration createTemplateConfiguration(@NotNull Project project) { return new UnknownRunConfiguration(this, project); } - @NotNull @Override - public RunConfigurationSingletonPolicy getSingletonPolicy() { - // in any case you cannot run UnknownConfigurationType + public @NotNull RunConfigurationSingletonPolicy getSingletonPolicy() { + // in any case, you cannot run UnknownConfigurationType return RunConfigurationSingletonPolicy.SINGLE_INSTANCE_ONLY; } diff --git a/platform/external-process-auth-helper/src/externalProcessAuthHelper/ExternalProcessAuthHelperBundle.java b/platform/external-process-auth-helper/src/externalProcessAuthHelper/ExternalProcessAuthHelperBundle.java index bfb4bc8ae9f2..1aac0f93012f 100644 --- a/platform/external-process-auth-helper/src/externalProcessAuthHelper/ExternalProcessAuthHelperBundle.java +++ b/platform/external-process-auth-helper/src/externalProcessAuthHelper/ExternalProcessAuthHelperBundle.java @@ -9,28 +9,25 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class ExternalProcessAuthHelperBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.ExternalProcessAuthHelperBundle"; - private static final ExternalProcessAuthHelperBundle INSTANCE = new ExternalProcessAuthHelperBundle(); +public final class ExternalProcessAuthHelperBundle { + public static final @NonNls String BUNDLE = "messages.ExternalProcessAuthHelperBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(ExternalProcessAuthHelperBundle.class, BUNDLE); - private ExternalProcessAuthHelperBundle() { super(BUNDLE); } + private ExternalProcessAuthHelperBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } /** * @deprecated prefer {@link #message(String, Object...)} instead */ - @NotNull @Deprecated(forRemoval = true) - public static @Nls String getString(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key) { + public static @NotNull @Nls String getString(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key) { return message(key); } } \ No newline at end of file diff --git a/platform/ide-core/src/com/intellij/CommonBundle.java b/platform/ide-core/src/com/intellij/CommonBundle.java index 3b40024d52f8..6359625eb455 100644 --- a/platform/ide-core/src/com/intellij/CommonBundle.java +++ b/platform/ide-core/src/com/intellij/CommonBundle.java @@ -12,16 +12,14 @@ import java.util.ResourceBundle; import java.util.function.Supplier; @SuppressWarnings("MethodOverridesStaticMethodOfSuperclass") -public final class CommonBundle extends DynamicBundle { +public final class CommonBundle { private static final String BUNDLE = "messages.CommonBundle"; - private static final CommonBundle INSTANCE = new CommonBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(CommonBundle.class, BUNDLE); private CommonBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (!INSTANCE.containsKey(key)) { return IdeDeprecatedMessagesBundle.message(key, params); } @@ -51,8 +49,7 @@ public final class CommonBundle extends DynamicBundle { * @deprecated use {@link AbstractBundle#message(ResourceBundle, String, Object...)} instead */ @Deprecated - @NotNull - public static @Nls String message(@NotNull ResourceBundle bundle, @NotNull String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull ResourceBundle bundle, @NotNull String key, Object @NotNull ... params) { return BundleBase.messageOrDefault(bundle, key, null, params); } @@ -60,13 +57,11 @@ public final class CommonBundle extends DynamicBundle { * @deprecated use {@link AbstractBundle#messageOrNull(ResourceBundle, String, Object...)} */ @Deprecated - @Nullable - public static @Nls String messageOfNull(@NotNull ResourceBundle bundle, @NotNull String key, Object @NotNull ... params) { + public static @Nullable @Nls String messageOfNull(@NotNull ResourceBundle bundle, @NotNull String key, Object @NotNull ... params) { return AbstractBundle.messageOrNull(bundle, key, params); } - @NotNull - public static @Button String getCancelButtonText() { + public static @NotNull @Button String getCancelButtonText() { return message("button.cancel"); } diff --git a/platform/ide-core/src/com/intellij/ide/IdeDeprecatedMessagesBundle.java b/platform/ide-core/src/com/intellij/ide/IdeDeprecatedMessagesBundle.java index 6c0dd23ad63b..18f722856fda 100644 --- a/platform/ide-core/src/com/intellij/ide/IdeDeprecatedMessagesBundle.java +++ b/platform/ide-core/src/com/intellij/ide/IdeDeprecatedMessagesBundle.java @@ -12,21 +12,19 @@ import java.util.function.Supplier; */ @ApiStatus.Internal public class IdeDeprecatedMessagesBundle extends AbstractBundle { - @NonNls private static final String BUNDLE = "messages.IdeDeprecatedMessagesBundle"; + private static final @NonNls String BUNDLE = "messages.IdeDeprecatedMessagesBundle"; private static final IdeDeprecatedMessagesBundle INSTANCE = new IdeDeprecatedMessagesBundle(); private IdeDeprecatedMessagesBundle() { super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/ide-core/src/com/intellij/openapi/project/ProjectBundle.java b/platform/ide-core/src/com/intellij/openapi/project/ProjectBundle.java index e2519b544ff1..535bdd54989d 100644 --- a/platform/ide-core/src/com/intellij/openapi/project/ProjectBundle.java +++ b/platform/ide-core/src/com/intellij/openapi/project/ProjectBundle.java @@ -10,25 +10,21 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class ProjectBundle extends DynamicBundle { - @NonNls - public static final String BUNDLE = "messages.ProjectBundle"; - private static final ProjectBundle INSTANCE = new ProjectBundle(); +public final class ProjectBundle { + public static final @NonNls String BUNDLE = "messages.ProjectBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(ProjectBundle.class, BUNDLE); private ProjectBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getMessage(key, params); } return IdeDeprecatedMessagesBundle.message(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getLazyMessage(key, params); } diff --git a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java index d5c67db7de90..24415c76be95 100644 --- a/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java +++ b/platform/indexing-api/src/com/intellij/psi/search/searches/ReferencesSearch.java @@ -60,13 +60,11 @@ public final class ReferencesSearch extends ExtensibleQueryFactory search(@NotNull PsiElement element) { + public static @NotNull Query search(@NotNull PsiElement element) { return search(element, GlobalSearchScope.allScope(PsiUtilCore.getProjectInReadAction(element)), false); } @@ -124,22 +119,20 @@ public final class ReferencesSearch extends ExtensibleQueryFactory search(@NotNull PsiElement element, @NotNull SearchScope searchScope) { + public static @NotNull Query search(@NotNull PsiElement element, @NotNull SearchScope searchScope) { return search(element, searchScope, false); } /** * Searches for references to the specified element in the specified scope, optionally returning also references which - * are invalid because of access rules (e.g. references to a private method from a different class). + * are invalid because of access rules (e.g., references to a private method from a different class). * * @param element the element (declaration) the references to which are requested. * @param searchScope the scope in which the search is performed. * @param ignoreAccessScope if true, references which are invalid because of access rules are included in the results. * @return the query allowing to enumerate the references. */ - @NotNull - public static Query search(@NotNull PsiElement element, @NotNull SearchScope searchScope, boolean ignoreAccessScope) { + public static @NotNull Query search(@NotNull PsiElement element, @NotNull SearchScope searchScope, boolean ignoreAccessScope) { return search(new SearchParameters(element, searchScope, ignoreAccessScope)); } @@ -149,8 +142,7 @@ public final class ReferencesSearch extends ExtensibleQueryFactory search(@NotNull SearchParameters parameters) { + public static @NotNull Query search(@NotNull SearchParameters parameters) { Query result = INSTANCE.createQuery(parameters); if (parameters.isSharedOptimizer) { return uniqueResults(result); @@ -161,8 +153,7 @@ public final class ReferencesSearch extends ExtensibleQueryFactory(result, new SearchRequestQuery(parameters.getProject(), requests))); } - @NotNull - private static Query uniqueResults(@NotNull Query composite) { + private static @NotNull Query uniqueResults(@NotNull Query composite) { return new UniqueResultsQuery<>(composite, ReferenceDescriptor.MAPPER); } diff --git a/platform/indexing-api/src/com/intellij/util/indexing/IndexingBundle.java b/platform/indexing-api/src/com/intellij/util/indexing/IndexingBundle.java index e2af6888d506..d837ff0ea650 100644 --- a/platform/indexing-api/src/com/intellij/util/indexing/IndexingBundle.java +++ b/platform/indexing-api/src/com/intellij/util/indexing/IndexingBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class IndexingBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.IndexingBundle"; - private static final IndexingBundle INSTANCE = new IndexingBundle(); +public final class IndexingBundle { + private static final @NonNls String BUNDLE = "messages.IndexingBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(IndexingBundle.class, BUNDLE); private IndexingBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/indexing-impl/src/com/intellij/util/indexing/impl/storage/KeyHashLog.java b/platform/indexing-impl/src/com/intellij/util/indexing/impl/storage/KeyHashLog.java index 2ec3250e09b6..ff5b6b260f1f 100644 --- a/platform/indexing-impl/src/com/intellij/util/indexing/impl/storage/KeyHashLog.java +++ b/platform/indexing-impl/src/com/intellij/util/indexing/impl/storage/KeyHashLog.java @@ -19,7 +19,6 @@ import com.intellij.util.io.keyStorage.AppendableObjectStorage; import com.intellij.util.io.keyStorage.AppendableStorageBackedByResizableMappedFile; import it.unimi.dsi.fastutil.ints.*; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.VisibleForTesting; import java.io.*; @@ -29,18 +28,14 @@ import java.util.concurrent.atomic.AtomicInteger; /** * A data structure to store key hashes to virtual file id mappings. */ -class KeyHashLog implements Closeable { +final class KeyHashLog implements Closeable { private static final Logger LOG = Logger.getInstance(KeyHashLog.class); private static final boolean ENABLE_CACHED_HASH_IDS = SystemProperties.getBooleanProperty("idea.index.cashed.hashids", true); - @NotNull - private final KeyDescriptor myKeyDescriptor; - @NotNull - private final Path myBaseStorageFile; - @NotNull - private final AppendableObjectStorage myKeyHashToVirtualFileMapping; - @NotNull - private final ConcurrentIntObjectMap myInvalidatedSessionIds = ConcurrentCollectionFactory.createConcurrentIntObjectMap(); + private final @NotNull KeyDescriptor myKeyDescriptor; + private final @NotNull Path myBaseStorageFile; + private final @NotNull AppendableObjectStorage myKeyHashToVirtualFileMapping; + private final @NotNull ConcurrentIntObjectMap myInvalidatedSessionIds = ConcurrentCollectionFactory.createConcurrentIntObjectMap(); private volatile int myLastScannedId; @@ -58,8 +53,7 @@ class KeyHashLog implements Closeable { openMapping(getDataFile(), 4096); } - @NotNull - private static AppendableStorageBackedByResizableMappedFile openMapping(@NotNull Path dataFile, int size) throws IOException { + private static @NotNull AppendableStorageBackedByResizableMappedFile openMapping(@NotNull Path dataFile, int size) throws IOException { return new AppendableStorageBackedByResizableMappedFile<>(dataFile, size, null, @@ -76,8 +70,7 @@ class KeyHashLog implements Closeable { appendKeyHashToVirtualFileMappingToLog(key, -inputId); } - @Nullable - IntSet getSuitableKeyHashes(@NotNull IdFilter filter, @NotNull Project project) throws StorageException { + @NotNull IntSet getSuitableKeyHashes(@NotNull IdFilter filter, @NotNull Project project) throws StorageException { IdFilter.FilterScopeType filteringScopeType = filter.getFilteringScopeType(); if (filteringScopeType == IdFilter.FilterScopeType.OTHER) { filteringScopeType = IdFilter.FilterScopeType.PROJECT_AND_LIBRARIES; @@ -275,8 +268,7 @@ class KeyHashLog implements Closeable { } - @NotNull - private static IntSet loadProjectHashes(@NotNull Path fileWithCaches) throws IOException { + private static @NotNull IntSet loadProjectHashes(@NotNull Path fileWithCaches) throws IOException { try (DataInputStream inputStream = new DataInputStream(new BufferedInputStream(Files.newInputStream(fileWithCaches)))) { int capacity = DataInputOutputUtil.readINT(inputStream); IntSet hashMaskSet = new IntOpenHashSet(capacity); @@ -327,8 +319,7 @@ class KeyHashLog implements Closeable { return sessionDirectory; } - @NotNull - private Path getSavedProjectFileValueIds(int id, @NotNull IdFilter.FilterScopeType scopeType, @NotNull Project project) { + private @NotNull Path getSavedProjectFileValueIds(int id, @NotNull IdFilter.FilterScopeType scopeType, @NotNull Project project) { return getSessionDir().resolve(getDataFile().getFileName().toString() + "." + project.hashCode() + "." + id + "." + scopeType.getId()); } @@ -379,14 +370,12 @@ class KeyHashLog implements Closeable { return Files.exists(getCompactionMarker()); } - @NotNull - private Path getCompactionMarker() { + private @NotNull Path getCompactionMarker() { Path dataFile = getDataFile(); return dataFile.resolveSibling(dataFile.getFileName().toString() + ".require.compaction"); } - @NotNull - private Path getDataFile() { + private @NotNull Path getDataFile() { return myBaseStorageFile.resolveSibling(myBaseStorageFile.getFileName() + ".project"); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/CodeInsightBundle.java b/platform/lang-api/src/com/intellij/codeInsight/CodeInsightBundle.java index 3a8ef13d6339..1b016bb7eb23 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/CodeInsightBundle.java +++ b/platform/lang-api/src/com/intellij/codeInsight/CodeInsightBundle.java @@ -10,22 +10,20 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class CodeInsightBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.CodeInsightBundle"; - private static final CodeInsightBundle INSTANCE = new CodeInsightBundle(); +public final class CodeInsightBundle { + public static final @NonNls String BUNDLE = "messages.CodeInsightBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(CodeInsightBundle.class, BUNDLE); - private CodeInsightBundle() { super(BUNDLE); } + private CodeInsightBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getMessage(key, params); } return IdeDeprecatedMessagesBundle.message(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getLazyMessage(key, params); } diff --git a/platform/lang-api/src/com/intellij/codeInsight/daemon/DaemonBundle.java b/platform/lang-api/src/com/intellij/codeInsight/daemon/DaemonBundle.java index 1fe069592daa..e8823d60a17d 100644 --- a/platform/lang-api/src/com/intellij/codeInsight/daemon/DaemonBundle.java +++ b/platform/lang-api/src/com/intellij/codeInsight/daemon/DaemonBundle.java @@ -10,22 +10,20 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class DaemonBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.DaemonBundle"; - private static final DaemonBundle INSTANCE = new DaemonBundle(); +public final class DaemonBundle { + private static final @NonNls String BUNDLE = "messages.DaemonBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(DaemonBundle.class, BUNDLE); - private DaemonBundle() { super(BUNDLE); } + private DaemonBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getMessage(key, params); } return IdeDeprecatedMessagesBundle.message(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getLazyMessage(key, params); } diff --git a/platform/lang-api/src/com/intellij/lang/LangBundle.java b/platform/lang-api/src/com/intellij/lang/LangBundle.java index 3961c7d80e3b..cff2b085bf9d 100644 --- a/platform/lang-api/src/com/intellij/lang/LangBundle.java +++ b/platform/lang-api/src/com/intellij/lang/LangBundle.java @@ -11,24 +11,21 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class LangBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.LangBundle"; - private static final LangBundle INSTANCE = new LangBundle(); +public final class LangBundle { + public static final @NonNls String BUNDLE = "messages.LangBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(LangBundle.class, BUNDLE); private LangBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getMessage(key, params); } return IdeDeprecatedMessagesBundle.message(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getLazyMessage(key, params); } diff --git a/platform/lang-core/src/com/intellij/lang/LangCoreBundle.java b/platform/lang-core/src/com/intellij/lang/LangCoreBundle.java index 3b7b1a7b0a57..0d833deecf92 100644 --- a/platform/lang-core/src/com/intellij/lang/LangCoreBundle.java +++ b/platform/lang-core/src/com/intellij/lang/LangCoreBundle.java @@ -11,24 +11,21 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class LangCoreBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.LangCoreBundle"; - private static final LangCoreBundle INSTANCE = new LangCoreBundle(); +public final class LangCoreBundle { + public static final @NonNls String BUNDLE = "messages.LangCoreBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(LangCoreBundle.class, BUNDLE); private LangCoreBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getMessage(key, params); } return IdeDeprecatedMessagesBundle.message(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getLazyMessage(key, params); } diff --git a/platform/lang-impl/src/com/intellij/analysis/problemsView/toolWindow/ProblemsViewBundle.java b/platform/lang-impl/src/com/intellij/analysis/problemsView/toolWindow/ProblemsViewBundle.java index c842905066ae..78b86fdcd748 100644 --- a/platform/lang-impl/src/com/intellij/analysis/problemsView/toolWindow/ProblemsViewBundle.java +++ b/platform/lang-impl/src/com/intellij/analysis/problemsView/toolWindow/ProblemsViewBundle.java @@ -9,12 +9,11 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -final class ProblemsViewBundle extends DynamicBundle { +final class ProblemsViewBundle { private static final @NonNls String BUNDLE = "messages.ProblemsViewBundle"; - private static final ProblemsViewBundle INSTANCE = new ProblemsViewBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(ProblemsViewBundle.class, BUNDLE); private ProblemsViewBundle() { - super(BUNDLE); } public static @Nls @NotNull String message( diff --git a/platform/lang-impl/src/com/intellij/build/BuildBundle.java b/platform/lang-impl/src/com/intellij/build/BuildBundle.java index 5cdc1155240b..790af5fe6d7c 100644 --- a/platform/lang-impl/src/com/intellij/build/BuildBundle.java +++ b/platform/lang-impl/src/com/intellij/build/BuildBundle.java @@ -10,21 +10,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class BuildBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.BuildBundle"; - private static final BuildBundle INSTANCE = new BuildBundle(); +public final class BuildBundle { + private static final @NonNls String BUNDLE = "messages.BuildBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(BuildBundle.class, BUNDLE); private BuildBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/render/DocRenderDummyLineMarkerProvider.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/render/DocRenderDummyLineMarkerProvider.java index 80b90bc17bc4..458c01ae6e17 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/render/DocRenderDummyLineMarkerProvider.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/render/DocRenderDummyLineMarkerProvider.java @@ -8,11 +8,10 @@ import com.intellij.codeInsight.daemon.LineMarkerSettings; import com.intellij.icons.AllIcons; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; import javax.swing.*; -public class DocRenderDummyLineMarkerProvider extends LineMarkerProviderDescriptor { +public final class DocRenderDummyLineMarkerProvider extends LineMarkerProviderDescriptor { private static final DocRenderDummyLineMarkerProvider INSTANCE = new DocRenderDummyLineMarkerProvider(); @Override @@ -31,7 +30,7 @@ public class DocRenderDummyLineMarkerProvider extends LineMarkerProviderDescript } @Override - public @Nullable Icon getIcon() { + public @NotNull Icon getIcon() { return AllIcons.Gutter.JavadocRead; } diff --git a/platform/lang-impl/src/com/intellij/ide/bookmark/BookmarkBundle.java b/platform/lang-impl/src/com/intellij/ide/bookmark/BookmarkBundle.java index f2dd5cc9f71a..b6a871ccb948 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmark/BookmarkBundle.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmark/BookmarkBundle.java @@ -9,12 +9,11 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class BookmarkBundle extends DynamicBundle { +public final class BookmarkBundle { private static final @NonNls String BUNDLE = "messages.BookmarkBundle"; - private static final BookmarkBundle INSTANCE = new BookmarkBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(BookmarkBundle.class, BUNDLE); private BookmarkBundle() { - super(BUNDLE); } public static @Nls @NotNull String message( diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkBundle.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkBundle.java index 2a864e0c03ee..2c604c3ecdf1 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkBundle.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/BookmarkBundle.java @@ -9,12 +9,11 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class BookmarkBundle extends DynamicBundle { +public final class BookmarkBundle { private static final @NonNls String BUNDLE = "messages.BookmarkBundle"; - private static final BookmarkBundle INSTANCE = new BookmarkBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(BookmarkBundle.class, BUNDLE); private BookmarkBundle() { - super(BUNDLE); } public static @Nls @NotNull String message( diff --git a/platform/lang-impl/src/com/intellij/tools/ToolsBundle.java b/platform/lang-impl/src/com/intellij/tools/ToolsBundle.java index 3f55bc7782da..98d6deb0178a 100644 --- a/platform/lang-impl/src/com/intellij/tools/ToolsBundle.java +++ b/platform/lang-impl/src/com/intellij/tools/ToolsBundle.java @@ -10,21 +10,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class ToolsBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.ToolsBundle"; - private static final ToolsBundle INSTANCE = new ToolsBundle(); +public final class ToolsBundle { + private static final @NonNls String BUNDLE = "messages.ToolsBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(ToolsBundle.class, BUNDLE); private ToolsBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/LocalHistoryBundle.java b/platform/lvcs-impl/src/com/intellij/history/integration/LocalHistoryBundle.java index c69e26fc588d..65f1fee3c1b0 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/LocalHistoryBundle.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/LocalHistoryBundle.java @@ -6,15 +6,14 @@ import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; -public final class LocalHistoryBundle extends DynamicBundle { +public final class LocalHistoryBundle { public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } private static final String BUNDLE = "messages.LocalHistoryBundle"; - private static final LocalHistoryBundle INSTANCE = new LocalHistoryBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(LocalHistoryBundle.class, BUNDLE); private LocalHistoryBundle() { - super(BUNDLE); } } \ No newline at end of file diff --git a/platform/platform-api/src/com/intellij/featureStatistics/FeatureStatisticsBundle.java b/platform/platform-api/src/com/intellij/featureStatistics/FeatureStatisticsBundle.java index 9badf332d2ba..815951efdeab 100644 --- a/platform/platform-api/src/com/intellij/featureStatistics/FeatureStatisticsBundle.java +++ b/platform/platform-api/src/com/intellij/featureStatistics/FeatureStatisticsBundle.java @@ -23,13 +23,13 @@ public final class FeatureStatisticsBundle { private static Reference ourBundle; private static final Logger LOG = Logger.getInstance(FeatureStatisticsBundle.class); - @NonNls private static final String BUNDLE = "messages.FeatureStatisticsBundle"; + private static final @NonNls String BUNDLE = "messages.FeatureStatisticsBundle"; private FeatureStatisticsBundle() { } private static ResourceBundle getBundle(final String key) { - ResourceBundle providerBundle = ProvidersBundles.INSTANCE.get(key); + ResourceBundle providerBundle = ProviderBundles.INSTANCE.get(key); if (providerBundle != null) { return providerBundle; } @@ -42,11 +42,11 @@ public final class FeatureStatisticsBundle { return bundle; } - private static final class ProvidersBundles extends HashMap { + private static final class ProviderBundles extends HashMap { @SuppressWarnings("MismatchedQueryAndUpdateOfCollection") - private static final ProvidersBundles INSTANCE = new ProvidersBundles(); + private static final ProviderBundles INSTANCE = new ProviderBundles(); - private ProvidersBundles() { + private ProviderBundles() { for (FeatureStatisticsBundleEP bundleEP : FeatureStatisticsBundleEP.EP_NAME.getExtensionList()) { try { ResourceBundle bundle = ResourceBundle.getBundle(bundleEP.qualifiedName, diff --git a/platform/platform-api/src/com/intellij/ide/IdeBundle.java b/platform/platform-api/src/com/intellij/ide/IdeBundle.java index 4a3938c58044..99e6ab31c35b 100644 --- a/platform/platform-api/src/com/intellij/ide/IdeBundle.java +++ b/platform/platform-api/src/com/intellij/ide/IdeBundle.java @@ -8,10 +8,10 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class IdeBundle extends DynamicBundle { +public final class IdeBundle { public static final String BUNDLE = "messages.IdeBundle"; - private static final IdeBundle INSTANCE = new IdeBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(IdeBundle.class, BUNDLE); public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.containsKey(key) ? INSTANCE.getMessage(key, params) : IdeDeprecatedMessagesBundle.message(key, params); @@ -22,6 +22,5 @@ public final class IdeBundle extends DynamicBundle { } private IdeBundle() { - super(BUNDLE); } } diff --git a/platform/platform-api/src/com/intellij/idea/ActionsBundle.java b/platform/platform-api/src/com/intellij/idea/ActionsBundle.java index 4a8fa8f4470f..25db52570d25 100644 --- a/platform/platform-api/src/com/intellij/idea/ActionsBundle.java +++ b/platform/platform-api/src/com/intellij/idea/ActionsBundle.java @@ -10,13 +10,12 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class ActionsBundle extends DynamicBundle { +public final class ActionsBundle { @NonNls public static final String IDEA_ACTIONS_BUNDLE = "messages.ActionsBundle"; - private static final ActionsBundle ourInstance = new ActionsBundle(); + private static final DynamicBundle ourInstance = new DynamicBundle(ActionsBundle.class, IDEA_ACTIONS_BUNDLE); private ActionsBundle() { - super(IDEA_ACTIONS_BUNDLE); } public static @Nls String message(@NotNull @PropertyKey(resourceBundle = IDEA_ACTIONS_BUNDLE) String key, Object @NotNull ... params) { diff --git a/platform/platform-api/src/com/intellij/idea/ActionsDeprecatedMessagesBundle.java b/platform/platform-api/src/com/intellij/idea/ActionsDeprecatedMessagesBundle.java index 42e634f3ffd7..58ac8bc23d24 100644 --- a/platform/platform-api/src/com/intellij/idea/ActionsDeprecatedMessagesBundle.java +++ b/platform/platform-api/src/com/intellij/idea/ActionsDeprecatedMessagesBundle.java @@ -9,12 +9,11 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -final class ActionsDeprecatedMessagesBundle extends DynamicBundle { +final class ActionsDeprecatedMessagesBundle { private static final @NonNls String BUNDLE = "messages.ActionsDeprecatedMessagesBundle"; - private static final ActionsDeprecatedMessagesBundle INSTANCE = new ActionsDeprecatedMessagesBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(ActionsDeprecatedMessagesBundle.class, BUNDLE); private ActionsDeprecatedMessagesBundle() { - super(BUNDLE); } public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { diff --git a/platform/platform-api/src/com/intellij/openapi/editor/EditorBundle.java b/platform/platform-api/src/com/intellij/openapi/editor/EditorBundle.java index d334d0da97bb..4caea0ac53d5 100644 --- a/platform/platform-api/src/com/intellij/openapi/editor/EditorBundle.java +++ b/platform/platform-api/src/com/intellij/openapi/editor/EditorBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class EditorBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.EditorBundle"; - private static final EditorBundle INSTANCE = new EditorBundle(); +public final class EditorBundle { + public static final @NonNls String BUNDLE = "messages.EditorBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(EditorBundle.class, BUNDLE); - private EditorBundle() { super(BUNDLE); } + private EditorBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/platform/platform-api/src/com/intellij/openapi/keymap/KeyMapBundle.java b/platform/platform-api/src/com/intellij/openapi/keymap/KeyMapBundle.java index b8d41101d70a..7df1e7cb93e8 100644 --- a/platform/platform-api/src/com/intellij/openapi/keymap/KeyMapBundle.java +++ b/platform/platform-api/src/com/intellij/openapi/keymap/KeyMapBundle.java @@ -10,19 +10,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class KeyMapBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.KeyMapBundle"; - private static final KeyMapBundle INSTANCE = new KeyMapBundle(); +public final class KeyMapBundle { + public static final @NonNls String BUNDLE = "messages.KeyMapBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(KeyMapBundle.class, BUNDLE); - private KeyMapBundle() { super(BUNDLE); } + private KeyMapBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/platform-api/src/com/intellij/ui/UIBundle.java b/platform/platform-api/src/com/intellij/ui/UIBundle.java index 76a92cd445be..308b667e1037 100644 --- a/platform/platform-api/src/com/intellij/ui/UIBundle.java +++ b/platform/platform-api/src/com/intellij/ui/UIBundle.java @@ -9,12 +9,11 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class UIBundle extends DynamicBundle { +public final class UIBundle { private static final String BUNDLE = "messages.UIBundle"; - private static final UIBundle INSTANCE = new UIBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(UIBundle.class, BUNDLE); private UIBundle() { - super(BUNDLE); } public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { diff --git a/platform/platform-impl/src/com/intellij/diagnostic/DiagnosticBundle.java b/platform/platform-impl/src/com/intellij/diagnostic/DiagnosticBundle.java index 6d172deb119c..a827b96de927 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/DiagnosticBundle.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/DiagnosticBundle.java @@ -8,12 +8,12 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class DiagnosticBundle extends DynamicBundle { +public final class DiagnosticBundle { public static final String BUNDLE = "messages.DiagnosticBundle"; - private static final DiagnosticBundle INSTANCE = new DiagnosticBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(DiagnosticBundle.class, BUNDLE); - private DiagnosticBundle() { super(BUNDLE); } + private DiagnosticBundle() {} public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); diff --git a/platform/platform-impl/src/com/intellij/ide/lightEdit/project/LightEditDirectoryIndex.java b/platform/platform-impl/src/com/intellij/ide/lightEdit/project/LightEditDirectoryIndex.java index 26376019d3b7..4d596262e883 100644 --- a/platform/platform-impl/src/com/intellij/ide/lightEdit/project/LightEditDirectoryIndex.java +++ b/platform/platform-impl/src/com/intellij/ide/lightEdit/project/LightEditDirectoryIndex.java @@ -15,8 +15,7 @@ import java.util.Collections; import java.util.List; import java.util.Set; -class LightEditDirectoryIndex extends DirectoryIndex { - +final class LightEditDirectoryIndex extends DirectoryIndex { @SuppressWarnings("removal") @Override public @NotNull DirectoryInfo getInfoForFile(@NotNull VirtualFile file) { @@ -28,32 +27,28 @@ class LightEditDirectoryIndex extends DirectoryIndex { return LightEditDirectoryInfo.INSTANCE; } - @NotNull @Override - public Query getDirectoriesByPackageName(@NotNull String packageName, boolean includeLibrarySources) { + public @NotNull Query getDirectoriesByPackageName(@NotNull String packageName, boolean includeLibrarySources) { return EmptyQuery.getEmptyQuery(); } - @Nullable @Override - public String getPackageName(@NotNull VirtualFile dir) { + public @Nullable String getPackageName(@NotNull VirtualFile dir) { return null; } - @NotNull @Override - public List getOrderEntries(@NotNull VirtualFile fileOrDir) { + public @NotNull List getOrderEntries(@NotNull VirtualFile fileOrDir) { return Collections.emptyList(); } - @NotNull @Override - public Set getDependentUnloadedModules(@NotNull Module module) { + public @NotNull Set getDependentUnloadedModules(@NotNull Module module) { return Collections.emptySet(); } @SuppressWarnings("removal") - private static class LightEditDirectoryInfo extends DirectoryInfo { + private static final class LightEditDirectoryInfo extends DirectoryInfo { private static final LightEditDirectoryInfo INSTANCE = new LightEditDirectoryInfo(); @Override public VirtualFile getContentRoot() { diff --git a/platform/platform-impl/src/com/intellij/internal/InternalActionsBundle.java b/platform/platform-impl/src/com/intellij/internal/InternalActionsBundle.java index d1b9e3d2b2a4..98438feafd19 100644 --- a/platform/platform-impl/src/com/intellij/internal/InternalActionsBundle.java +++ b/platform/platform-impl/src/com/intellij/internal/InternalActionsBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class InternalActionsBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.InternalActionsBundle"; - private static final InternalActionsBundle INSTANCE = new InternalActionsBundle(); +public final class InternalActionsBundle { + private static final @NonNls String BUNDLE = "messages.InternalActionsBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(InternalActionsBundle.class, BUNDLE); private InternalActionsBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/IterationState.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/IterationState.java index 00818d617a44..69d229709004 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/IterationState.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/view/IterationState.java @@ -30,7 +30,7 @@ import java.util.List; * Iterator over editor's text contents. Each iteration step corresponds to a text fragment having common graphical attributes * (font style, foreground and background color, effect type and color). */ -public class IterationState { +public final class IterationState { private static final Logger LOG = Logger.getInstance(IterationState.class); public static Comparator createByLayerThenByAttributesComparator(EditorColorsScheme scheme) { @@ -76,8 +76,7 @@ public class IterationState { private final TextAttributes myMergedAttributes = new TextAttributes(); - @Nullable - private final HighlighterIterator myHighlighterIterator; + private final @Nullable HighlighterIterator myHighlighterIterator; private final HighlighterSweep myView; private final HighlighterSweep myDoc; @@ -405,7 +404,6 @@ public class IterationState { } List blocks = myDocument.getGuardedBlocks(); int result = myEnd; - //noinspection ForLoopReplaceableByForEach for (int i = 0; i < blocks.size(); i++) { RangeMarker block = blocks.get(i); int nearestValue = getNearestValueAhead(start, alignOffset(block.getStartOffset()), alignOffset(block.getEndOffset())); @@ -509,7 +507,6 @@ public class IterationState { private int getMinSegmentHighlightersEnd() { int end = myEnd; - //noinspection ForLoopReplaceableByForEach for (int i = 0; i < myCurrentHighlighters.size(); i++) { RangeHighlighterEx highlighter = myCurrentHighlighters.get(i); if (myReverseIteration) { @@ -572,7 +569,6 @@ public class IterationState { ContainerUtil.quickSort(myCurrentHighlighters, createByLayerThenByAttributesComparator(myEditor.getColorsScheme())); } - //noinspection ForLoopReplaceableByForEach for (int i = 0; i < size; i++) { RangeHighlighterEx highlighter = myCurrentHighlighters.get(i); if (highlighter.getTextAttributes(myEditor.getColorsScheme()) == TextAttributes.ERASE_MARKER) { @@ -583,7 +579,6 @@ public class IterationState { List cachedAttributes = myCachedAttributesList; if (!cachedAttributes.isEmpty()) cachedAttributes.clear(); - //noinspection ForLoopReplaceableByForEach for (int i = 0; i < size; i++) { RangeHighlighterEx highlighter = myCurrentHighlighters.get(i); if (atBreak && highlighter.getTargetArea() == HighlighterTargetArea.EXACT_RANGE && @@ -632,7 +627,6 @@ public class IterationState { @JdkConstants.FontStyle int fontType = Font.PLAIN; TextAttributesEffectsBuilder effectsBuilder = null; - //noinspection ForLoopReplaceableByForEach for (int i = 0; i < cachedAttributes.size(); i++) { TextAttributes attrs = cachedAttributes.get(i); @@ -684,8 +678,7 @@ public class IterationState { return myEndOffset; } - @NotNull - public TextAttributes getMergedAttributes() { + public @NotNull TextAttributes getMergedAttributes() { return myMergedAttributes; } @@ -698,16 +691,14 @@ public class IterationState { } - @NotNull - public TextAttributes getPastLineEndBackgroundAttributes() { + public @NotNull TextAttributes getPastLineEndBackgroundAttributes() { myMergedAttributes.setBackgroundColor(hasSoftWrap() ? getBreakBackgroundColor(true) : isEditorRightAligned() && myLastBackgroundColor != null ? myLastBackgroundColor : myCurrentBackgroundColor); return myMergedAttributes; } - @NotNull - public TextAttributes getBeforeLineStartBackgroundAttributes() { + public @NotNull TextAttributes getBeforeLineStartBackgroundAttributes() { return isEditorRightAligned() && !hasSoftWrap() ? getBreakAttributes() : new TextAttributes(null, getBreakBackgroundColor(false), null, null, Font.PLAIN); @@ -737,7 +728,7 @@ public class IterationState { return myEditor instanceof EditorImpl && ((EditorImpl)myEditor).isRightAligned(); } - private static class LayerComparator implements Comparator { + private static final class LayerComparator implements Comparator { private static final LayerComparator INSTANCE = new LayerComparator(); @Override public int compare(RangeHighlighterEx o1, RangeHighlighterEx o2) { diff --git a/platform/platform-impl/src/com/intellij/openapi/fileTypes/FileTypesBundle.java b/platform/platform-impl/src/com/intellij/openapi/fileTypes/FileTypesBundle.java index 4f5dbda88ba3..528fc536964b 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileTypes/FileTypesBundle.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileTypes/FileTypesBundle.java @@ -9,22 +9,19 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class FileTypesBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.FileTypesBundle"; +public final class FileTypesBundle { + private static final @NonNls String BUNDLE = "messages.FileTypesBundle"; - private static final FileTypesBundle INSTANCE = new FileTypesBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(FileTypesBundle.class, BUNDLE); private FileTypesBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/platform/platform-impl/src/com/intellij/ui/MonospaceEditorCustomization.java b/platform/platform-impl/src/com/intellij/ui/MonospaceEditorCustomization.java index 05c14ac30f8a..53d346299ef5 100644 --- a/platform/platform-impl/src/com/intellij/ui/MonospaceEditorCustomization.java +++ b/platform/platform-impl/src/com/intellij/ui/MonospaceEditorCustomization.java @@ -19,18 +19,17 @@ import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.editor.ex.EditorEx; import org.jetbrains.annotations.NotNull; -public class MonospaceEditorCustomization implements EditorCustomization { +public final class MonospaceEditorCustomization implements EditorCustomization { private static final EditorCustomization INSTANCE = new MonospaceEditorCustomization(); - @NotNull - public static EditorCustomization getInstance() { + public static @NotNull EditorCustomization getInstance() { return INSTANCE; } @Override public void customize(@NotNull EditorEx editor) { /* For the sake of simplicity and consistency, we load the global editor scheme here, although its font is not necessarily monospace. - However if the main editor has not monospaced font, we don't wanna use monospace here either. */ + However, if the main editor has not monospaced font, we don't use monospace here either. */ editor.setColorsScheme(EditorColorsManager.getInstance().getGlobalScheme()); } } diff --git a/platform/platform-impl/src/com/intellij/util/io/processHandshake/ProcessHandshakeBundle.java b/platform/platform-impl/src/com/intellij/util/io/processHandshake/ProcessHandshakeBundle.java index c31a848d3282..94145a266ec2 100644 --- a/platform/platform-impl/src/com/intellij/util/io/processHandshake/ProcessHandshakeBundle.java +++ b/platform/platform-impl/src/com/intellij/util/io/processHandshake/ProcessHandshakeBundle.java @@ -9,22 +9,19 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public class ProcessHandshakeBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.ProcessHandshakeBundle"; - private static final ProcessHandshakeBundle INSTANCE = new ProcessHandshakeBundle(); +public final class ProcessHandshakeBundle { + private static final @NonNls String BUNDLE = "messages.ProcessHandshakeBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(ProcessHandshakeBundle.class, BUNDLE); private ProcessHandshakeBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorStressTest.java b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorStressTest.java index dad570ba36ea..5bb6d5c7f737 100644 --- a/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorStressTest.java +++ b/platform/platform-tests/testSrc/com/intellij/openapi/editor/impl/EditorStressTest.java @@ -300,7 +300,7 @@ public class EditorStressTest extends AbstractEditorTest { private static final Key REGION_WIDTH = Key.create("custom.region.width"); - private static class MyCustomFoldRegionRenderer implements CustomFoldRegionRenderer { + private static final class MyCustomFoldRegionRenderer implements CustomFoldRegionRenderer { private static final MyCustomFoldRegionRenderer INSTANCE = new MyCustomFoldRegionRenderer(); @Override diff --git a/platform/platform-util-io/src/com/intellij/util/io/IdeUtilIoBundle.java b/platform/platform-util-io/src/com/intellij/util/io/IdeUtilIoBundle.java index b80910f245b6..0ed60abbaacf 100644 --- a/platform/platform-util-io/src/com/intellij/util/io/IdeUtilIoBundle.java +++ b/platform/platform-util-io/src/com/intellij/util/io/IdeUtilIoBundle.java @@ -7,21 +7,18 @@ import org.jetbrains.annotations.*; import java.util.function.Supplier; @ApiStatus.Internal -public final class IdeUtilIoBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.IdeUtilIoBundle"; - private static final IdeUtilIoBundle INSTANCE = new IdeUtilIoBundle(); +public final class IdeUtilIoBundle { + private static final @NonNls String BUNDLE = "messages.IdeUtilIoBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(IdeUtilIoBundle.class, BUNDLE); private IdeUtilIoBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/projectModel-api/src/com/intellij/projectModel/ProjectModelBundle.java b/platform/projectModel-api/src/com/intellij/projectModel/ProjectModelBundle.java index 3730876cf180..3a9f5a661ef6 100644 --- a/platform/projectModel-api/src/com/intellij/projectModel/ProjectModelBundle.java +++ b/platform/projectModel-api/src/com/intellij/projectModel/ProjectModelBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class ProjectModelBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.ProjectModelBundle"; - private static final ProjectModelBundle INSTANCE = new ProjectModelBundle(); +public final class ProjectModelBundle { + private static final @NonNls String BUNDLE = "messages.ProjectModelBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(ProjectModelBundle.class, BUNDLE); private ProjectModelBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/refactoring/src/com/intellij/refactoring/RefactoringBundle.java b/platform/refactoring/src/com/intellij/refactoring/RefactoringBundle.java index 309d881602eb..34a926894f95 100644 --- a/platform/refactoring/src/com/intellij/refactoring/RefactoringBundle.java +++ b/platform/refactoring/src/com/intellij/refactoring/RefactoringBundle.java @@ -8,30 +8,27 @@ import org.jetbrains.annotations.*; import java.util.function.Supplier; -public final class RefactoringBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.RefactoringBundle"; - private static final RefactoringBundle INSTANCE = new RefactoringBundle(); +public final class RefactoringBundle { + private static final @NonNls String BUNDLE = "messages.RefactoringBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(RefactoringBundle.class, BUNDLE); - private RefactoringBundle() { super(BUNDLE); } + private RefactoringBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getMessage(key, params); } return IdeDeprecatedMessagesBundle.message(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getLazyMessage(key, params); } return IdeDeprecatedMessagesBundle.messagePointer(key, params); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key) { if (INSTANCE.containsKey(key)) { return INSTANCE.getMessage(key); } @@ -70,7 +67,7 @@ public final class RefactoringBundle extends DynamicBundle { return message("visibility.escalate"); } - public static @NlsContexts.DialogMessage String getCannotRefactorMessage(@NlsContexts.DialogMessage @Nullable final String message) { + public static @NlsContexts.DialogMessage String getCannotRefactorMessage(final @NlsContexts.DialogMessage @Nullable String message) { return message("cannot.perform.refactoring") + (message == null ? "" : "\n" + message); } } diff --git a/platform/remote-core/src/remote/RemoteBundle.java b/platform/remote-core/src/remote/RemoteBundle.java index a0b9a67280f1..0909e1f62375 100644 --- a/platform/remote-core/src/remote/RemoteBundle.java +++ b/platform/remote-core/src/remote/RemoteBundle.java @@ -8,20 +8,20 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class RemoteBundle extends DynamicBundle { +public final class RemoteBundle { public static final String BUNDLE = "messages.RemoteBundle"; - private static final RemoteBundle INSTANCE = new RemoteBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(RemoteBundle.class, BUNDLE); + + private RemoteBundle() { + } public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } - - private RemoteBundle() { - super(BUNDLE); - } } diff --git a/platform/remote-servers/api/src/com/intellij/remoteServer/CloudBundle.java b/platform/remote-servers/api/src/com/intellij/remoteServer/CloudBundle.java index 8dc9c1fd51f7..98741e2a7be8 100644 --- a/platform/remote-servers/api/src/com/intellij/remoteServer/CloudBundle.java +++ b/platform/remote-servers/api/src/com/intellij/remoteServer/CloudBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class CloudBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.CloudBundle"; - private static final CloudBundle INSTANCE = new CloudBundle(); +public final class CloudBundle { + private static final @NonNls String BUNDLE = "messages.CloudBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(CloudBundle.class, BUNDLE); - private CloudBundle() { super(BUNDLE); } + private CloudBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/script-debugger/backend/src/debugger/ScriptDebuggerBundle.java b/platform/script-debugger/backend/src/debugger/ScriptDebuggerBundle.java index 123e9c9d09de..edc275652517 100644 --- a/platform/script-debugger/backend/src/debugger/ScriptDebuggerBundle.java +++ b/platform/script-debugger/backend/src/debugger/ScriptDebuggerBundle.java @@ -9,23 +9,20 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public class ScriptDebuggerBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.ScriptDebuggerBundle"; - private static final ScriptDebuggerBundle INSTANCE = new ScriptDebuggerBundle(); +public final class ScriptDebuggerBundle { + private static final @NonNls String BUNDLE = "messages.ScriptDebuggerBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(ScriptDebuggerBundle.class, BUNDLE); private ScriptDebuggerBundle() { - super(BUNDLE); } - @NotNull - public static @Nls + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/smRunner/src/com/intellij/execution/testframework/sm/SmRunnerBundle.java b/platform/smRunner/src/com/intellij/execution/testframework/sm/SmRunnerBundle.java index 0b2eb08a1395..59eee59bf679 100644 --- a/platform/smRunner/src/com/intellij/execution/testframework/sm/SmRunnerBundle.java +++ b/platform/smRunner/src/com/intellij/execution/testframework/sm/SmRunnerBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class SmRunnerBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.SmRunnerBundle"; - private static final SmRunnerBundle INSTANCE = new SmRunnerBundle(); +public final class SmRunnerBundle { + private static final @NonNls String BUNDLE = "messages.SmRunnerBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(SmRunnerBundle.class, BUNDLE); - private SmRunnerBundle() { super(BUNDLE); } + private SmRunnerBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/platform/statistics/src/com/intellij/internal/statistic/eventLog/EventLogAppConnectionSettings.java b/platform/statistics/src/com/intellij/internal/statistic/eventLog/EventLogAppConnectionSettings.java index 61d255928d00..cf1044d14470 100644 --- a/platform/statistics/src/com/intellij/internal/statistic/eventLog/EventLogAppConnectionSettings.java +++ b/platform/statistics/src/com/intellij/internal/statistic/eventLog/EventLogAppConnectionSettings.java @@ -19,12 +19,11 @@ import java.util.Collections; import java.util.List; import java.util.Map; -public class EventLogAppConnectionSettings implements EventLogConnectionSettings { +public final class EventLogAppConnectionSettings implements EventLogConnectionSettings { private static final StatsProxyInfo NO_PROXY = new StatsProxyInfo(Proxy.NO_PROXY, null); - @NotNull @Override - public String getUserAgent() { + public @NotNull String getUserAgent() { Application app = ApplicationManager.getApplication(); if (app != null && !app.isDisposed()) { String productName = ApplicationNamesInfo.getInstance().getFullProductName(); @@ -34,9 +33,8 @@ public class EventLogAppConnectionSettings implements EventLogConnectionSettings return "IntelliJ"; } - @NotNull @Override - public StatsProxyInfo selectProxy(@NotNull String url) { + public @NotNull StatsProxyInfo selectProxy(@NotNull String url) { Application app = ApplicationManager.getApplication(); if (app != null && !app.isDisposed()) { Proxy proxy = findProxy(url); @@ -47,15 +45,13 @@ public class EventLogAppConnectionSettings implements EventLogConnectionSettings return NO_PROXY; } - @Nullable @Override - public SSLContext getSSLContext() { + public @Nullable SSLContext getSSLContext() { return IdeUiService.getInstance().getSslContext(); } - @NotNull @Override - public Map getExtraHeaders() { + public @NotNull Map getExtraHeaders() { ExternalEventLogSettings externalEventLogSettings = StatisticsEventLogProviderUtil.getExternalEventLogSettings(); if (externalEventLogSettings != null) { return externalEventLogSettings.getExtraLogUploadHeaders(); @@ -64,16 +60,14 @@ public class EventLogAppConnectionSettings implements EventLogConnectionSettings } } - @Nullable - private static StatsProxyInfo.StatsProxyAuthProvider getAuthProvider() { + private static @Nullable StatsProxyInfo.StatsProxyAuthProvider getAuthProvider() { if (IdeUiService.getInstance().isProxyAuth()) { return EventLogAppProxyAuth.INSTANCE; } return null; } - @NotNull - private static Proxy findProxy(@NotNull String url) { + private static @NotNull Proxy findProxy(@NotNull String url) { try { List proxies = IdeUiService.getInstance().getProxyList(new URL(url)); return !proxies.isEmpty() ? proxies.get(0) : Proxy.NO_PROXY; @@ -84,7 +78,7 @@ public class EventLogAppConnectionSettings implements EventLogConnectionSettings return Proxy.NO_PROXY; } - private static class EventLogAppProxyAuth implements StatsProxyInfo.StatsProxyAuthProvider { + private static final class EventLogAppProxyAuth implements StatsProxyInfo.StatsProxyAuthProvider { private static final EventLogAppProxyAuth INSTANCE = new EventLogAppProxyAuth(); @Override diff --git a/platform/structuralsearch/source/com/intellij/structuralsearch/SSRBundle.java b/platform/structuralsearch/source/com/intellij/structuralsearch/SSRBundle.java index d791530b6292..376834bfe1d0 100644 --- a/platform/structuralsearch/source/com/intellij/structuralsearch/SSRBundle.java +++ b/platform/structuralsearch/source/com/intellij/structuralsearch/SSRBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class SSRBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.SSRBundle"; - private static final SSRBundle INSTANCE = new SSRBundle(); +public final class SSRBundle { + private static final @NonNls String BUNDLE = "messages.SSRBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(SSRBundle.class, BUNDLE); - private SSRBundle() { super(BUNDLE); } + private SSRBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/platform/structure-view-impl/src/com/intellij/ide/structureView/StructureViewBundle.java b/platform/structure-view-impl/src/com/intellij/ide/structureView/StructureViewBundle.java index 50092ba7f636..2b9f298f7271 100644 --- a/platform/structure-view-impl/src/com/intellij/ide/structureView/StructureViewBundle.java +++ b/platform/structure-view-impl/src/com/intellij/ide/structureView/StructureViewBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class StructureViewBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.StructureViewBundle"; - private static final StructureViewBundle INSTANCE = new StructureViewBundle(); +public final class StructureViewBundle { + private static final @NonNls String BUNDLE = "messages.StructureViewBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(StructureViewBundle.class, BUNDLE); private StructureViewBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/tasks-platform-api/src/com/intellij/tasks/TaskApiBundle.java b/platform/tasks-platform-api/src/com/intellij/tasks/TaskApiBundle.java index 69ee65e2b4e3..1c690111aa25 100644 --- a/platform/tasks-platform-api/src/com/intellij/tasks/TaskApiBundle.java +++ b/platform/tasks-platform-api/src/com/intellij/tasks/TaskApiBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class TaskApiBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.TaskApiBundle"; - private static final TaskApiBundle INSTANCE = new TaskApiBundle(); +public final class TaskApiBundle { + private static final @NonNls String BUNDLE = "messages.TaskApiBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(TaskApiBundle.class, BUNDLE); - private TaskApiBundle() { super(BUNDLE); } + private TaskApiBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/tasks-platform-impl/src/com/intellij/tasks/TaskBundle.java b/platform/tasks-platform-impl/src/com/intellij/tasks/TaskBundle.java index 5854ca1034c9..69ca8687fe67 100644 --- a/platform/tasks-platform-impl/src/com/intellij/tasks/TaskBundle.java +++ b/platform/tasks-platform-impl/src/com/intellij/tasks/TaskBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class TaskBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.TaskBundle"; - private static final TaskBundle INSTANCE = new TaskBundle(); +public final class TaskBundle { + private static final @NonNls String BUNDLE = "messages.TaskBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(TaskBundle.class, BUNDLE); - private TaskBundle() { super(BUNDLE); } + private TaskBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/platform/testFramework/src/com/intellij/testFramework/EmptyFileBasedIndex.java b/platform/testFramework/src/com/intellij/testFramework/EmptyFileBasedIndex.java index 434ed65a7a07..fe3685548422 100644 --- a/platform/testFramework/src/com/intellij/testFramework/EmptyFileBasedIndex.java +++ b/platform/testFramework/src/com/intellij/testFramework/EmptyFileBasedIndex.java @@ -181,13 +181,12 @@ public final class EmptyFileBasedIndex extends FileBasedIndexEx { return true; } - @NotNull @Override - public UpdatableIndex getIndex(ID indexId) { + public @NotNull UpdatableIndex getIndex(ID indexId) { return EmptyIndex.getInstance(); } - private static class EmptyIndex implements UpdatableIndex, MeasurableIndexStore { + private static final class EmptyIndex implements UpdatableIndex, MeasurableIndexStore { @SuppressWarnings("rawtypes") private static final EmptyIndex INSTANCE = new EmptyIndex(); private final ReentrantReadWriteLock myLock = new ReentrantReadWriteLock(); diff --git a/platform/testRunner/src/com/intellij/execution/testframework/TestRunnerBundle.java b/platform/testRunner/src/com/intellij/execution/testframework/TestRunnerBundle.java index 2f135cf8c860..6479e8743c80 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/TestRunnerBundle.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/TestRunnerBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class TestRunnerBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.TestRunnerBundle"; - private static final TestRunnerBundle INSTANCE = new TestRunnerBundle(); +public final class TestRunnerBundle { + private static final @NonNls String BUNDLE = "messages.TestRunnerBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(TestRunnerBundle.class, BUNDLE); private TestRunnerBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/usageView/src/com/intellij/usageView/UsageViewBundle.java b/platform/usageView/src/com/intellij/usageView/UsageViewBundle.java index 2caf7b3d76e1..e1bde18a3688 100644 --- a/platform/usageView/src/com/intellij/usageView/UsageViewBundle.java +++ b/platform/usageView/src/com/intellij/usageView/UsageViewBundle.java @@ -11,23 +11,21 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class UsageViewBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.UsageViewBundle"; +public final class UsageViewBundle { + private static final @NonNls String BUNDLE = "messages.UsageViewBundle"; - private static final UsageViewBundle INSTANCE = new UsageViewBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(UsageViewBundle.class, BUNDLE); - private UsageViewBundle() { super(BUNDLE); } + private UsageViewBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getMessage(key, params); } return IdeDeprecatedMessagesBundle.message(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { if (INSTANCE.containsKey(key)) { return INSTANCE.getLazyMessage(key, params); } @@ -40,8 +38,7 @@ public final class UsageViewBundle extends DynamicBundle { } @SuppressWarnings({"AutoBoxing"}) - @Nls - public static String getReferencesString(int usagesCount, int filesCount) { + public static @Nls String getReferencesString(int usagesCount, int filesCount) { return " (" + message("occurence.info.reference", usagesCount, filesCount) + ")"; } } \ No newline at end of file diff --git a/platform/util-rt/src/com/intellij/util/containers/EmptyIterator.java b/platform/util-rt/src/com/intellij/util/containers/EmptyIterator.java index 1172d34362e6..6cce9f598f42 100644 --- a/platform/util-rt/src/com/intellij/util/containers/EmptyIterator.java +++ b/platform/util-rt/src/com/intellij/util/containers/EmptyIterator.java @@ -28,10 +28,12 @@ import java.util.NoSuchElementException; @ApiStatus.ScheduledForRemoval public class EmptyIterator implements Iterator { private static final EmptyIterator INSTANCE = new EmptyIterator(); + public static EmptyIterator getInstance() { //noinspection unchecked return INSTANCE; } + public boolean hasNext() { return false; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsRevisionNumberArrayRule.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsRevisionNumberArrayRule.java index 870cae8d564f..da945ecef217 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsRevisionNumberArrayRule.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/VcsRevisionNumberArrayRule.java @@ -34,18 +34,15 @@ import java.util.List; /** * {@link VcsDataKeys#VCS_REVISION_NUMBERS} */ -public class VcsRevisionNumberArrayRule implements GetDataRule { - - @Nullable +final class VcsRevisionNumberArrayRule implements GetDataRule { @Override - public Object getData(@NotNull DataProvider dataProvider) { + public @Nullable Object getData(@NotNull DataProvider dataProvider) { List revisionNumbers = getRevisionNumbers(dataProvider); return !ContainerUtil.isEmpty(revisionNumbers) ? revisionNumbers.toArray(new VcsRevisionNumber[0]) : null; } - @Nullable - public List getRevisionNumbers(@NotNull DataProvider dataProvider) { + public @Nullable List getRevisionNumbers(@NotNull DataProvider dataProvider) { VcsRevisionNumber revisionNumber = VcsDataKeys.VCS_REVISION_NUMBER.getData(dataProvider); if (revisionNumber != null) { return Collections.singletonList(revisionNumber); @@ -73,8 +70,7 @@ public class VcsRevisionNumberArrayRule implements GetDataRule { return null; } - private static class CommittedChangeListToRevisionNumberFunction implements Function { - + private static final class CommittedChangeListToRevisionNumberFunction implements Function { private static final CommittedChangeListToRevisionNumberFunction INSTANCE = new CommittedChangeListToRevisionNumberFunction(); /** @@ -90,8 +86,7 @@ public class VcsRevisionNumberArrayRule implements GetDataRule { } } - private static class FileRevisionToRevisionNumberFunction implements Function { - + private static final class FileRevisionToRevisionNumberFunction implements Function { private static final FileRevisionToRevisionNumberFunction INSTANCE = new FileRevisionToRevisionNumberFunction(); @Override diff --git a/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogBundle.java b/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogBundle.java index ec08969121d1..47c2637b05f3 100644 --- a/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogBundle.java +++ b/platform/vcs-log/api/src/com/intellij/vcs/log/VcsLogBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class VcsLogBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.VcsLogBundle"; - private static final VcsLogBundle INSTANCE = new VcsLogBundle(); +public final class VcsLogBundle { + private static final @NonNls String BUNDLE = "messages.VcsLogBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(VcsLogBundle.class, BUNDLE); private VcsLogBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/EmptyVisibleGraph.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/EmptyVisibleGraph.java index 05d98146dd49..be3ff2d6f5b8 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/EmptyVisibleGraph.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/visible/EmptyVisibleGraph.java @@ -16,8 +16,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; -public class EmptyVisibleGraph implements VisibleGraph { - +public final class EmptyVisibleGraph implements VisibleGraph { private static final VisibleGraph INSTANCE = new EmptyVisibleGraph(); public static @NotNull VisibleGraph getInstance() { @@ -67,7 +66,7 @@ public class EmptyVisibleGraph implements VisibleGraph { public void setLongEdgesHidden(boolean longEdgesHidden) { } - private static class EmptyGraphAnswer implements GraphAnswer { + private static final class EmptyGraphAnswer implements GraphAnswer { private static final EmptyGraphAnswer INSTANCE = new EmptyGraphAnswer(); @Override diff --git a/platform/webSymbols/src/com/intellij/webSymbols/WebSymbolsBundle.java b/platform/webSymbols/src/com/intellij/webSymbols/WebSymbolsBundle.java index bf0ea293d464..c0b92f576a44 100644 --- a/platform/webSymbols/src/com/intellij/webSymbols/WebSymbolsBundle.java +++ b/platform/webSymbols/src/com/intellij/webSymbols/WebSymbolsBundle.java @@ -9,20 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class WebSymbolsBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.WebSymbolsBundle"; - private static final WebSymbolsBundle INSTANCE = new WebSymbolsBundle(); +public final class WebSymbolsBundle { + public static final @NonNls String BUNDLE = "messages.WebSymbolsBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(WebSymbolsBundle.class, BUNDLE); - private WebSymbolsBundle() { super(BUNDLE); } + private WebSymbolsBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerBundle.java b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerBundle.java index c863c0ef3b68..569a8c4ae8d1 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerBundle.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/XDebuggerBundle.java @@ -10,19 +10,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class XDebuggerBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.XDebuggerBundle"; - private static final XDebuggerBundle INSTANCE = new XDebuggerBundle(); +public final class XDebuggerBundle { + public static final @NonNls String BUNDLE = "messages.XDebuggerBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(XDebuggerBundle.class, BUNDLE); - private XDebuggerBundle() { super(BUNDLE); } + private XDebuggerBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/JavaByteCodeViewerBundle.java b/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/JavaByteCodeViewerBundle.java index 7877650d3cb7..b96842eb74a4 100644 --- a/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/JavaByteCodeViewerBundle.java +++ b/plugins/ByteCodeViewer/src/com/intellij/byteCodeViewer/JavaByteCodeViewerBundle.java @@ -7,21 +7,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaByteCodeViewerBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.JavaByteCodeViewerBundle"; - private static final JavaByteCodeViewerBundle INSTANCE = new JavaByteCodeViewerBundle(); +public final class JavaByteCodeViewerBundle { + private static final @NonNls String BUNDLE = "messages.JavaByteCodeViewerBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaByteCodeViewerBundle.class, BUNDLE); private JavaByteCodeViewerBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.java b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.java index 7e37e46facde..c9dbf458b44a 100644 --- a/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.java +++ b/plugins/InspectionGadgets/InspectionGadgetsAnalysis/src/com/siyeh/InspectionGadgetsBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class InspectionGadgetsBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.InspectionGadgetsBundle"; - private static final InspectionGadgetsBundle INSTANCE = new InspectionGadgetsBundle(); +public final class InspectionGadgetsBundle { + public static final @NonNls String BUNDLE = "messages.InspectionGadgetsBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(InspectionGadgetsBundle.class, BUNDLE); - private InspectionGadgetsBundle() { super(BUNDLE); } + private InspectionGadgetsBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/performance/ObjectEqualsCanBeEqualityInspectionTest.java b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/performance/ObjectEqualsCanBeEqualityInspectionTest.java index 23390a51c141..5d12c8cfb63c 100644 --- a/plugins/InspectionGadgets/testsrc/com/siyeh/ig/performance/ObjectEqualsCanBeEqualityInspectionTest.java +++ b/plugins/InspectionGadgets/testsrc/com/siyeh/ig/performance/ObjectEqualsCanBeEqualityInspectionTest.java @@ -4,7 +4,6 @@ package com.siyeh.ig.performance; import com.intellij.codeInspection.CommonQuickFixBundle; import com.intellij.codeInspection.InspectionProfileEntry; import com.intellij.testFramework.LightProjectDescriptor; -import com.siyeh.InspectionGadgetsBundle; import com.siyeh.ig.LightJavaInspectionTestCase; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -81,7 +80,7 @@ public class ObjectEqualsCanBeEqualityInspectionTest extends LightJavaInspection public void testSingleton() { doTest("final class Singleton {" + - " private static final Singleton INSTANCE = new Singleton();" + + " private static final DynamicBundle INSTANCE = new DynamicBundle(Singleton.class, BUNDLE);" + " private Singleton() {}" + "}" + "class U {" + diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/IntelliLangBundle.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/IntelliLangBundle.java index 1f63487a59f4..31603826c97b 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/IntelliLangBundle.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/IntelliLangBundle.java @@ -10,19 +10,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class IntelliLangBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.IntelliLangBundle"; - private static final IntelliLangBundle INSTANCE = new IntelliLangBundle(); +public final class IntelliLangBundle { + private static final @NonNls String BUNDLE = "messages.IntelliLangBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(IntelliLangBundle.class, BUNDLE); - private IntelliLangBundle() { super(BUNDLE); } + private IntelliLangBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.java b/plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.java index 572ea9a7a588..f915351a9708 100644 --- a/plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.java +++ b/plugins/IntentionPowerPak/src/com/siyeh/IntentionPowerPackBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class IntentionPowerPackBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.IntentionPowerPackBundle"; - private static final IntentionPowerPackBundle INSTANCE = new IntentionPowerPackBundle(); +public final class IntentionPowerPackBundle { + private static final @NonNls String BUNDLE = "messages.IntentionPowerPackBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(IntentionPowerPackBundle.class, BUNDLE); - private IntentionPowerPackBundle() { super(BUNDLE); } + private IntentionPowerPackBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/AntJpsBundle.java b/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/AntJpsBundle.java index 313d99c1ef79..faeff241c07b 100644 --- a/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/AntJpsBundle.java +++ b/plugins/ant/jps-plugin/src/org/jetbrains/jps/ant/AntJpsBundle.java @@ -7,16 +7,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; import org.jetbrains.jps.api.JpsDynamicBundle; -public final class AntJpsBundle extends JpsDynamicBundle { - @NonNls private static final String BUNDLE = "messages.AntJpsBundle"; - private static final AntJpsBundle INSTANCE = new AntJpsBundle(); +public final class AntJpsBundle { + private static final @NonNls String BUNDLE = "messages.AntJpsBundle"; + private static final JpsDynamicBundle INSTANCE = new JpsDynamicBundle(AntJpsBundle.class, BUNDLE); private AntJpsBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } } diff --git a/plugins/ant/src/com/intellij/lang/ant/AntBundle.java b/plugins/ant/src/com/intellij/lang/ant/AntBundle.java index ed41f17cca73..fd0a05c97b6c 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntBundle.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class AntBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.AntBundle"; - private static final AntBundle INSTANCE = new AntBundle(); +public final class AntBundle { + private static final @NonNls String BUNDLE = "messages.AntBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(AntBundle.class, BUNDLE); - private AntBundle() { super(BUNDLE); } + private AntBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/ant/src/com/intellij/lang/ant/resources/AntActionsBundle.java b/plugins/ant/src/com/intellij/lang/ant/resources/AntActionsBundle.java index 4e88f1e095a1..b2893f55675a 100644 --- a/plugins/ant/src/com/intellij/lang/ant/resources/AntActionsBundle.java +++ b/plugins/ant/src/com/intellij/lang/ant/resources/AntActionsBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class AntActionsBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.AntActionsBundle"; - private static final AntActionsBundle INSTANCE = new AntActionsBundle(); +public final class AntActionsBundle { + private static final @NonNls String BUNDLE = "messages.AntActionsBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(AntActionsBundle.class, BUNDLE); - private AntActionsBundle() { super(BUNDLE); } + private AntActionsBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/built-in-help/src/com/jetbrains/builtInHelp/BuiltInHelpBundle.java b/plugins/built-in-help/src/com/jetbrains/builtInHelp/BuiltInHelpBundle.java index 07e0fad8aa5c..18bf72016e99 100644 --- a/plugins/built-in-help/src/com/jetbrains/builtInHelp/BuiltInHelpBundle.java +++ b/plugins/built-in-help/src/com/jetbrains/builtInHelp/BuiltInHelpBundle.java @@ -7,23 +7,14 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; -import java.util.function.Supplier; - -public final class BuiltInHelpBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.BuiltInHelpBundle"; - private static final BuiltInHelpBundle INSTANCE = new BuiltInHelpBundle(); +public final class BuiltInHelpBundle { + private static final @NonNls String BUNDLE = "messages.BuiltInHelpBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(BuiltInHelpBundle.class, BUNDLE); private BuiltInHelpBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { - return INSTANCE.getLazyMessage(key, params); - } } diff --git a/plugins/changeReminder/src/com/jetbrains/changeReminder/ChangeReminderBundle.java b/plugins/changeReminder/src/com/jetbrains/changeReminder/ChangeReminderBundle.java index 1a105423bf8d..20c481492168 100644 --- a/plugins/changeReminder/src/com/jetbrains/changeReminder/ChangeReminderBundle.java +++ b/plugins/changeReminder/src/com/jetbrains/changeReminder/ChangeReminderBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class ChangeReminderBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.ChangeReminderBundle"; - private static final ChangeReminderBundle INSTANCE = new ChangeReminderBundle(); +public final class ChangeReminderBundle { + private static final @NonNls String BUNDLE = "messages.ChangeReminderBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(ChangeReminderBundle.class, BUNDLE); private ChangeReminderBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/commander/src/com/intellij/ide/commander/CommanderBundle.java b/plugins/commander/src/com/intellij/ide/commander/CommanderBundle.java index 948efaf524cc..53dbf6b95daa 100644 --- a/plugins/commander/src/com/intellij/ide/commander/CommanderBundle.java +++ b/plugins/commander/src/com/intellij/ide/commander/CommanderBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class CommanderBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.CommanderBundle"; - private static final CommanderBundle INSTANCE = new CommanderBundle(); +public final class CommanderBundle { + private static final @NonNls String BUNDLE = "messages.CommanderBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(CommanderBundle.class, BUNDLE); - private CommanderBundle() { super(BUNDLE); } + private CommanderBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/configuration-script/src/ConfigurationScriptBundle.java b/plugins/configuration-script/src/ConfigurationScriptBundle.java index da78239400d1..cf4cbc27d728 100644 --- a/plugins/configuration-script/src/ConfigurationScriptBundle.java +++ b/plugins/configuration-script/src/ConfigurationScriptBundle.java @@ -8,12 +8,11 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -final class ConfigurationScriptBundle extends DynamicBundle { +final class ConfigurationScriptBundle { private static final @NonNls String BUNDLE = "messages.ConfigurationScriptBundle"; - private static final ConfigurationScriptBundle INSTANCE = new ConfigurationScriptBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(ConfigurationScriptBundle.class, BUNDLE); private ConfigurationScriptBundle() { - super(BUNDLE); } public static @Nls @NotNull String message( diff --git a/plugins/copyright/src/com/intellij/copyright/CopyrightBundle.java b/plugins/copyright/src/com/intellij/copyright/CopyrightBundle.java index cddcd439d279..a52079cbe17f 100644 --- a/plugins/copyright/src/com/intellij/copyright/CopyrightBundle.java +++ b/plugins/copyright/src/com/intellij/copyright/CopyrightBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class CopyrightBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.CopyrightBundle"; - private static final CopyrightBundle INSTANCE = new CopyrightBundle(); +public final class CopyrightBundle { + private static final @NonNls String BUNDLE = "messages.CopyrightBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(CopyrightBundle.class, BUNDLE); private CopyrightBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/coverage-common/src/com/intellij/coverage/CoverageBundle.java b/plugins/coverage-common/src/com/intellij/coverage/CoverageBundle.java index 79228b0fa4d5..e9f48bb5f33e 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/CoverageBundle.java +++ b/plugins/coverage-common/src/com/intellij/coverage/CoverageBundle.java @@ -9,22 +9,19 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class CoverageBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.CoverageBundle"; - private static final CoverageBundle INSTANCE = new CoverageBundle(); +public final class CoverageBundle { + private static final @NonNls String BUNDLE = "messages.CoverageBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(CoverageBundle.class, BUNDLE); private CoverageBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/coverage/src/com/intellij/java/coverage/JavaCoverageBundle.java b/plugins/coverage/src/com/intellij/java/coverage/JavaCoverageBundle.java index 84e6b7830533..c7c87b1e501f 100644 --- a/plugins/coverage/src/com/intellij/java/coverage/JavaCoverageBundle.java +++ b/plugins/coverage/src/com/intellij/java/coverage/JavaCoverageBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaCoverageBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.JavaCoverageBundle"; - private static final JavaCoverageBundle INSTANCE = new JavaCoverageBundle(); +public final class JavaCoverageBundle { + private static final @NonNls String BUNDLE = "messages.JavaCoverageBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaCoverageBundle.class, BUNDLE); private JavaCoverageBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/DevKitJpsBundle.java b/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/DevKitJpsBundle.java index 0508889d36a1..65e9b5401a88 100644 --- a/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/DevKitJpsBundle.java +++ b/plugins/devkit/jps-plugin/src/org/jetbrains/jps/devkit/DevKitJpsBundle.java @@ -7,15 +7,13 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; import org.jetbrains.jps.api.JpsDynamicBundle; -public class DevKitJpsBundle extends JpsDynamicBundle { - @NonNls - private static final String BUNDLE = "messages.DevKitJpsBundle"; - private static final DevKitJpsBundle INSTANCE = new DevKitJpsBundle(); +public final class DevKitJpsBundle { + private static final @NonNls String BUNDLE = "messages.DevKitJpsBundle"; + private static final JpsDynamicBundle INSTANCE = new JpsDynamicBundle(DevKitJpsBundle.class, BUNDLE); - private DevKitJpsBundle() { super(BUNDLE); } + private DevKitJpsBundle() {} public static @Nls @NotNull String message(@PropertyKey(resourceBundle = BUNDLE) @NotNull String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - } diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseBundle.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseBundle.java index a0ed8c57ef23..46d0fabd5274 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseBundle.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/EclipseBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class EclipseBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.EclipseBundle"; - private static final EclipseBundle INSTANCE = new EclipseBundle(); +public final class EclipseBundle { + private static final @NonNls String BUNDLE = "messages.EclipseBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(EclipseBundle.class, BUNDLE); - private EclipseBundle() { super(BUNDLE); } + private EclipseBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/editorconfig/src/org/editorconfig/Utils.kt b/plugins/editorconfig/src/org/editorconfig/Utils.kt index 19ea469bcec5..0f9fdd7a34ab 100644 --- a/plugins/editorconfig/src/org/editorconfig/Utils.kt +++ b/plugins/editorconfig/src/org/editorconfig/Utils.kt @@ -80,9 +80,9 @@ object Utils { fun invalidConfigMessage(project: Project, configValue: String?, configKey: String, filePath: String?) { val message = if (configValue != null) { - BundleBase.messageOrDefault(EditorConfigBundle.resourceBundle, "invalid.config.value", + BundleBase.messageOrDefault(EditorConfigBundle.bundle.resourceBundle, "invalid.config.value", null, - configValue, configKey.ifEmpty { "?" }, filePath)!! + configValue, configKey.ifEmpty { "?" }, filePath) } else { EditorConfigBundle.message("read.failure") diff --git a/plugins/editorconfig/src/org/editorconfig/language/messages/EditorConfigBundle.kt b/plugins/editorconfig/src/org/editorconfig/language/messages/EditorConfigBundle.kt index 389537003a02..dfc2bd3afa83 100644 --- a/plugins/editorconfig/src/org/editorconfig/language/messages/EditorConfigBundle.kt +++ b/plugins/editorconfig/src/org/editorconfig/language/messages/EditorConfigBundle.kt @@ -5,17 +5,17 @@ import com.intellij.DynamicBundle import org.jetbrains.annotations.Nls import org.jetbrains.annotations.NonNls import org.jetbrains.annotations.PropertyKey -import java.util.function.Supplier @NonNls private const val BUNDLE_NAME: String = "messages.EditorConfigBundle" -object EditorConfigBundle : DynamicBundle(BUNDLE_NAME) { +object EditorConfigBundle { + internal val bundle: DynamicBundle = DynamicBundle(EditorConfigBundle::class.java, BUNDLE_NAME) + const val BUNDLE = BUNDLE_NAME @Nls - fun get(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any) = - getMessage(key, *params) + fun get(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any) = bundle.getMessage(key, *params) @Nls operator fun get(@PropertyKey(resourceBundle = BUNDLE) key: String) = get(key, *emptyArray()) @@ -27,7 +27,4 @@ object EditorConfigBundle : DynamicBundle(BUNDLE_NAME) { @JvmStatic @Nls fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, param: String) = get(key, param) - - @JvmStatic - fun messagePointer(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): Supplier = getLazyMessage(key, *params) } \ No newline at end of file diff --git a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/messages/EmojiCategoriesBundle.java b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/messages/EmojiCategoriesBundle.java index d22220a97159..33cb052b7589 100644 --- a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/messages/EmojiCategoriesBundle.java +++ b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/messages/EmojiCategoriesBundle.java @@ -9,22 +9,19 @@ import org.jetbrains.plugins.emojipicker.EmojiCategory; import java.util.function.Supplier; -public class EmojiCategoriesBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.EmojiCategoriesBundle"; - private static final EmojiCategoriesBundle INSTANCE = new EmojiCategoriesBundle(); +public final class EmojiCategoriesBundle { + private static final @NonNls String BUNDLE = "messages.EmojiCategoriesBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(EmojiCategoriesBundle.class, BUNDLE); private EmojiCategoriesBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } diff --git a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/messages/EmojipickerBundle.java b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/messages/EmojipickerBundle.java index 5864908bd4d6..e8e12c23f83e 100644 --- a/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/messages/EmojipickerBundle.java +++ b/plugins/emojipicker/src/org/jetbrains/plugins/emojipicker/messages/EmojipickerBundle.java @@ -8,22 +8,19 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public class EmojipickerBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.EmojipickerBundle"; - private static final EmojipickerBundle INSTANCE = new EmojipickerBundle(); +public final class EmojipickerBundle { + private static final @NonNls String BUNDLE = "messages.EmojipickerBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(EmojipickerBundle.class, BUNDLE); private EmojipickerBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/generate-tostring/src/org/jetbrains/java/generate/config/ReplacePolicy.java b/plugins/generate-tostring/src/org/jetbrains/java/generate/config/ReplacePolicy.java index 1b7f0297517c..c9e63f3829f6 100644 --- a/plugins/generate-tostring/src/org/jetbrains/java/generate/config/ReplacePolicy.java +++ b/plugins/generate-tostring/src/org/jetbrains/java/generate/config/ReplacePolicy.java @@ -25,7 +25,6 @@ import org.jetbrains.annotations.NotNull; * This policy is to replace the existing {@code toString} method. */ public final class ReplacePolicy implements ConflictResolutionPolicy { - private static final ReplacePolicy instance = new ReplacePolicy(); private ReplacePolicy() { @@ -52,5 +51,4 @@ public final class ReplacePolicy implements ConflictResolutionPolicy { public String toString() { return "Replace existing"; } - } diff --git a/plugins/git4idea/src/git4idea/i18n/GitBundle.java b/plugins/git4idea/src/git4idea/i18n/GitBundle.java index df9ec40a73ca..63e7bfbcb4e0 100644 --- a/plugins/git4idea/src/git4idea/i18n/GitBundle.java +++ b/plugins/git4idea/src/git4idea/i18n/GitBundle.java @@ -9,28 +9,25 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class GitBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.GitBundle"; - private static final GitBundle INSTANCE = new GitBundle(); +public final class GitBundle { + public static final @NonNls String BUNDLE = "messages.GitBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(GitBundle.class, BUNDLE); - private GitBundle() { super(BUNDLE); } + private GitBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } /** * @deprecated prefer {@link #message(String, Object...)} instead */ - @NotNull @Deprecated - public static @Nls String getString(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key) { + public static @NotNull @Nls String getString(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key) { return message(key); } } \ No newline at end of file diff --git a/plugins/github/src/org/jetbrains/plugins/github/i18n/GithubBundle.java b/plugins/github/src/org/jetbrains/plugins/github/i18n/GithubBundle.java index ed4e1beecc83..6d1cf0e52ef1 100644 --- a/plugins/github/src/org/jetbrains/plugins/github/i18n/GithubBundle.java +++ b/plugins/github/src/org/jetbrains/plugins/github/i18n/GithubBundle.java @@ -9,23 +9,19 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class GithubBundle extends DynamicBundle { +public final class GithubBundle { + private static final @NonNls String BUNDLE = "messages.GithubBundle"; - @NonNls private static final String BUNDLE = "messages.GithubBundle"; - - private static final GithubBundle INSTANCE = new GithubBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(GithubBundle.class, BUNDLE); private GithubBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/gradle/java/src/codeInspection/GradleInspectionBundle.java b/plugins/gradle/java/src/codeInspection/GradleInspectionBundle.java index 72089be2317b..532bca07d822 100644 --- a/plugins/gradle/java/src/codeInspection/GradleInspectionBundle.java +++ b/plugins/gradle/java/src/codeInspection/GradleInspectionBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class GradleInspectionBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.GradleInspectionBundle"; - private static final GradleInspectionBundle INSTANCE = new GradleInspectionBundle(); +public final class GradleInspectionBundle { + private static final @NonNls String BUNDLE = "messages.GradleInspectionBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(GradleInspectionBundle.class, BUNDLE); - private GradleInspectionBundle() { super(BUNDLE); } + private GradleInspectionBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/gradle/jps-plugin/src/org/jetbrains/jps/gradle/GradleJpsBundle.java b/plugins/gradle/jps-plugin/src/org/jetbrains/jps/gradle/GradleJpsBundle.java index 10ad02573097..db20bfca4068 100644 --- a/plugins/gradle/jps-plugin/src/org/jetbrains/jps/gradle/GradleJpsBundle.java +++ b/plugins/gradle/jps-plugin/src/org/jetbrains/jps/gradle/GradleJpsBundle.java @@ -7,24 +7,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; import org.jetbrains.jps.api.JpsDynamicBundle; -import java.util.function.Supplier; - -public final class GradleJpsBundle extends JpsDynamicBundle { - +public final class GradleJpsBundle { private static final @NonNls String BUNDLE = "messages.GradleJpsBundle"; - private static final GradleJpsBundle INSTANCE = new GradleJpsBundle(); + private static final JpsDynamicBundle INSTANCE = new JpsDynamicBundle(GradleJpsBundle.class, BUNDLE); private GradleJpsBundle() { - super(BUNDLE); } public static @Nls @NotNull String message(@PropertyKey(resourceBundle = BUNDLE) @NotNull String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - - public - static @NotNull Supplier<@Nls @NotNull String> messagePointer(@PropertyKey(resourceBundle = BUNDLE) @NotNull String key, - Object @NotNull ... params) { - return INSTANCE.getLazyMessage(key, params); - } } diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.java index 066fe323194c..3918a9112ebe 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyBundle.java @@ -9,13 +9,11 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class GroovyBundle extends DynamicBundle { - +public final class GroovyBundle { public static final @NonNls String BUNDLE = "messages.GroovyBundle"; - private static final GroovyBundle INSTANCE = new GroovyBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(GroovyBundle.class, BUNDLE); private GroovyBundle() { - super(BUNDLE); } public static @Nls @NotNull String message(@PropertyKey(resourceBundle = BUNDLE) @NotNull String key, Object @NotNull ... params) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyDeprecatedMessagesBundle.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyDeprecatedMessagesBundle.java index fecd966df35e..129d542ab24c 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyDeprecatedMessagesBundle.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/GroovyDeprecatedMessagesBundle.java @@ -9,13 +9,11 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -final class GroovyDeprecatedMessagesBundle extends DynamicBundle { - +final class GroovyDeprecatedMessagesBundle { private static final @NonNls String BUNDLE = "messages.GroovyDeprecatedMessagesBundle"; - private static final GroovyDeprecatedMessagesBundle INSTANCE = new GroovyDeprecatedMessagesBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(GroovyDeprecatedMessagesBundle.class, BUNDLE); private GroovyDeprecatedMessagesBundle() { - super(BUNDLE); } public static @Nls @NotNull String message(@PropertyKey(resourceBundle = BUNDLE) @NotNull String key, Object @NotNull ... params) { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/intentions/GroovyIntentionsBundle.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/intentions/GroovyIntentionsBundle.java index 811fe76086f4..51774fe33cda 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/intentions/GroovyIntentionsBundle.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/intentions/GroovyIntentionsBundle.java @@ -10,19 +10,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class GroovyIntentionsBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.GroovyIntentionsBundle"; - private static final GroovyIntentionsBundle INSTANCE = new GroovyIntentionsBundle(); +public final class GroovyIntentionsBundle { + private static final @NonNls String BUNDLE = "messages.GroovyIntentionsBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(GroovyIntentionsBundle.class, BUNDLE); - private GroovyIntentionsBundle() { super(BUNDLE); } + private GroovyIntentionsBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/GrAllVarsInitializedPolicy.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/GrAllVarsInitializedPolicy.java index 6cbfa59e2664..490f9c1d7e43 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/GrAllVarsInitializedPolicy.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/GrAllVarsInitializedPolicy.java @@ -10,7 +10,7 @@ import static org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtilKt.isThisRef /** * @author Max Medvedev */ -public class GrAllVarsInitializedPolicy implements GrControlFlowPolicy { +public final class GrAllVarsInitializedPolicy implements GrControlFlowPolicy { private static final GrControlFlowPolicy INSTANCE = new GrAllVarsInitializedPolicy(); public static GrControlFlowPolicy getInstance() { diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/GrFieldControlFlowPolicy.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/GrFieldControlFlowPolicy.java index f39c7cb812a7..47e3603da9f6 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/GrFieldControlFlowPolicy.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/GrFieldControlFlowPolicy.java @@ -12,7 +12,7 @@ import static org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtilKt.isThisRef /** * @author Max Medvedev */ -public class GrFieldControlFlowPolicy implements GrControlFlowPolicy { +public final class GrFieldControlFlowPolicy implements GrControlFlowPolicy { @Override public boolean isReferenceAccepted(@NotNull GrReferenceExpression ref) { final GrExpression qualifier = ref.getQualifier(); diff --git a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/GrResolverPolicy.java b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/GrResolverPolicy.java index d2aa444dc592..5ec0e0b3b672 100644 --- a/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/GrResolverPolicy.java +++ b/plugins/groovy/groovy-psi/src/org/jetbrains/plugins/groovy/lang/psi/controlFlow/impl/GrResolverPolicy.java @@ -13,7 +13,7 @@ import static org.jetbrains.plugins.groovy.lang.psi.impl.PsiImplUtilKt.isThisRef /** * @author Max Medvedev */ -public class GrResolverPolicy implements GrControlFlowPolicy { +public final class GrResolverPolicy implements GrControlFlowPolicy { @Override public boolean isReferenceAccepted(@NotNull GrReferenceExpression ref) { return !ref.isQualified() || isThisRef(ref.getQualifierExpression()); diff --git a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyJpsBundle.java b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyJpsBundle.java index fb283c4bae05..bd0e43d2bee7 100644 --- a/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyJpsBundle.java +++ b/plugins/groovy/jps-plugin/src/org/jetbrains/jps/incremental/groovy/GroovyJpsBundle.java @@ -7,24 +7,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; import org.jetbrains.jps.api.JpsDynamicBundle; -import java.util.function.Supplier; - -public final class GroovyJpsBundle extends JpsDynamicBundle { - +public final class GroovyJpsBundle { private static final @NonNls String BUNDLE = "messages.GroovyJpsBundle"; - private static final GroovyJpsBundle INSTANCE = new GroovyJpsBundle(); + private static final JpsDynamicBundle INSTANCE = new JpsDynamicBundle(GroovyJpsBundle.class, BUNDLE); private GroovyJpsBundle() { - super(BUNDLE); } public static @Nls @NotNull String message(@PropertyKey(resourceBundle = BUNDLE) @NotNull String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - - public - static @NotNull Supplier<@Nls @NotNull String> messagePointer(@PropertyKey(resourceBundle = BUNDLE) @NotNull String key, - Object @NotNull ... params) { - return INSTANCE.getLazyMessage(key, params); - } } diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringBundle.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringBundle.java index 981327dfb5ce..21b24c08792e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringBundle.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/refactoring/GroovyRefactoringBundle.java @@ -10,19 +10,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class GroovyRefactoringBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.GroovyRefactoringBundle"; - private static final GroovyRefactoringBundle INSTANCE = new GroovyRefactoringBundle(); +public final class GroovyRefactoringBundle { + private static final @NonNls String BUNDLE = "messages.GroovyRefactoringBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(GroovyRefactoringBundle.class, BUNDLE); - private GroovyRefactoringBundle() { super(BUNDLE); } + private GroovyRefactoringBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgBundle.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgBundle.java index 3727ec01ea59..34a8088323b8 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgBundle.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgBundle.java @@ -20,19 +20,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class HgBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.HgBundle"; - private static final HgBundle INSTANCE = new HgBundle(); +public final class HgBundle { + public static final @NonNls String BUNDLE = "messages.HgBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(HgBundle.class, BUNDLE); - private HgBundle() { super(BUNDLE); } + private HgBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/htmltools/src/com/intellij/htmltools/HtmlToolsBundle.java b/plugins/htmltools/src/com/intellij/htmltools/HtmlToolsBundle.java index 3ad907c0a918..c670732b0c83 100644 --- a/plugins/htmltools/src/com/intellij/htmltools/HtmlToolsBundle.java +++ b/plugins/htmltools/src/com/intellij/htmltools/HtmlToolsBundle.java @@ -8,21 +8,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class HtmlToolsBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.HtmlToolsBundle"; - private static final HtmlToolsBundle INSTANCE = new HtmlToolsBundle(); +public final class HtmlToolsBundle { + public static final @NonNls String BUNDLE = "messages.HtmlToolsBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(HtmlToolsBundle.class, BUNDLE); private HtmlToolsBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompilerBundle.kt b/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompilerBundle.kt index 6c74ff6e1a5a..9b4627a573d5 100644 --- a/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompilerBundle.kt +++ b/plugins/java-decompiler/plugin/src/org/jetbrains/java/decompiler/IdeaDecompilerBundle.kt @@ -7,7 +7,9 @@ import org.jetbrains.annotations.PropertyKey private const val BUNDLE = "messages.IdeaDecompilerBundle" -object IdeaDecompilerBundle : DynamicBundle(BUNDLE) { +object IdeaDecompilerBundle { + private val bundle = DynamicBundle(IdeaDecompilerBundle::class.java, BUNDLE) + @JvmStatic @Nls - fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = getMessage(key, *params) + fun message(@PropertyKey(resourceBundle = BUNDLE) key: String, vararg params: Any): String = bundle.getMessage(key, *params) } diff --git a/plugins/java-i18n/src/com/intellij/java/i18n/JavaI18nBundle.java b/plugins/java-i18n/src/com/intellij/java/i18n/JavaI18nBundle.java index 9ceaf20e0f7e..788ae5710bb0 100644 --- a/plugins/java-i18n/src/com/intellij/java/i18n/JavaI18nBundle.java +++ b/plugins/java-i18n/src/com/intellij/java/i18n/JavaI18nBundle.java @@ -9,12 +9,11 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaI18nBundle extends DynamicBundle { +public final class JavaI18nBundle { @NonNls private static final String BUNDLE = "messages.JavaI18nBundle"; - private static final JavaI18nBundle INSTANCE = new JavaI18nBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaI18nBundle.class, BUNDLE); private JavaI18nBundle() { - super(BUNDLE); } @NotNull diff --git a/plugins/javaFX/common-javaFX-plugin/src/org/jetbrains/plugins/javaFX/JavaFXCommonBundle.java b/plugins/javaFX/common-javaFX-plugin/src/org/jetbrains/plugins/javaFX/JavaFXCommonBundle.java index 43e497cc305b..60a52609011d 100644 --- a/plugins/javaFX/common-javaFX-plugin/src/org/jetbrains/plugins/javaFX/JavaFXCommonBundle.java +++ b/plugins/javaFX/common-javaFX-plugin/src/org/jetbrains/plugins/javaFX/JavaFXCommonBundle.java @@ -7,24 +7,15 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; -import java.util.function.Supplier; - -public class JavaFXCommonBundle extends AbstractBundle { - @NonNls private static final String BUNDLE = "messages.JavaFXCommonBundle"; +public final class JavaFXCommonBundle extends AbstractBundle { + private static final @NonNls String BUNDLE = "messages.JavaFXCommonBundle"; private static final JavaFXCommonBundle INSTANCE = new JavaFXCommonBundle(); private JavaFXCommonBundle() { super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { - return INSTANCE.getLazyMessage(key, params); - } } diff --git a/plugins/javaFX/javaFX-jps-plugin/src/org/jetbrains/plugins/javaFX/JavaFXJpsBundle.java b/plugins/javaFX/javaFX-jps-plugin/src/org/jetbrains/plugins/javaFX/JavaFXJpsBundle.java index 1059c1c1c5b4..d34da4134d46 100644 --- a/plugins/javaFX/javaFX-jps-plugin/src/org/jetbrains/plugins/javaFX/JavaFXJpsBundle.java +++ b/plugins/javaFX/javaFX-jps-plugin/src/org/jetbrains/plugins/javaFX/JavaFXJpsBundle.java @@ -7,24 +7,14 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; import org.jetbrains.jps.api.JpsDynamicBundle; -import java.util.function.Supplier; - -public class JavaFXJpsBundle extends JpsDynamicBundle { - +public final class JavaFXJpsBundle { private static final @NonNls String BUNDLE = "messages.JavaFXJpsBundle"; - private static final JavaFXJpsBundle INSTANCE = new JavaFXJpsBundle(); + private static final JpsDynamicBundle INSTANCE = new JpsDynamicBundle(JavaFXJpsBundle.class, BUNDLE); private JavaFXJpsBundle() { - super(BUNDLE); } public static @Nls @NotNull String message(@PropertyKey(resourceBundle = BUNDLE) @NotNull String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - - public - static @NotNull Supplier<@Nls @NotNull String> messagePointer(@PropertyKey(resourceBundle = BUNDLE) @NotNull String key, - Object @NotNull ... params) { - return INSTANCE.getLazyMessage(key, params); - } } \ No newline at end of file diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFXBundle.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFXBundle.java index f9c1ecb3a085..5e41f11baab0 100644 --- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFXBundle.java +++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/JavaFXBundle.java @@ -10,23 +10,20 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JavaFXBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.JavaFXBundle"; - private static final JavaFXBundle INSTANCE = new JavaFXBundle(); +public final class JavaFXBundle { + private static final @NonNls String BUNDLE = "messages.JavaFXBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaFXBundle.class, BUNDLE); public static final @NlsSafe String JAVA_FX = "JavaFX"; private JavaFXBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/junit/src/com/intellij/execution/JUnitBundle.java b/plugins/junit/src/com/intellij/execution/JUnitBundle.java index fa0346ebcd9d..9d91f78fda1c 100644 --- a/plugins/junit/src/com/intellij/execution/JUnitBundle.java +++ b/plugins/junit/src/com/intellij/execution/JUnitBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class JUnitBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.JUnitBundle"; - private static final JUnitBundle INSTANCE = new JUnitBundle(); +public final class JUnitBundle { + private static final @NonNls String BUNDLE = "messages.JUnitBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JUnitBundle.class, BUNDLE); private JUnitBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/move/MoveFilesWithDeclarationsViewDescriptor.kt b/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/move/MoveFilesWithDeclarationsViewDescriptor.kt index 7c4cd9786259..591bd7ed90cf 100644 --- a/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/move/MoveFilesWithDeclarationsViewDescriptor.kt +++ b/plugins/kotlin/refactorings/kotlin.refactorings.common/src/org/jetbrains/kotlin/idea/refactoring/move/MoveFilesWithDeclarationsViewDescriptor.kt @@ -2,6 +2,7 @@ package org.jetbrains.kotlin.idea.refactoring.move +import com.intellij.DynamicBundle import com.intellij.psi.PsiDirectory import com.intellij.psi.PsiElement import com.intellij.refactoring.RefactoringBundle @@ -25,7 +26,7 @@ class MoveFilesWithDeclarationsViewDescriptor( ) } else { RefactoringBundle.message("move.files.elements.header", newParent.virtualFile.presentableUrl) - }.replaceFirstChar { if (it.isLowerCase()) it.titlecase(RefactoringBundle.getLocale()) else it.toString() } + }.replaceFirstChar { if (it.isLowerCase()) it.titlecase(DynamicBundle.getLocale()) else it.toString() } @Nls private val codeReferencesText = if (elements.size == 1) KotlinBundle.message( diff --git a/plugins/markdown/core/src/org/intellij/plugins/markdown/MarkdownBundle.java b/plugins/markdown/core/src/org/intellij/plugins/markdown/MarkdownBundle.java index 5b284d3124c6..900be83e424d 100644 --- a/plugins/markdown/core/src/org/intellij/plugins/markdown/MarkdownBundle.java +++ b/plugins/markdown/core/src/org/intellij/plugins/markdown/MarkdownBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class MarkdownBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.MarkdownBundle"; - private static final MarkdownBundle INSTANCE = new MarkdownBundle(); +public final class MarkdownBundle { + private static final @NonNls String BUNDLE = "messages.MarkdownBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(MarkdownBundle.class, BUNDLE); - private MarkdownBundle() { super(BUNDLE); } + private MarkdownBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/MavenJpsBundle.java b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/MavenJpsBundle.java index d6ce7dc4090a..a04e0266457e 100644 --- a/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/MavenJpsBundle.java +++ b/plugins/maven/jps-plugin/src/org/jetbrains/jps/maven/MavenJpsBundle.java @@ -9,13 +9,11 @@ import org.jetbrains.jps.api.JpsDynamicBundle; import java.util.function.Supplier; -public final class MavenJpsBundle extends JpsDynamicBundle { - +public final class MavenJpsBundle { private static final @NonNls String BUNDLE = "messages.MavenJpsBundle"; - private static final MavenJpsBundle INSTANCE = new MavenJpsBundle(); + private static final JpsDynamicBundle INSTANCE = new JpsDynamicBundle(MavenJpsBundle.class, BUNDLE); private MavenJpsBundle() { - super(BUNDLE); } public static @Nls @NotNull String message(@PropertyKey(resourceBundle = BUNDLE) @NotNull String key, Object @NotNull ... params) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomBundle.java index 0b81e6bca7f7..5f5e35aa3a83 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomBundle.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/MavenDomBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class MavenDomBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.MavenDomBundle"; - private static final MavenDomBundle INSTANCE = new MavenDomBundle(); +public final class MavenDomBundle { + private static final @NonNls String BUNDLE = "messages.MavenDomBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(MavenDomBundle.class, BUNDLE); - private MavenDomBundle() { super(BUNDLE); } + private MavenDomBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java index 1d9f390d810e..a1365c6ca5d7 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/IndicesBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class IndicesBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.MavenIndicesBundle"; - private static final IndicesBundle INSTANCE = new IndicesBundle(); +public final class IndicesBundle { + private static final @NonNls String BUNDLE = "messages.MavenIndicesBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(IndicesBundle.class, BUNDLE); - private IndicesBundle() { super(BUNDLE); } + private IndicesBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenConfigurableBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenConfigurableBundle.java index 06e170130de6..e8a855317a7f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenConfigurableBundle.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenConfigurableBundle.java @@ -7,14 +7,13 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; -public final class MavenConfigurableBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.MavenConfigurableBundle"; - private static final MavenConfigurableBundle INSTANCE = new MavenConfigurableBundle(); +public final class MavenConfigurableBundle { + private static final @NonNls String BUNDLE = "messages.MavenConfigurableBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(MavenConfigurableBundle.class, BUNDLE); - private MavenConfigurableBundle() { super(BUNDLE); } + private MavenConfigurableBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } } \ No newline at end of file diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectBundle.java index fcd50911a69b..1621e4500b30 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectBundle.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class MavenProjectBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.MavenProjectBundle"; - private static final MavenProjectBundle INSTANCE = new MavenProjectBundle(); +public final class MavenProjectBundle { + private static final @NonNls String BUNDLE = "messages.MavenProjectBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(MavenProjectBundle.class, BUNDLE); - private MavenProjectBundle() { super(BUNDLE); } + private MavenProjectBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java index ce8ff85d4188..5c6d406472e3 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/tasks/TasksBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class TasksBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.MavenTasksBundle"; - private static final TasksBundle INSTANCE = new TasksBundle(); +public final class TasksBundle { + public static final @NonNls String BUNDLE = "messages.MavenTasksBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(TasksBundle.class, BUNDLE); - private TasksBundle() { super(BUNDLE); } + private TasksBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenWizardBundle.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenWizardBundle.java index 45a9183cbab0..20a922343f57 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenWizardBundle.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenWizardBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class MavenWizardBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.MavenWizardBundle"; - private static final MavenWizardBundle INSTANCE = new MavenWizardBundle(); +public final class MavenWizardBundle { + private static final @NonNls String BUNDLE = "messages.MavenWizardBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(MavenWizardBundle.class, BUNDLE); - private MavenWizardBundle() { super(BUNDLE); } + private MavenWizardBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/PerformanceTestingBundle.java b/plugins/performanceTesting/src/com/jetbrains/performancePlugin/PerformanceTestingBundle.java index fc228079e700..0648651b6f21 100644 --- a/plugins/performanceTesting/src/com/jetbrains/performancePlugin/PerformanceTestingBundle.java +++ b/plugins/performanceTesting/src/com/jetbrains/performancePlugin/PerformanceTestingBundle.java @@ -8,19 +8,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class PerformanceTestingBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.PerformanceTestingBundle"; - private static final PerformanceTestingBundle INSTANCE = new PerformanceTestingBundle(); +public final class PerformanceTestingBundle { + private static final @NonNls String BUNDLE = "messages.PerformanceTestingBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(PerformanceTestingBundle.class, BUNDLE); - private PerformanceTestingBundle() { super(BUNDLE); } + private PerformanceTestingBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesBundle.java b/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesBundle.java index 3f0f67307b08..b50318a830ed 100644 --- a/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesBundle.java +++ b/plugins/properties/properties-psi-api/src/com/intellij/lang/properties/PropertiesBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class PropertiesBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.PropertiesBundle"; - private static final PropertiesBundle INSTANCE = new PropertiesBundle(); +public final class PropertiesBundle { + private static final @NonNls String BUNDLE = "messages.PropertiesBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(PropertiesBundle.class, BUNDLE); - private PropertiesBundle() { super(BUNDLE); } + private PropertiesBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/ResourceBundleEditorBundle.java b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/ResourceBundleEditorBundle.java index 46392274f767..22fb464bd6d1 100644 --- a/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/ResourceBundleEditorBundle.java +++ b/plugins/properties/properties-resource-bundle-editor/src/com/intellij/lang/properties/editor/ResourceBundleEditorBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class ResourceBundleEditorBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.ResourceBundleEditorBundle"; - private static final ResourceBundleEditorBundle INSTANCE = new ResourceBundleEditorBundle(); +public final class ResourceBundleEditorBundle { + private static final @NonNls String BUNDLE = "messages.ResourceBundleEditorBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(ResourceBundleEditorBundle.class, BUNDLE); - private ResourceBundleEditorBundle() { super(BUNDLE); } + private ResourceBundleEditorBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/rareJavaRefactorings/src/com/intellij/refactoring/JavaRareRefactoringsBundle.java b/plugins/rareJavaRefactorings/src/com/intellij/refactoring/JavaRareRefactoringsBundle.java index 630964e77f48..a395b69243d6 100644 --- a/plugins/rareJavaRefactorings/src/com/intellij/refactoring/JavaRareRefactoringsBundle.java +++ b/plugins/rareJavaRefactorings/src/com/intellij/refactoring/JavaRareRefactoringsBundle.java @@ -7,25 +7,15 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; -import java.util.function.Supplier; - -public class JavaRareRefactoringsBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.JavaRareRefactoringsBundle"; - private static final JavaRareRefactoringsBundle INSTANCE = new JavaRareRefactoringsBundle(); +public final class JavaRareRefactoringsBundle { + private static final @NonNls String BUNDLE = "messages.JavaRareRefactoringsBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(JavaRareRefactoringsBundle.class, BUNDLE); private JavaRareRefactoringsBundle() { - super(BUNDLE); } - @NotNull - public static @Nls + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { - return INSTANCE.getLazyMessage(key, params); - } } diff --git a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBundle.kt b/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBundle.kt index bfa043efeb86..42aa887cce91 100644 --- a/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBundle.kt +++ b/plugins/settings-sync/src/com/intellij/settingsSync/SettingsSyncBundle.kt @@ -8,9 +8,9 @@ import org.jetbrains.annotations.PropertyKey private const val PATH_TO_BUNDLE = "messages.SettingsSyncBundle" @ApiStatus.Internal -object SettingsSyncBundle : DynamicBundle(PATH_TO_BUNDLE) { - +object SettingsSyncBundle { + private val bundle = DynamicBundle(SettingsSyncBundle::class.java, PATH_TO_BUNDLE) fun message(@PropertyKey(resourceBundle = PATH_TO_BUNDLE) key: String, vararg params: Any) : @Nls String { - return getMessage(key, *params) + return bundle.getMessage(key, *params) } } \ No newline at end of file diff --git a/plugins/sh/core/src/com/intellij/sh/ShBundle.java b/plugins/sh/core/src/com/intellij/sh/ShBundle.java index 8905458574af..cddaac11db05 100644 --- a/plugins/sh/core/src/com/intellij/sh/ShBundle.java +++ b/plugins/sh/core/src/com/intellij/sh/ShBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class ShBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.ShBundle"; - private static final ShBundle INSTANCE = new ShBundle(); +public final class ShBundle { + public static final @NonNls String BUNDLE = "messages.ShBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(ShBundle.class, BUNDLE); - private ShBundle() { super(BUNDLE); } + private ShBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/stream-debugger/src/com/intellij/debugger/streams/StreamDebuggerBundle.java b/plugins/stream-debugger/src/com/intellij/debugger/streams/StreamDebuggerBundle.java index badba62cec77..5e4be7d7e879 100644 --- a/plugins/stream-debugger/src/com/intellij/debugger/streams/StreamDebuggerBundle.java +++ b/plugins/stream-debugger/src/com/intellij/debugger/streams/StreamDebuggerBundle.java @@ -6,14 +6,13 @@ import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; -public final class StreamDebuggerBundle extends DynamicBundle { +public final class StreamDebuggerBundle { private static final String BUNDLE = "messages.StreamDebuggerBundle"; - private static final StreamDebuggerBundle INSTANCE = new StreamDebuggerBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(StreamDebuggerBundle.class, BUNDLE); - private StreamDebuggerBundle() { super(BUNDLE); } + private StreamDebuggerBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, @NotNull Object... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, @NotNull Object... params) { return INSTANCE.getMessage(key, params); } } \ No newline at end of file diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.java index f3a3c4b0845b..29ee42272e2e 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnBundle.java @@ -2,26 +2,26 @@ package org.jetbrains.idea.svn; import com.intellij.DynamicBundle; -import org.jetbrains.annotations.*; +import org.jetbrains.annotations.Nls; +import org.jetbrains.annotations.NonNls; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class SvnBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.SvnBundle"; +public final class SvnBundle { + public static final @NonNls String BUNDLE = "messages.SvnBundle"; - private static final SvnBundle INSTANCE = new SvnBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(SvnBundle.class, BUNDLE); private SvnBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/testng/src/com/theoryinpractice/testng/TestngBundle.java b/plugins/testng/src/com/theoryinpractice/testng/TestngBundle.java index 3cf5951d1efb..100a60c2dd21 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/TestngBundle.java +++ b/plugins/testng/src/com/theoryinpractice/testng/TestngBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class TestngBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.TestngBundle"; - private static final TestngBundle INSTANCE = new TestngBundle(); +public final class TestngBundle { + private static final @NonNls String BUNDLE = "messages.TestngBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(TestngBundle.class, BUNDLE); private TestngBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateBundle.java b/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateBundle.java index 8fd409d6fe33..6145bbc5771a 100644 --- a/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateBundle.java +++ b/plugins/textmate/src/org/jetbrains/plugins/textmate/TextMateBundle.java @@ -7,19 +7,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class TextMateBundle extends DynamicBundle { +public final class TextMateBundle { private static final String BUNDLE = "messages.TextMateBundle"; - private static final TextMateBundle INSTANCE = new TextMateBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(TextMateBundle.class, BUNDLE); - private TextMateBundle() { super(BUNDLE); } + private TextMateBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/ui-designer-core/src/com/intellij/designer/DesignerBundle.java b/plugins/ui-designer-core/src/com/intellij/designer/DesignerBundle.java index e8788555b3b8..049e675fa57e 100644 --- a/plugins/ui-designer-core/src/com/intellij/designer/DesignerBundle.java +++ b/plugins/ui-designer-core/src/com/intellij/designer/DesignerBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class DesignerBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.DesignerBundle"; - private static final DesignerBundle INSTANCE = new DesignerBundle(); +public final class DesignerBundle { + private static final @NonNls String BUNDLE = "messages.DesignerBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(DesignerBundle.class, BUNDLE); - private DesignerBundle() { super(BUNDLE); } + private DesignerBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormBundle.java b/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormBundle.java index 6bdfcbca3f5a..f9fd12531477 100644 --- a/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormBundle.java +++ b/plugins/ui-designer/jps-plugin/src/org/jetbrains/jps/uiDesigner/compiler/FormBundle.java @@ -9,12 +9,11 @@ import org.jetbrains.jps.api.JpsDynamicBundle; /** * @author Alexander Lobas */ -public class FormBundle extends JpsDynamicBundle { +public final class FormBundle { private static final String BUNDLE = "messages.FormBundle"; - private static final FormBundle INSTANCE = new FormBundle(); + private static final JpsDynamicBundle INSTANCE = new JpsDynamicBundle(FormBundle.class, BUNDLE); private FormBundle() { - super(BUNDLE); } public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/UIDesignerBundle.java b/plugins/ui-designer/src/com/intellij/uiDesigner/UIDesignerBundle.java index aecf5b83f7bd..356a3fe234e4 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/UIDesignerBundle.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/UIDesignerBundle.java @@ -9,19 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class UIDesignerBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.UIDesignerBundle"; - private static final UIDesignerBundle INSTANCE = new UIDesignerBundle(); +public final class UIDesignerBundle { + private static final @NonNls String BUNDLE = "messages.UIDesignerBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(UIDesignerBundle.class, BUNDLE); - private UIDesignerBundle() { super(BUNDLE); } + private UIDesignerBundle() { + } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/TestNamespaceContext.java b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/TestNamespaceContext.java index e5cb4bc42f3d..fd53a6602e35 100644 --- a/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/TestNamespaceContext.java +++ b/plugins/xpath/xpath-lang/test/org/intellij/lang/xpath/TestNamespaceContext.java @@ -17,7 +17,7 @@ import org.jetbrains.annotations.TestOnly; import java.util.Collection; import java.util.Collections; -class TestNamespaceContext implements NamespaceContext { +final class TestNamespaceContext implements NamespaceContext { private static final TestNamespaceContext INSTANCE = new TestNamespaceContext(); @TestOnly diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathBundle.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathBundle.java index e3bf79a5c457..8b9d6c4e5d12 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathBundle.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/XPathBundle.java @@ -9,12 +9,11 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class XPathBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.XPathBundle"; - private static final XPathBundle INSTANCE = new XPathBundle(); +public final class XPathBundle { + private static final @NonNls String BUNDLE = "messages.XPathBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(XPathBundle.class, BUNDLE); private XPathBundle() { - super(BUNDLE); } public static @Nls String partialMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, @@ -23,13 +22,11 @@ public final class XPathBundle extends DynamicBundle { return INSTANCE.getPartialMessage(key, unassignedParams, params); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerBundle.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerBundle.java index ce17e81e2d78..d2d9f17e1816 100644 --- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerBundle.java +++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerBundle.java @@ -11,24 +11,20 @@ import java.util.function.Supplier; /** * (c) 2020 Silent Forest AB - * created: 06 August 2020 */ -public class XsltDebuggerBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.XsltDebuggerBundle"; - private static final XsltDebuggerBundle INSTANCE = new XsltDebuggerBundle(); +public final class XsltDebuggerBundle { + private static final @NonNls String BUNDLE = "messages.XsltDebuggerBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(XsltDebuggerBundle.class, BUNDLE); private XsltDebuggerBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, - Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, + Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/plugins/yaml/src/org/jetbrains/yaml/YAMLBundle.java b/plugins/yaml/src/org/jetbrains/yaml/YAMLBundle.java index 01b73323046d..65544497ae64 100644 --- a/plugins/yaml/src/org/jetbrains/yaml/YAMLBundle.java +++ b/plugins/yaml/src/org/jetbrains/yaml/YAMLBundle.java @@ -9,19 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class YAMLBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.YAMLBundle"; - private static final YAMLBundle INSTANCE = new YAMLBundle(); +public final class YAMLBundle { + private static final @NonNls String BUNDLE = "messages.YAMLBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(YAMLBundle.class, BUNDLE); - private YAMLBundle() { super(BUNDLE); } + private YAMLBundle() { + } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/python/ide/impl/src/com/jetbrains/python/PyCharmCommunityCustomizationBundle.java b/python/ide/impl/src/com/jetbrains/python/PyCharmCommunityCustomizationBundle.java index 211066887034..0b02333d4a3b 100644 --- a/python/ide/impl/src/com/jetbrains/python/PyCharmCommunityCustomizationBundle.java +++ b/python/ide/impl/src/com/jetbrains/python/PyCharmCommunityCustomizationBundle.java @@ -7,14 +7,13 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; -public final class PyCharmCommunityCustomizationBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.PyCharmCommunityCustomizationBundle"; - private static final PyCharmCommunityCustomizationBundle INSTANCE = new PyCharmCommunityCustomizationBundle(); +public final class PyCharmCommunityCustomizationBundle { + private static final @NonNls String BUNDLE = "messages.PyCharmCommunityCustomizationBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(PyCharmCommunityCustomizationBundle.class, BUNDLE); - private PyCharmCommunityCustomizationBundle() { super(BUNDLE); } + private PyCharmCommunityCustomizationBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } } diff --git a/python/ide/impl/src/com/jetbrains/python/newProject/welcome/PyWelcomeBundle.java b/python/ide/impl/src/com/jetbrains/python/newProject/welcome/PyWelcomeBundle.java index 64244bf2d73a..2c496c38ca96 100644 --- a/python/ide/impl/src/com/jetbrains/python/newProject/welcome/PyWelcomeBundle.java +++ b/python/ide/impl/src/com/jetbrains/python/newProject/welcome/PyWelcomeBundle.java @@ -7,14 +7,13 @@ import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.PropertyKey; -public final class PyWelcomeBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.PyWelcomeBundle"; - private static final PyWelcomeBundle INSTANCE = new PyWelcomeBundle(); +public final class PyWelcomeBundle { + private static final @NonNls String BUNDLE = "messages.PyWelcomeBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(PyWelcomeBundle.class, BUNDLE); - private PyWelcomeBundle() { super(BUNDLE); } + private PyWelcomeBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } } diff --git a/python/python-terminal/src/com/jetbrains/python/sdk/PyTerminalBundle.java b/python/python-terminal/src/com/jetbrains/python/sdk/PyTerminalBundle.java index 066037a1e253..917d8eb51487 100644 --- a/python/python-terminal/src/com/jetbrains/python/sdk/PyTerminalBundle.java +++ b/python/python-terminal/src/com/jetbrains/python/sdk/PyTerminalBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class PyTerminalBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.PyTerminalBundle"; - private static final PyTerminalBundle INSTANCE = new PyTerminalBundle(); +public final class PyTerminalBundle { + private static final @NonNls String BUNDLE = "messages.PyTerminalBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(PyTerminalBundle.class, BUNDLE); private PyTerminalBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/python/rest/src/com/jetbrains/rest/RestBundle.java b/python/rest/src/com/jetbrains/rest/RestBundle.java index 3716502cd70d..04012a9c634d 100644 --- a/python/rest/src/com/jetbrains/rest/RestBundle.java +++ b/python/rest/src/com/jetbrains/rest/RestBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class RestBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.RestBundle"; - private static final RestBundle INSTANCE = new RestBundle(); +public final class RestBundle { + private static final @NonNls String BUNDLE = "messages.RestBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(RestBundle.class, BUNDLE); - private RestBundle() { super(BUNDLE); } + private RestBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/python/src/com/jetbrains/python/debugger/PyDebuggerEditorsProvider.java b/python/src/com/jetbrains/python/debugger/PyDebuggerEditorsProvider.java index 1280ab3f0942..92b206810c30 100644 --- a/python/src/com/jetbrains/python/debugger/PyDebuggerEditorsProvider.java +++ b/python/src/com/jetbrains/python/debugger/PyDebuggerEditorsProvider.java @@ -34,19 +34,16 @@ import org.jetbrains.annotations.Nullable; public class PyDebuggerEditorsProvider extends XDebuggerEditorsProvider { - - @NotNull @Override - public FileType getFileType() { + public @NotNull FileType getFileType() { return PythonFileType.INSTANCE; } - @NotNull @Override - public Document createDocument(@NotNull final Project project, - @NotNull String text, - @Nullable final XSourcePosition sourcePosition, - @NotNull EvaluationMode mode) { + public @NotNull Document createDocument(final @NotNull Project project, + @NotNull String text, + final @Nullable XSourcePosition sourcePosition, + @NotNull EvaluationMode mode) { text = text.trim(); final PyExpressionCodeFragmentImpl fragment = new PyExpressionCodeFragmentImpl(project, "fragment.py", text, true); @@ -57,9 +54,8 @@ public class PyDebuggerEditorsProvider extends XDebuggerEditorsProvider { return PsiDocumentManager.getInstance(project).getDocument(fragment); } - @Nullable @VisibleForTesting - public static PsiElement getContextElement(final Project project, XSourcePosition sourcePosition) { + public static @Nullable PsiElement getContextElement(final Project project, XSourcePosition sourcePosition) { if (sourcePosition != null) { final Document document = FileDocumentManager.getInstance().getDocument(sourcePosition.getFile()); final PsiFile psiFile = PsiDocumentManager.getInstance(project).getPsiFile(document); @@ -81,7 +77,7 @@ public class PyDebuggerEditorsProvider extends XDebuggerEditorsProvider { return null; } - private static class PyInlineDebuggerHelper extends InlineDebuggerHelper { + private static final class PyInlineDebuggerHelper extends InlineDebuggerHelper { private static final PyInlineDebuggerHelper INSTANCE = new PyInlineDebuggerHelper(); @Override @@ -90,9 +86,8 @@ public class PyDebuggerEditorsProvider extends XDebuggerEditorsProvider { } } - @NotNull @Override - public InlineDebuggerHelper getInlineDebuggerHelper() { + public @NotNull InlineDebuggerHelper getInlineDebuggerHelper() { return PyInlineDebuggerHelper.INSTANCE; } } diff --git a/python/src/com/jetbrains/python/debugger/PyUnitTestsDebuggingService.java b/python/src/com/jetbrains/python/debugger/PyUnitTestsDebuggingService.java index 74c9d90d5f97..a8aca840efd5 100644 --- a/python/src/com/jetbrains/python/debugger/PyUnitTestsDebuggingService.java +++ b/python/src/com/jetbrains/python/debugger/PyUnitTestsDebuggingService.java @@ -44,7 +44,6 @@ import java.util.*; @Service final class PyUnitTestsDebuggingService { - private static final @NotNull Map>> ourActiveInlays = new WeakHashMap<>(); private static final @NotNull Map, ComponentListener> ourEditorListeners = Maps.newHashMap(); @@ -142,9 +141,9 @@ final class PyUnitTestsDebuggingService { private static final class FailedTestInlayRenderer implements EditorCustomElementRenderer { - private final static float HEIGHT_FACTOR = .5f; - private final static short RIGHT_BAR_THICKNESS = 2; - private final static short INLAY_TEXT_INDENT = 10; + private static final float HEIGHT_FACTOR = .5f; + private static final short RIGHT_BAR_THICKNESS = 2; + private static final short INLAY_TEXT_INDENT = 10; private final @NotNull String myExceptionType; private final @NotNull String myErrorMessage; @@ -252,7 +251,6 @@ final class PyUnitTestsDebuggingService { } private static final class FailedTestGutterIconRenderer extends GutterIconRenderer { - private static final FailedTestGutterIconRenderer INSTANCE = new FailedTestGutterIconRenderer(); private FailedTestGutterIconRenderer() {} diff --git a/spellchecker/src/com/intellij/spellchecker/inspections/CommentSplitter.java b/spellchecker/src/com/intellij/spellchecker/inspections/CommentSplitter.java index 7e90ac80b914..8ca989b6f3fb 100644 --- a/spellchecker/src/com/intellij/spellchecker/inspections/CommentSplitter.java +++ b/spellchecker/src/com/intellij/spellchecker/inspections/CommentSplitter.java @@ -24,7 +24,7 @@ import org.jetbrains.annotations.Nullable; import java.util.List; import java.util.regex.Pattern; -public class CommentSplitter extends BaseSplitter { +public final class CommentSplitter extends BaseSplitter { private static final Pattern HTML = Pattern.compile("<(\\S+?)[^<>]*?>(.*?)"); private static final CommentSplitter INSTANCE = new CommentSplitter(); diff --git a/spellchecker/src/com/intellij/spellchecker/inspections/PropertiesSplitter.java b/spellchecker/src/com/intellij/spellchecker/inspections/PropertiesSplitter.java index 1a317f3f1a2c..0e21ff90559e 100644 --- a/spellchecker/src/com/intellij/spellchecker/inspections/PropertiesSplitter.java +++ b/spellchecker/src/com/intellij/spellchecker/inspections/PropertiesSplitter.java @@ -26,15 +26,14 @@ import org.jetbrains.annotations.Nullable; import java.util.regex.Matcher; import java.util.regex.Pattern; -public class PropertiesSplitter extends BaseSplitter { +public final class PropertiesSplitter extends BaseSplitter { private static final PropertiesSplitter INSTANCE = new PropertiesSplitter(); public static PropertiesSplitter getInstance() { return INSTANCE; } - @NonNls - private static final Pattern WORD = Pattern.compile("\\p{L}*"); + private static final @NonNls Pattern WORD = Pattern.compile("\\p{L}*"); @Override public void split(@Nullable String text, @NotNull TextRange range, Consumer consumer) { diff --git a/spellchecker/src/com/intellij/spellchecker/inspections/WordSplitter.java b/spellchecker/src/com/intellij/spellchecker/inspections/WordSplitter.java index c30a79ffb9e2..1d59957a5f73 100644 --- a/spellchecker/src/com/intellij/spellchecker/inspections/WordSplitter.java +++ b/spellchecker/src/com/intellij/spellchecker/inspections/WordSplitter.java @@ -25,16 +25,14 @@ import org.jetbrains.annotations.Nullable; import java.util.regex.Matcher; import java.util.regex.Pattern; - -public class WordSplitter extends BaseSplitter { +public final class WordSplitter extends BaseSplitter { private static final WordSplitter INSTANCE = new WordSplitter(); public static WordSplitter getInstance() { return INSTANCE; } - @NonNls - private static final Pattern SPECIAL = Pattern.compile("&\\p{Alnum}{2};?|#\\p{Alnum}{3,6}|0x\\p{Alnum}?"); + private static final @NonNls Pattern SPECIAL = Pattern.compile("&\\p{Alnum}{2};?|#\\p{Alnum}{3,6}|0x\\p{Alnum}?"); @Override public void split(@Nullable String text, @NotNull TextRange range, Consumer consumer) { diff --git a/xml/dom-openapi/src/com/intellij/util/xml/XmlDomBundle.java b/xml/dom-openapi/src/com/intellij/util/xml/XmlDomBundle.java index 89ca62b48976..541fc9aa8b1f 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/XmlDomBundle.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/XmlDomBundle.java @@ -1,5 +1,4 @@ // Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. - package com.intellij.util.xml; import com.intellij.DynamicBundle; @@ -10,19 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class XmlDomBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.XmlDomBundle"; - private static final XmlDomBundle INSTANCE = new XmlDomBundle(); +public final class XmlDomBundle { + public static final @NonNls String BUNDLE = "messages.XmlDomBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(XmlDomBundle.class, BUNDLE); - private XmlDomBundle() { super(BUNDLE); } + private XmlDomBundle() { + } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/xml/openapi/src/com/intellij/xml/XmlBundle.java b/xml/openapi/src/com/intellij/xml/XmlBundle.java index cb88b6d5cfe0..013918c865e0 100644 --- a/xml/openapi/src/com/intellij/xml/XmlBundle.java +++ b/xml/openapi/src/com/intellij/xml/XmlBundle.java @@ -9,19 +9,17 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class XmlBundle extends DynamicBundle { - @NonNls public static final String BUNDLE = "messages.XmlBundle"; - private static final XmlBundle INSTANCE = new XmlBundle(); +public final class XmlBundle { + public static final @NonNls String BUNDLE = "messages.XmlBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(XmlBundle.class, BUNDLE); - private XmlBundle() { super(BUNDLE); } + private XmlBundle() {} - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } \ No newline at end of file diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/RelaxngBundle.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/RelaxngBundle.java index 94402579338c..b5d8152ee468 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/RelaxngBundle.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/RelaxngBundle.java @@ -9,21 +9,18 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class RelaxngBundle extends DynamicBundle { - @NonNls private static final String BUNDLE = "messages.RelaxngBundle"; - private static final RelaxngBundle INSTANCE = new RelaxngBundle(); +public final class RelaxngBundle { + private static final @NonNls String BUNDLE = "messages.RelaxngBundle"; + private static final DynamicBundle INSTANCE = new DynamicBundle(RelaxngBundle.class, BUNDLE); private RelaxngBundle() { - super(BUNDLE); } - @NotNull - public static @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull @Nls String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getMessage(key, params); } - @NotNull - public static Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/RngSchemaValidator.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/RngSchemaValidator.java index b2b84b074d07..534111cb0987 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/RngSchemaValidator.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/validation/RngSchemaValidator.java @@ -51,12 +51,11 @@ import java.net.URL; import java.util.ArrayList; import java.util.List; -public class RngSchemaValidator extends ExternalAnnotator { +public final class RngSchemaValidator extends ExternalAnnotator { private static final Logger LOG = Logger.getInstance(RngSchemaValidator.class.getName()); - @Nullable @Override - public MyValidationMessageConsumer collectInformation(@NotNull final PsiFile file) { + public @Nullable MyValidationMessageConsumer collectInformation(final @NotNull PsiFile file) { final FileType type = file.getFileType(); if (type != XmlFileType.INSTANCE && type != RncFileType.getInstance()) { return null; @@ -98,9 +97,8 @@ public class RngSchemaValidator extends ExternalAnnotator messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { + public static @NotNull Supplier<@Nls String> messagePointer(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) { return INSTANCE.getLazyMessage(key, params); } } diff --git a/xml/xml-psi-api/src/com/intellij/xml/psi/XmlPsiBundle.java b/xml/xml-psi-api/src/com/intellij/xml/psi/XmlPsiBundle.java index 978243b23ab0..7e2ea1e3a138 100644 --- a/xml/xml-psi-api/src/com/intellij/xml/psi/XmlPsiBundle.java +++ b/xml/xml-psi-api/src/com/intellij/xml/psi/XmlPsiBundle.java @@ -9,12 +9,11 @@ import org.jetbrains.annotations.PropertyKey; import java.util.function.Supplier; -public final class XmlPsiBundle extends DynamicBundle { +public final class XmlPsiBundle { @NonNls private static final String BUNDLE = "messages.XmlPsiBundle"; - private static final XmlPsiBundle INSTANCE = new XmlPsiBundle(); + private static final DynamicBundle INSTANCE = new DynamicBundle(XmlPsiBundle.class, BUNDLE); private XmlPsiBundle() { - super(BUNDLE); } @NotNull