MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

uiDesigner: source generator: specify fqn for ResourceBundle

Browse Source 
fixes ambiguity when there are several ResourceBundle classes in classpath

GitOrigin-RevId: d6b57b3b27ca5ab0a965e211c272acb500046240
This commit is contained in:
Leonid Shalupov
2024-10-08 18:53:04 +04:00
committed by intellij-monorepo-bot
parent 237531ff31
commit ee0092f4e9
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/ui-designer/src/com/intellij/uiDesigner/make/FormSourceCodeGenerator.java
View File

@@ -538,16 +538,16 @@ public final class FormSourceCodeGenerator {
String methodText = String methodText =
"private String " + methodName + "(String path, String key) {\n" + "private String " + methodName + "(String path, String key) {\n" +
" ResourceBundle bundle;\n" + " java.util.ResourceBundle bundle;\n" +
"try {\n" + "try {\n" +
" Class<?> thisClass = this.getClass();\n" + " Class<?> thisClass = this.getClass();\n" +
" if (" + fieldName + " == null) {\n" + " if (" + fieldName + " == null) {\n" +
" Class<?> dynamicBundleClass = thisClass.getClassLoader().loadClass(\"" + dynamicBundleClassName + "\");\n" + " Class<?> dynamicBundleClass = thisClass.getClassLoader().loadClass(\"" + dynamicBundleClassName + "\");\n" +
" " + fieldName + " = dynamicBundleClass.getMethod(\"getBundle\", String.class, Class.class);\n" + " " + fieldName + " = dynamicBundleClass.getMethod(\"getBundle\", String.class, Class.class);\n" +
" }\n" + " }\n" +
" bundle = (ResourceBundle)" + fieldName + ".invoke(null, path, thisClass);\n" + " bundle = (java.util.ResourceBundle)" + fieldName + ".invoke(null, path, thisClass);\n" +
"} catch (Exception e) {\n" + "} catch (Exception e) {\n" +
" bundle = ResourceBundle.getBundle(path);\n" + " bundle = java.util.ResourceBundle.getBundle(path);\n" +
"}\n" + "}\n" +
"return bundle.getString(key);\n" + "return bundle.getString(key);\n" +
"}"; "}";

6
plugins/ui-designer/testData/sourceCodeGenerator/titleFromBundle/BindingTest.java.after
View File

@@ -48,16 +48,16 @@ public class BindingTest {
private static java.lang.reflect.Method $$$cachedGetBundleMethod$$$ = null; private static java.lang.reflect.Method $$$cachedGetBundleMethod$$$ = null;
private String $$$getMessageFromBundle$$$(String path, String key) { private String $$$getMessageFromBundle$$$(String path, String key) {
ResourceBundle bundle; java.util.ResourceBundle bundle;
try { try {
Class<?> thisClass = this.getClass(); Class<?> thisClass = this.getClass();
if ($$$cachedGetBundleMethod$$$ == null) { if ($$$cachedGetBundleMethod$$$ == null) {
Class<?> dynamicBundleClass = thisClass.getClassLoader().loadClass("com.intellij.DynamicBundle"); Class<?> dynamicBundleClass = thisClass.getClassLoader().loadClass("com.intellij.DynamicBundle");
$$$cachedGetBundleMethod$$$ = dynamicBundleClass.getMethod("getBundle", String.class, Class.class); $$$cachedGetBundleMethod$$$ = dynamicBundleClass.getMethod("getBundle", String.class, Class.class);
} }
bundle = (ResourceBundle) $$$cachedGetBundleMethod$$$.invoke(null, path, thisClass); bundle = (java.util.ResourceBundle) $$$cachedGetBundleMethod$$$.invoke(null, path, thisClass);
} catch (Exception e) { } catch (Exception e) {
bundle = ResourceBundle.getBundle(path); bundle = java.util.ResourceBundle.getBundle(path);
} }
return bundle.getString(key); return bundle.getString(key);
} }