MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

UI Designer: fold code generated for DynamicBundle messages

Browse Source 
GitOrigin-RevId: 231caf5262972971f8b18f9353738d6659b4979c
This commit is contained in:
Nikolay.Tropin
2020-01-29 17:33:08 +00:00
committed by intellij-monorepo-bot
parent a4f30d2e8b
commit b0be129291
3 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
+2
View File
@@ -47,6 +47,8 @@ public class AsmCodeGenerator {
public static final String LOAD_LABEL_TEXT_METHOD = "$$$loadLabelText$$$";
public static final String LOAD_BUTTON_TEXT_METHOD = "$$$loadButtonText$$$";
public static final String GET_FONT_METHOD_NAME = "$$$getFont$$$";
public static final String GET_MESSAGE_FROM_BUNDLE = "$$$getMessageFromBundle$$$";
public static final String CACHED_GET_BUNDLE_METHOD = "$$$cachedGetBundleMethod$$$";
private static final Type ourButtonGroupType = Type.getType(ButtonGroup.class);
private static final Type ourBorderFactoryType = Type.getType(BorderFactory.class);
plugins/ui-designer/src/com/intellij/uiDesigner/binding/GeneratedCodeFoldingBuilder.java
+15 -5
View File
@@ -55,15 +55,25 @@ public class GeneratedCodeFoldingBuilder extends FoldingBuilderEx {
@Override
public void visitMethod(PsiMethod method) {
if (AsmCodeGenerator.SETUP_METHOD_NAME.equals(method.getName()) ||
AsmCodeGenerator.GET_ROOT_COMPONENT_METHOD_NAME.equals(method.getName()) ||
AsmCodeGenerator.LOAD_BUTTON_TEXT_METHOD.equals(method.getName()) ||
AsmCodeGenerator.LOAD_LABEL_TEXT_METHOD.equals(method.getName()) ||
AsmCodeGenerator.GET_FONT_METHOD_NAME.equals(method.getName())) {
String methodName = method.getName();
if (AsmCodeGenerator.SETUP_METHOD_NAME.equals(methodName) ||
AsmCodeGenerator.GET_ROOT_COMPONENT_METHOD_NAME.equals(methodName) ||
AsmCodeGenerator.LOAD_BUTTON_TEXT_METHOD.equals(methodName) ||
AsmCodeGenerator.LOAD_LABEL_TEXT_METHOD.equals(methodName) ||
AsmCodeGenerator.GET_FONT_METHOD_NAME.equals(methodName) ||
AsmCodeGenerator.GET_MESSAGE_FROM_BUNDLE.equals(methodName)) {
addFoldingData(method);
}
}
@Override
public void visitField(PsiField field) {
if (AsmCodeGenerator.CACHED_GET_BUNDLE_METHOD.equals(field.getName())) {
addFoldingData(field);
}
}
@Override
public void visitClassInitializer(PsiClassInitializer initializer) {
if (isGeneratedUIInitializer(initializer)) {
plugins/ui-designer/src/com/intellij/uiDesigner/make/FormSourceCodeGenerator.java
+10 -13
View File
@@ -3,7 +3,6 @@ package com.intellij.uiDesigner.make;
import com.intellij.DynamicBundle;
import com.intellij.lang.java.JavaParserDefinition;
import com.intellij.lang.jvm.JvmMethod;
import com.intellij.lexer.Lexer;
import com.intellij.openapi.application.ApplicationNamesInfo;
import com.intellij.openapi.diagnostic.Logger;
@@ -41,8 +40,6 @@ import org.jetbrains.annotations.Nullable;
import javax.swing.*;
import java.awt.*;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.*;
public final class FormSourceCodeGenerator {
@@ -62,8 +59,6 @@ public final class FormSourceCodeGenerator {
@NonNls private static final TIntObjectHashMap<String> ourTitlePositionMap = new TIntObjectHashMap<>();
private boolean myNeedGetMessageFromBundle;
private static final String getMessageFromBundleMethod = "$$$getMessageFromBundle$$$";
private static final String cachedGetBundleMethodField = "$$$cachedGetBundleMethod$$$";
private static final ElementPattern ourSuperCallPattern = PsiJavaPatterns.psiExpressionStatement().withFirstChild(PlatformPatterns.psiElement(PsiMethodCallExpression.class).withFirstChild(
PlatformPatterns.psiElement().withText(PsiKeyword.SUPER)));
@@ -516,11 +511,13 @@ public final class FormSourceCodeGenerator {
private void generateGetMessageFromBundle(PsiClass aClass, PsiMethod anchor, PsiElementFactory elementFactory, boolean condition) {
String dynamicBundleClassName = DynamicBundle.class.getName();
for (PsiMethod oldMethod : aClass.findMethodsByName(getMessageFromBundleMethod, false)) {
String methodName = AsmCodeGenerator.GET_MESSAGE_FROM_BUNDLE;
for (PsiMethod oldMethod : aClass.findMethodsByName(methodName, false)) {
oldMethod.delete();
}
PsiField oldField = aClass.findFieldByName(cachedGetBundleMethodField, false);
String fieldName = AsmCodeGenerator.CACHED_GET_BUNDLE_METHOD;
PsiField oldField = aClass.findFieldByName(fieldName, false);
if (oldField != null) {
oldField.delete();
}
@@ -531,19 +528,19 @@ public final class FormSourceCodeGenerator {
PsiField cachedMethodField =
elementFactory.createFieldFromText(
"private static java.lang.reflect.Method " + cachedGetBundleMethodField + " = null;",
"private static java.lang.reflect.Method " + fieldName + " = null;",
null);
String methodText =
"private String " + getMessageFromBundleMethod + "(String path, String key) {\n" +
"private String " + methodName + "(String path, String key) {\n" +
" ResourceBundle bundle;\n" +
"try {\n" +
" Class<?> thisClass = this.getClass();\n" +
" if (" + cachedGetBundleMethodField + " == null) {\n" +
" if (" + fieldName + " == null) {\n" +
" Class<?> dynamicBundleClass = thisClass.getClassLoader().loadClass(\"" + dynamicBundleClassName + "\");\n" +
" " + cachedGetBundleMethodField + " = dynamicBundleClass.getMethod(\"getBundle\", String.class, Class.class);\n" +
" " + fieldName + " = dynamicBundleClass.getMethod(\"getBundle\", String.class, Class.class);\n" +
" }\n" +
" bundle = (ResourceBundle)" + cachedGetBundleMethodField + ".invoke(null, path, thisClass);\n" +
" bundle = (ResourceBundle)" + fieldName + ".invoke(null, path, thisClass);\n" +
"} catch (Exception e) {\n" +
" bundle = ResourceBundle.getBundle(path);\n" +
"}\n" +
@@ -1098,7 +1095,7 @@ public final class FormSourceCodeGenerator {
}
else {
myNeedGetMessageFromBundle = true;
startMethodCall("this", getMessageFromBundleMethod);
startMethodCall("this", AsmCodeGenerator.GET_MESSAGE_FROM_BUNDLE);
push(descriptor.getBundleName());
push(descriptor.getKey());
endMethod();