MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-03-22 15:19:59 +07:00
Code Issues Packages Projects Releases Wiki Activity

move RuntimeBundle to messages package (IDEA-255142)

Browse Source 
GitOrigin-RevId: f5d87f94f8715a591d35cfc182b2995b9520c584
This commit is contained in:
Anna Kozlova
2020-11-17 21:16:00 +01:00
committed by intellij-monorepo-bot
parent c0f7c524e4
commit c9ba8a117f
8 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/java-runtime/intellij.java.rt.iml
View File

@@ -6,6 +6,7 @@
<root url="file://$MODULE_DIR$/anno" />
</annotation-paths>
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />

0
java/java-runtime/src/RuntimeBundle.properties → java/java-runtime/resources/messages/RuntimeBundle.properties
View File

2
java/java-runtime/src/com/intellij/uiDesigner/FormPreviewFrame.java
View File

@@ -10,7 +10,7 @@ import java.util.ResourceBundle;
public class FormPreviewFrame {
private JComponent myComponent;
private static final ResourceBundle ourBundle = ResourceBundle.getBundle("RuntimeBundle");
private static final ResourceBundle ourBundle = ResourceBundle.getBundle("messages.RuntimeBundle");
// Note: this class should not be obfuscated

2
plugins/junit_rt/src/com/intellij/junit3/TestRunnerUtil.java
View File

@@ -20,7 +20,7 @@ import java.util.ResourceBundle;
public final class TestRunnerUtil {
/** @noinspection HardCodedStringLiteral*/
private static final ResourceBundle ourBundle = ResourceBundle.getBundle("RuntimeBundle");
private static final ResourceBundle ourBundle = ResourceBundle.getBundle("messages.RuntimeBundle");
public static Test getTestSuite(JUnit3IdeaTestRunner runner, String[] suiteClassNames){
if (suiteClassNames.length == 0) {

4
plugins/junit_rt/src/com/intellij/junit4/JUnit4TestRunnerUtil.java
View File

@@ -309,11 +309,11 @@ public final class JUnit4TestRunnerUtil {
if (clazz == null) {
clazz = suiteClassName;
}
System.err.print(MessageFormat.format(ResourceBundle.getBundle("RuntimeBundle").getString("junit.class.not.found"), clazz));
System.err.print(MessageFormat.format(ResourceBundle.getBundle("messages.RuntimeBundle").getString("junit.class.not.found"), clazz));
System.exit(1);
}
catch (Exception e) {
System.err.println(MessageFormat.format(ResourceBundle.getBundle("RuntimeBundle").getString("junit.cannot.instantiate.tests"),
System.err.println(MessageFormat.format(ResourceBundle.getBundle("messages.RuntimeBundle").getString("junit.cannot.instantiate.tests"),
e.toString()));
System.exit(1);
}

2
plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java
View File

@@ -78,7 +78,7 @@ public final class PreviewFormAction extends AnAction{
*/
private static final String CLASS_TO_BIND_NAME = "com.intellij.uiDesigner.FormPreviewFrame";
private static final String CLASS_TO_BIND_RESOURCE_NAME = "com/intellij/uiDesigner/FormPreviewFrame";
@NonNls private static final String RUNTIME_BUNDLE_PREFIX = "RuntimeBundle";
@NonNls private static final String RUNTIME_BUNDLE_PREFIX = "messages.RuntimeBundle";
@NonNls public static final String PREVIEW_BINDING_FIELD = "myComponent";
@NotNull

2
plugins/ui-designer/testData/formEmbedding/Ideadev14081/Main.java
View File

@@ -21,7 +21,7 @@ import java.util.ResourceBundle;
public class Main {
private JComponent myComponent;
private static ResourceBundle ourBundle = ResourceBundle.getBundle("RuntimeBundle");
private static ResourceBundle ourBundle = ResourceBundle.getBundle("messages.RuntimeBundle");
// Note: this class should not be obfuscated

2
plugins/ui-designer/testSrc/com/intellij/uiDesigner/core/AsmCodeGeneratorTest.java
View File

@@ -86,7 +86,7 @@ public class AsmCodeGeneratorTest extends JpsBuildTestCase {
appendPath(cp, ApplicationManager.class);
appendPath(cp, DynamicBundle.class);
appendPath(cp, PathManager.getResourceRoot(this.getClass(), "/messages/UIBundle.properties"));
appendPath(cp, PathManager.getResourceRoot(this.getClass(), "/RuntimeBundle.properties"));
appendPath(cp, PathManager.getResourceRoot(this.getClass(), "/messages/RuntimeBundle.properties"));
appendPath(cp, PathManager.getResourceRoot(this.getClass(), "/com/intellij/uiDesigner/core/TestProperties.properties"));
appendPath(cp, GridLayoutManager.class); // intellij.java.guiForms.rt
appendPath(cp, DataProvider.class);