From a77f1a6c3c489f5f5679dad4204ee5f5bbd37e15 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Thu, 13 Feb 2020 19:03:22 +0300
Subject: [PATCH] [platform] move properties used in java.indexing* modules to
 a separate bundle (IDEA-209382)

GitOrigin-RevId: 860146aacc4e58c472763131322e4609336a573c
---
 .../intellij.java.indexing.iml                |  1 +
 .../messages/JavaIndexingBundle.properties    |  3 ++
 .../java/indexing/JavaIndexingBundle.java     | 28 +++++++++++++++++++
 .../search/JavaClassInheritorsSearcher.java   |  5 ++--
 4 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 java/java-indexing-api/resources/messages/JavaIndexingBundle.properties
 create mode 100644 java/java-indexing-api/src/com/intellij/java/indexing/JavaIndexingBundle.java

diff --git a/java/java-indexing-api/intellij.java.indexing.iml b/java/java-indexing-api/intellij.java.indexing.iml
index 2c216d406220..d434ec8b62b1 100644
--- a/java/java-indexing-api/intellij.java.indexing.iml
+++ b/java/java-indexing-api/intellij.java.indexing.iml
@@ -4,6 +4,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/java/java-indexing-api/resources/messages/JavaIndexingBundle.properties b/java/java-indexing-api/resources/messages/JavaIndexingBundle.properties
new file mode 100644
index 000000000000..13109e85bd73
--- /dev/null
+++ b/java/java-indexing-api/resources/messages/JavaIndexingBundle.properties
@@ -0,0 +1,3 @@
+
+psi.search.inheritors.of.class.progress=Searching for inheritors of {0}...
+psi.search.inheritors.progress=Searching for inheritors...
\ No newline at end of file
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
new file mode 100644
index 000000000000..e0b0edc50d8b
--- /dev/null
+++ b/java/java-indexing-api/src/com/intellij/java/indexing/JavaIndexingBundle.java
@@ -0,0 +1,28 @@
+// 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.java.indexing;
+
+import com.intellij.DynamicBundle;
+import org.jetbrains.annotations.NonNls;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.PropertyKey;
+
+import java.util.function.Supplier;
+
+public class JavaIndexingBundle extends DynamicBundle {
+  @NonNls private static final String BUNDLE = "messages.JavaIndexingBundle";
+  private static final JavaIndexingBundle INSTANCE = new JavaIndexingBundle();
+
+  private JavaIndexingBundle() {
+    super(BUNDLE);
+  }
+
+  @NotNull
+  public static String message(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getMessage(key, params);
+  }
+
+  @NotNull
+  public static Supplier<String> lazyMessage(@NotNull @PropertyKey(resourceBundle = BUNDLE) String key, Object @NotNull ... params) {
+    return INSTANCE.getLazyMessage(key, params);
+  }
+}
diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
index f49f4f03f80d..bf5d3cf09e88 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
@@ -1,6 +1,7 @@
 // Copyright 2000-2018 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.psi.impl.search;
 
+import com.intellij.java.indexing.JavaIndexingBundle;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.QueryExecutorBase;
 import com.intellij.openapi.application.ReadAction;
@@ -38,8 +39,8 @@ public class JavaClassInheritorsSearcher extends QueryExecutorBase<PsiClass, Cla
       progress.pushState();
       String className = ReadAction.compute(baseClass::getName);
       progress.setText(className != null ?
-                       PsiBundle.message("psi.search.inheritors.of.class.progress", className) :
-                       PsiBundle.message("psi.search.inheritors.progress"));
+                       JavaIndexingBundle.message("psi.search.inheritors.of.class.progress", className) :
+                       JavaIndexingBundle.message("psi.search.inheritors.progress"));
     }
 
     try {