From 947850c13f175bcef8f190148205d98a391b9b3f Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Fri, 1 Jun 2012 21:20:39 +0400 Subject: [PATCH] bug with setting default titled border in internal mode --- .../com/intellij/uiDesigner/compiler/AsmCodeGenerator.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java index 004209e3930c..f4350afa07d1 100644 --- a/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java +++ b/java/compiler/forms-compiler/src/com/intellij/uiDesigner/compiler/AsmCodeGenerator.java @@ -857,12 +857,12 @@ public class AsmCodeGenerator { } pushBorderProperties(container, generator, borderTitle, componentLocal); - if (Boolean.valueOf(System.getProperty("idea.is.internal")).booleanValue()) { - container.getDelegeeClientProperties().put(ourBorderFactoryClientProperty, StringDescriptor.create("com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent")); - } Type borderFactoryType = ourBorderFactoryType; StringDescriptor borderFactoryValue = (StringDescriptor)container.getDelegeeClientProperties().get(ourBorderFactoryClientProperty); + if (borderFactoryValue == null && Boolean.valueOf(System.getProperty("idea.is.internal")).booleanValue()) { + container.getDelegeeClientProperties().put(ourBorderFactoryClientProperty, StringDescriptor.create("com.intellij.ui.IdeBorderFactory$PlainSmallWithIndent")); + } if (borderFactoryValue != null && borderFactoryValue.getValue().length() != 0) { borderFactoryType = typeFromClassName(borderFactoryValue.getValue()); }