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

IDEA-137474 NPE from $$$setupUI$$$

Browse Source
This commit is contained in:
Alexander Lobas
2015-03-11 14:58:26 +03:00
parent 78ce454009
commit b8a19c4544
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java
+1 -1
View File
@@ -883,7 +883,7 @@ public class AsmCodeGenerator {
generator.push((String) null);
}
else {
FontPropertyCodeGenerator.generatePushFont(generator, componentLocal, container, font, "getFont");
FontPropertyCodeGenerator.generatePushFont(generator, componentLocal, container, font, "getFont", null);
}
if (container.getBorderTitleColor() == null) {
generator.push((String) null);
java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/FontPropertyCodeGenerator.java
+14 -4
View File
@@ -19,7 +19,8 @@ import com.intellij.compiler.instrumentation.InstrumentationClassFinder;
import com.intellij.uiDesigner.lw.FontDescriptor;
import com.intellij.uiDesigner.lw.LwComponent;
import com.intellij.uiDesigner.lw.LwIntrospectedProperty;
import org.jetbrains.org.objectweb.asm.Type;
import org.jetbrains.org.objectweb.asm.*;
import org.jetbrains.org.objectweb.asm.Label;
import org.jetbrains.org.objectweb.asm.commons.GeneratorAdapter;
import org.jetbrains.org.objectweb.asm.commons.Method;
@@ -48,19 +49,22 @@ public class FontPropertyCodeGenerator extends PropertyCodeGenerator {
final int componentLocal, final String formClassName) {
FontDescriptor descriptor = (FontDescriptor) property.getPropertyValue(lwComponent);
if (descriptor.isFixedFont() && !descriptor.isFullyDefinedFont()) {
generator.loadLocal(componentLocal);
generatePushFont(generator, componentLocal, lwComponent, descriptor, property.getReadMethodName());
Label fontNullLabel = generator.newLabel();
generatePushFont(generator, componentLocal, lwComponent, descriptor, property.getReadMethodName(), fontNullLabel);
Method setFontMethod = new Method(property.getWriteMethodName(), Type.VOID_TYPE, new Type[] { ourFontType } );
Type componentType = AsmCodeGenerator.typeFromClassName(lwComponent.getComponentClassName());
generator.invokeVirtual(componentType, setFontMethod);
generator.mark(fontNullLabel);
return true;
}
return false;
}
public static void generatePushFont(final GeneratorAdapter generator, final int componentLocal, final LwComponent lwComponent,
final FontDescriptor descriptor, final String readMethodName) {
final FontDescriptor descriptor, final String readMethodName,
Label fontNullLabel) {
final int fontLocal = generator.newLocal(ourFontType);
generator.loadLocal(componentLocal);
@@ -69,6 +73,12 @@ public class FontPropertyCodeGenerator extends PropertyCodeGenerator {
generator.invokeVirtual(componentType, getFontMethod);
generator.storeLocal(fontLocal);
if (fontNullLabel != null) {
generator.loadLocal(fontLocal);
generator.ifNull(fontNullLabel);
generator.loadLocal(componentLocal);
}
generator.newInstance(ourFontType);
generator.dup();
if (descriptor.getFontName() != null) {