diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form index 40c20f3003f6..e25b5793b614 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form +++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/javac/JavacOptionsPanel.form @@ -8,6 +8,9 @@ + + + diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java index e02b0259d90c..89c3f8608bc6 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsConfigurable.java @@ -110,7 +110,7 @@ public class AnnotationProcessorsConfigurable implements SearchableConfigurable final JPanel processorTablePanel = new JPanel(new BorderLayout()); myProcessorsModel = new ProcessorTableModel(); - processorTablePanel.setBorder(new TitledBorder("Annotation Processors")); + processorTablePanel.setBorder(IdeBorderFactory.createTitledBorder("Annotation Processors")); myProcessorTable = new Table(myProcessorsModel); myProcessorTable.getEmptyText().setText("No processors configured"); diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleImportForm.form b/java/java-impl/src/com/intellij/application/options/CodeStyleImportForm.form index 540f56e9687c..424896795f04 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleImportForm.form +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleImportForm.form @@ -7,7 +7,7 @@ - + @@ -16,7 +16,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -34,7 +34,7 @@ - + diff --git a/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java b/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java index e0f699c3bf8c..bff62ce2416f 100644 --- a/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java +++ b/java/java-impl/src/com/intellij/application/options/CodeStyleImportsPanel.java @@ -103,7 +103,7 @@ public class CodeStyleImportsPanel extends JPanel { public void actionPerformed(ActionEvent e) { boolean isComma = myJspImportCommaSeparated.isSelected(); labelPanel.removeAll(); - labelPanel.add(isComma ? commaSeparatedLabel : oneImportPerDirectiveLabel, BorderLayout.CENTER); + labelPanel.add(isComma ? commaSeparatedLabel : oneImportPerDirectiveLabel, BorderLayout.NORTH); labelPanel.repaint(); labelPanel.revalidate(); } diff --git a/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java b/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java index 424ee395dabc..fd4dd38545e0 100644 --- a/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java +++ b/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java @@ -27,10 +27,7 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.ShadowAction; import com.intellij.openapi.util.IconLoader; -import com.intellij.ui.ColorChooser; -import com.intellij.ui.ScrollPaneFactory; -import com.intellij.ui.SpeedSearchBase; -import com.intellij.ui.TableSpeedSearch; +import com.intellij.ui.*; import com.intellij.ui.table.JBTable; import org.jetbrains.annotations.Nullable; @@ -90,7 +87,7 @@ public class RegistryUi implements Disposable { myDescriptionLabel = new JTextArea(3, 50); myDescriptionLabel.setEditable(false); final JScrollPane label = ScrollPaneFactory.createScrollPane(myDescriptionLabel); - label.setBorder(new TitledBorder("Description")); + label.setBorder(IdeBorderFactory.createTitledBorder("Description")); myContent.add(ScrollPaneFactory.createScrollPane(myTable), BorderLayout.CENTER); myContent.add(label, BorderLayout.SOUTH); diff --git a/platform/platform-api/src/com/intellij/ui/border/IdeaTitledBorder.java b/platform/platform-api/src/com/intellij/ui/border/IdeaTitledBorder.java index 42a3a4a59a9e..7ca72202befe 100644 --- a/platform/platform-api/src/com/intellij/ui/border/IdeaTitledBorder.java +++ b/platform/platform-api/src/com/intellij/ui/border/IdeaTitledBorder.java @@ -14,17 +14,17 @@ import java.awt.*; public class IdeaTitledBorder extends TitledBorder { // Space between the border and the component's edge - static protected final int EDGE_SPACING = 0; + static protected final int EDGE_SPACING = 2; // Space between the border and text - static protected final int TEXT_SPACING = 0; + static protected final int TEXT_SPACING = 2; // Horizontal inset of text that is left or right justified static protected final int TEXT_INSET_H = -15; public IdeaTitledBorder(String title) { super(BorderFactory.createCompoundBorder( - BorderFactory.createEmptyBorder(0, 15, 0, 0), + BorderFactory.createEmptyBorder(0, 20, 0, 0), BorderFactory.createMatteBorder(1, 0, 0, 0, UIUtil.getBorderColor())), title + " "); } diff --git a/platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java b/platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java index 9624e6e540f8..3660699b134e 100644 --- a/platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ui/switcher/QuickAccessConfigurable.java @@ -23,6 +23,7 @@ import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.registry.Registry; import com.intellij.ui.DocumentAdapter; +import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.SeparatorWithText; import com.intellij.ui.components.panels.VerticalBox; import com.intellij.util.ui.AwtVisitor; @@ -121,7 +122,7 @@ public class QuickAccessConfigurable extends JPanel implements SearchableConfigu kbConfig.add(modifiers); kbConfig.add(hold); - kbConfig.setBorder(new TitledBorder("Keyboard Configuration")); + kbConfig.setBorder(IdeBorderFactory.createTitledBorder("Keyboard Configuration")); box.add(kbConfig); @@ -178,7 +179,7 @@ public class QuickAccessConfigurable extends JPanel implements SearchableConfigu hasConflicts |= printConflict(c, KeyEvent.VK_ENTER, QuickAccessSettings.SWITCH_APPLY); if (hasConflicts) { - myConflicts.setBorder(new TitledBorder("Conflicts")); + myConflicts.setBorder(IdeBorderFactory.createTitledBorder("Conflicts")); c.gridx = 0; c.gridy++; c.gridwidth = 2; diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.form b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.form index de9a94804e9a..a40ccecdd5b2 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.form +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/inject/config/ui/LanguagePanel.form @@ -6,6 +6,9 @@ + + + diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ConfigUI.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ConfigUI.java index efc03b158a5d..35859651866f 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ConfigUI.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ui/ConfigUI.java @@ -15,6 +15,7 @@ */ package org.intellij.plugins.xpathView.ui; +import com.intellij.ui.IdeBorderFactory; import org.intellij.plugins.xpathView.Config; import com.intellij.ui.ColorPanel; @@ -73,7 +74,7 @@ public class ConfigUI extends JPanel { showInMainMenu.setToolTipText("Uncheck to remove XPath-related actions from the Main-Menubar"); JPanel settings = new JPanel(new BorderLayout()); - settings.setBorder(new TitledBorder(new EtchedBorder(EtchedBorder.LOWERED), "Settings")); + settings.setBorder(IdeBorderFactory.createTitledBorder("Settings")); c.add(c = new JPanel(new BorderLayout()), BorderLayout.NORTH); c.add(settings, BorderLayout.NORTH); @@ -91,7 +92,7 @@ public class ConfigUI extends JPanel { settings.add(/*settings = */new JPanel(new BorderLayout()), BorderLayout.SOUTH); JPanel colors = new JPanel(new GridBagLayout()); - colors.setBorder(new TitledBorder(new EtchedBorder(EtchedBorder.LOWERED), "Colors")); + colors.setBorder(IdeBorderFactory.createTitledBorder("Colors")); c.add(c = new JPanel(new BorderLayout()), BorderLayout.SOUTH); c.add(colors, BorderLayout.NORTH); diff --git a/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.form b/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.form index 869a84d4c663..98f9ac9bfc35 100644 --- a/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.form +++ b/xml/impl/src/com/intellij/application/options/XmlAutoImportOptionsProvider.form @@ -11,13 +11,13 @@ - + + - diff --git a/xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.form b/xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.form index f7b1cbd3e1f1..0d65c42e08e4 100644 --- a/xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.form +++ b/xml/impl/src/com/intellij/javaee/HtmlLanguageLevelForm.form @@ -1,57 +1,57 @@
- + - + - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +