From 90ea367605f63dafe2f7bac05e2851945df11887 Mon Sep 17 00:00:00 2001 From: Evgeny Zakrevsky Date: Wed, 28 Sep 2011 19:38:08 +0400 Subject: [PATCH] Tabbed panes. Correct background on Mac. --- .../ide/palette/impl/PaletteWindow.java | 3 +- .../javaDoc/JavaDocLocalInspection.java | 3 +- .../options/TabbedLanguageCodeStylePanel.java | 3 +- .../MultilanguageCodeStyleAbstractPanel.java | 3 +- .../ConfigurationSettingsEditorWrapper.form | 2 +- .../impl/SingleConfigurationConfigurable.form | 2 +- .../openapi/options/GroupSettingsBuilder.java | 3 +- .../intellij/ui/components/JBTabbedPane.java | 48 +++++++++++++++++++ .../src/com/intellij/ide/dnd/DnDDemo.java | 3 +- .../src/com/intellij/ui/TabbedPaneImpl.java | 3 +- .../util/src/com/intellij/util/ui/UIUtil.java | 17 +++++++ .../CompositeCommittedChangesProvider.java | 3 +- .../update/UpdateOrStatusOptionsDialog.java | 3 +- .../plugins/intelliLang/SettingsUI.java | 3 +- .../android/facet/AndroidFacetEditorTab.form | 2 +- .../run/AndroidRunConfigurationEditor.form | 10 ++-- .../run/AndroidRunConfigurationEditor.java | 1 - .../execution/CompositeConfigurable.java | 3 +- .../settings/SpellCheckerSettingsPane.form | 18 +++---- .../svn/config/SvnConfigureProxiesDialog.java | 3 +- .../TestNGConfigurationEditor.form | 2 +- .../editors/FontEditorDialog.form | 2 +- .../ui-designer/testData/TestTabbedPane.form | 2 +- .../xpath/xslt/run/RunSettingsEditor.form | 2 +- .../src/myDocumentFiles/OpenFileForm.form | 2 +- .../convert/AdvancedOptionsDialog.java | 3 +- 26 files changed, 113 insertions(+), 36 deletions(-) create mode 100644 platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java diff --git a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java index f6165bdc21b4..1f01d4d51f0b 100644 --- a/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java +++ b/java/idea-ui/src/com/intellij/ide/palette/impl/PaletteWindow.java @@ -25,6 +25,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.PopupHandler; import com.intellij.ui.ScrollPaneFactory; +import com.intellij.ui.components.JBTabbedPane; import com.intellij.util.ArrayUtil; import com.intellij.util.containers.HashSet; import org.jetbrains.annotations.NonNls; @@ -48,7 +49,7 @@ public class PaletteWindow extends JPanel implements DataProvider { private final PaletteItemProvider[] myProviders; private final MyPropertyChangeListener myPropertyChangeListener = new MyPropertyChangeListener(); private final Set myGroups = new HashSet(); - private final JTabbedPane myTabbedPane = new JTabbedPane(); + private final JTabbedPane myTabbedPane = new JBTabbedPane(); private final JScrollPane myScrollPane = ScrollPaneFactory.createScrollPane(); private final MyListSelectionListener myListSelectionListener = new MyListSelectionListener(); private PaletteGroupHeader myLastFocusedGroup; diff --git a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java index 1a8dd40036ff..fffe5b8a2428 100644 --- a/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/javaDoc/JavaDocLocalInspection.java @@ -31,6 +31,7 @@ import com.intellij.psi.util.PsiTreeUtil; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.FieldPanel; import com.intellij.ui.IdeBorderFactory; +import com.intellij.ui.components.JBTabbedPane; import com.intellij.util.IJSwingUtilities; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; @@ -212,7 +213,7 @@ public class JavaDocLocalInspection extends BaseLocalInspectionTool { super(new GridBagLayout()); GridBagConstraints gc = new GridBagConstraints(0, GridBagConstraints.RELATIVE, 2, 1, 1, 0, GridBagConstraints.NORTH, GridBagConstraints.HORIZONTAL, new Insets(0,0,0,0),0,0 ); add(createAdditionalJavadocTagsPanel(), gc); - JTabbedPane tabs = new JTabbedPane(SwingConstants.BOTTOM); + JTabbedPane tabs = new JBTabbedPane(SwingConstants.BOTTOM); @NonNls String[] tags = new String[]{"@author", "@version", "@since", "@param"}; tabs.add(InspectionsBundle.message("inspection.javadoc.option.tab.title"), createOptionsPanel(new String[]{NONE, PUBLIC, PACKAGE_LOCAL}, tags, diff --git a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java index b92c58256395..ce88a88654d4 100644 --- a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java @@ -30,6 +30,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsProvider; import com.intellij.psi.codeStyle.CommonCodeStyleSettings; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; +import com.intellij.ui.components.JBTabbedPane; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -109,7 +110,7 @@ public abstract class TabbedLanguageCodeStylePanel extends CodeStyleAbstractPane if (myTabs == null) { myPanel = new JPanel(); myPanel.setLayout(new BorderLayout()); - myTabbedPane = new JTabbedPane(); + myTabbedPane = new JBTabbedPane(); myTabs = new ArrayList(); myPanel.add(myTabbedPane); initTabs(getSettings()); diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/MultilanguageCodeStyleAbstractPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/MultilanguageCodeStyleAbstractPanel.java index 9ed2425fe621..a00a2e8f0688 100644 --- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/MultilanguageCodeStyleAbstractPanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/MultilanguageCodeStyleAbstractPanel.java @@ -35,6 +35,7 @@ import com.intellij.psi.codeStyle.CodeStyleManager; import com.intellij.psi.codeStyle.CodeStyleSettings; import com.intellij.psi.codeStyle.CodeStyleSettingsCustomizable; import com.intellij.psi.codeStyle.LanguageCodeStyleSettingsProvider; +import com.intellij.ui.components.JBTabbedPane; import com.intellij.util.Function; import com.intellij.util.IncorrectOperationException; import com.intellij.util.containers.ContainerUtil; @@ -211,7 +212,7 @@ public abstract class MultilanguageCodeStyleAbstractPanel extends CodeStyleAbstr @Override protected void installPreviewPanel(final JPanel previewPanel) { if (getSettingsType() != LanguageCodeStyleSettingsProvider.SettingsType.LANGUAGE_SPECIFIC) { - tabbedPane = new JTabbedPane(); + tabbedPane = new JBTabbedPane(); tabbedPane.setTabLayoutPolicy(JTabbedPane.SCROLL_TAB_LAYOUT); Language[] langs = LanguageCodeStyleSettingsProvider.getLanguagesWithSharedPreview(); if (langs.length == 0) return; diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form index fc46d047bb3b..cabd12f2b882 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConfigurationSettingsEditorWrapper.form @@ -1,7 +1,7 @@
- + diff --git a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form index 286385e686c9..b8a4aeee5fb6 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form +++ b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.form @@ -63,7 +63,7 @@ - + diff --git a/platform/platform-api/src/com/intellij/openapi/options/GroupSettingsBuilder.java b/platform/platform-api/src/com/intellij/openapi/options/GroupSettingsBuilder.java index 2cfabadd553d..b6e97511d9b5 100644 --- a/platform/platform-api/src/com/intellij/openapi/options/GroupSettingsBuilder.java +++ b/platform/platform-api/src/com/intellij/openapi/options/GroupSettingsBuilder.java @@ -16,6 +16,7 @@ package com.intellij.openapi.options; import com.intellij.openapi.util.Pair; +import com.intellij.ui.components.JBTabbedPane; import javax.swing.*; import java.awt.*; @@ -52,7 +53,7 @@ public class GroupSettingsBuilder implements CompositeSettingsBuilder { if (editors.size() == 0) return new JPanel(); if (editors.size() == 1) return editors.get(0).getSecond().getComponent(); - JTabbedPane tabs = new JTabbedPane(); + JTabbedPane tabs = new JBTabbedPane(); for (int i = 0; i < editors.size(); i++) { Pair> pair = editors.get(i); JPanel panel = new JPanel(new BorderLayout()); diff --git a/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java b/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java new file mode 100644 index 000000000000..86bf1038da4a --- /dev/null +++ b/platform/platform-api/src/com/intellij/ui/components/JBTabbedPane.java @@ -0,0 +1,48 @@ +package com.intellij.ui.components; + +import com.intellij.util.ui.UIUtil; + +import javax.swing.*; +import javax.swing.border.CompoundBorder; +import javax.swing.border.EmptyBorder; +import java.awt.*; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; +import java.awt.event.HierarchyEvent; +import java.awt.event.HierarchyListener; +import java.util.Arrays; + +/** + * @author evgeny.zakrevsky + */ +public class JBTabbedPane extends JTabbedPane implements HierarchyListener { + public JBTabbedPane() { + } + + public JBTabbedPane(int tabPlacement) { + super(tabPlacement); + } + + public JBTabbedPane(int tabPlacement, int tabLayoutPolicy) { + super(tabPlacement, tabLayoutPolicy); + } + + @Override + public void setComponentAt(int index, Component component) { + super.setComponentAt(index, component); + component.addHierarchyListener(this); + UIUtil.setNotOpaqueRecursively(component); + } + + @Override + public void insertTab(String title, Icon icon, Component component, String tip, int index) { + super.insertTab(title, icon, component, tip, index); + component.addHierarchyListener(this); + UIUtil.setNotOpaqueRecursively(component); + } + + @Override + public void hierarchyChanged(HierarchyEvent e) { + UIUtil.setNotOpaqueRecursively(e.getComponent()); + } +} diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/DnDDemo.java b/platform/platform-impl/src/com/intellij/ide/dnd/DnDDemo.java index e43f68ee7882..d9035d8242e0 100644 --- a/platform/platform-impl/src/com/intellij/ide/dnd/DnDDemo.java +++ b/platform/platform-impl/src/com/intellij/ide/dnd/DnDDemo.java @@ -16,6 +16,7 @@ package com.intellij.ide.dnd; import com.intellij.openapi.util.Pair; +import com.intellij.ui.components.JBTabbedPane; import com.intellij.ui.treeStructure.Tree; import org.jetbrains.annotations.Nullable; @@ -58,7 +59,7 @@ public class DnDDemo implements DnDEvent.DropTargetHighlightingType { }, source); - JTabbedPane tabs = new JTabbedPane(); + JTabbedPane tabs = new JBTabbedPane(); JPanel delegates = new JPanel(new FlowLayout()); final JLabel delegate1Label = new JLabel("Delegate 1"); diff --git a/platform/platform-impl/src/com/intellij/ui/TabbedPaneImpl.java b/platform/platform-impl/src/com/intellij/ui/TabbedPaneImpl.java index 15814ad08fcc..367350c4354d 100644 --- a/platform/platform-impl/src/com/intellij/ui/TabbedPaneImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/TabbedPaneImpl.java @@ -20,6 +20,7 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.ui.components.JBTabbedPane; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -33,7 +34,7 @@ import java.awt.event.MouseEvent; import java.lang.reflect.Field; import java.lang.reflect.Method; -public class TabbedPaneImpl extends JTabbedPane implements TabbedPane { +public class TabbedPaneImpl extends JBTabbedPane implements TabbedPane { private static final Logger LOG = Logger.getInstance("#com.intellij.ui.TabbedPaneImpl"); diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java index 3c850c174023..8d9539f047c8 100644 --- a/platform/util/src/com/intellij/util/ui/UIUtil.java +++ b/platform/util/src/com/intellij/util/ui/UIUtil.java @@ -2458,5 +2458,22 @@ public class UIUtil { } } } + + public static void setNotOpaqueRecursively(Component component) { + if (component == null) return; + if (!isUnderAquaLookAndFeel()) return; + + if (component.getBackground().equals(getPanelBackground()) || component instanceof JScrollPane || component instanceof JViewport) { + if (component instanceof JComponent) { + ((JComponent)component).setOpaque(false); + } + if (component instanceof Container) { + for (Component c : ((Container)component).getComponents()) { + setNotOpaqueRecursively(c); + } + } + } + } + } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CompositeCommittedChangesProvider.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CompositeCommittedChangesProvider.java index 0ca194eff7ed..00eab3b5b741 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CompositeCommittedChangesProvider.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/CompositeCommittedChangesProvider.java @@ -27,6 +27,7 @@ import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.openapi.vcs.versionBrowser.DateFilterComponent; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.IdeBorderFactory; +import com.intellij.ui.components.JBTabbedPane; import com.intellij.util.AsynchConsumer; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -127,7 +128,7 @@ public class CompositeCommittedChangesProvider implements CommittedChangesProvid VcsCommittedViewAuxiliary auxiliary = provider.createActions(manager, location); if (auxiliary != null) { if (tabbedPane == null) { - tabbedPane = new JTabbedPane(); + tabbedPane = new JBTabbedPane(); actions = new ArrayList(); toolbarActions = new ArrayList(); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java index 1385088c2761..ea9ac7b45f1f 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateOrStatusOptionsDialog.java @@ -23,6 +23,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.VcsBundle; +import com.intellij.ui.components.JBTabbedPane; import com.intellij.util.ui.OptionsDialog; import javax.swing.*; @@ -46,7 +47,7 @@ public abstract class UpdateOrStatusOptionsDialog extends OptionsDialog { myMainPanel.add(Box.createVerticalStrut(10), BorderLayout.SOUTH); } else { - myMainPanel = new JTabbedPane(); + myMainPanel = new JBTabbedPane(); final ArrayList vcses = new ArrayList(confs.values()); Collections.sort(vcses, new Comparator() { public int compare(final AbstractVcs o1, final AbstractVcs o2) { diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/SettingsUI.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/SettingsUI.java index 361a2cb70c24..1f56645d5a5b 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/SettingsUI.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/SettingsUI.java @@ -21,6 +21,7 @@ import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; +import com.intellij.ui.components.JBTabbedPane; import com.intellij.util.containers.ContainerUtil; import org.intellij.plugins.intelliLang.inject.LanguageInjectionSupport; import org.jetbrains.annotations.NotNull; @@ -44,7 +45,7 @@ class SettingsUI { SettingsUI(@NotNull final Project project, Configuration configuration) { - myTabbedPane = new JTabbedPane(JTabbedPane.TOP); + myTabbedPane = new JBTabbedPane(JTabbedPane.TOP); myRoot.add(myTabbedPane); final ArrayList configurables = new ArrayList(); diff --git a/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.form b/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.form index 2f8101b18586..e4e4c4c51eb2 100644 --- a/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.form +++ b/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.form @@ -35,7 +35,7 @@ - + diff --git a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form index 2d9c3a6b9471..4fcd4fff2497 100644 --- a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form +++ b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form @@ -15,7 +15,7 @@ - + @@ -24,7 +24,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -82,7 +82,7 @@ - + diff --git a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java index a96ccf3a426b..ca32757c4888 100644 --- a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java +++ b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java @@ -57,7 +57,6 @@ public class AndroidRunConfigurationEditor - + @@ -93,13 +93,13 @@ - + - + - - + + @@ -125,13 +125,13 @@ - + - + - - + + diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesDialog.java index c41d23cd59c5..d507aed3a21c 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesDialog.java @@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Ref; +import com.intellij.ui.components.JBTabbedPane; import org.jetbrains.idea.svn.SvnBundle; import org.jetbrains.idea.svn.SvnConfiguration; import org.jetbrains.idea.svn.SvnServerFileManager; @@ -172,7 +173,7 @@ public class SvnConfigureProxiesDialog extends DialogWrapper implements Validati } protected JComponent createCenterPanel() { - myTabbedPane = new JTabbedPane(); + myTabbedPane = new JBTabbedPane(); myTabbedPane.add(myUserTab.createComponent(), SvnBundle.message("dialog.edit.http.proxies.settings.tab.edit.user.file.title")); myTabbedPane.add(mySystemTab.createComponent(), SvnBundle.message("dialog.edit.http.proxies.settings.tab.edit.system.file.title")); myPanel.add(myTabbedPane, BorderLayout.NORTH); diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form index 4fc7d0565b48..43d91e66608b 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form @@ -144,7 +144,7 @@ - + diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/FontEditorDialog.form b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/FontEditorDialog.form index 33246b4c6b64..0df98422f84b 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/FontEditorDialog.form +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/propertyInspector/editors/FontEditorDialog.form @@ -8,7 +8,7 @@ - + diff --git a/plugins/ui-designer/testData/TestTabbedPane.form b/plugins/ui-designer/testData/TestTabbedPane.form index fc2951e6621a..fdc151a3f5bb 100644 --- a/plugins/ui-designer/testData/TestTabbedPane.form +++ b/plugins/ui-designer/testData/TestTabbedPane.form @@ -1,6 +1,6 @@ - + diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form index 3033c3dd087a..a2b9afbfe133 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/RunSettingsEditor.form @@ -1,6 +1,6 @@ - + diff --git a/samples/textEditor/src/myDocumentFiles/OpenFileForm.form b/samples/textEditor/src/myDocumentFiles/OpenFileForm.form index 7e71f042101d..87939cdd951b 100644 --- a/samples/textEditor/src/myDocumentFiles/OpenFileForm.form +++ b/samples/textEditor/src/myDocumentFiles/OpenFileForm.form @@ -11,7 +11,7 @@ - + diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/AdvancedOptionsDialog.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/AdvancedOptionsDialog.java index fdcbed8cada1..9f6da66b1820 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/AdvancedOptionsDialog.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/AdvancedOptionsDialog.java @@ -18,6 +18,7 @@ package org.intellij.plugins.relaxNG.convert; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; +import com.intellij.ui.components.JBTabbedPane; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -53,7 +54,7 @@ public class AdvancedOptionsDialog extends DialogWrapper { protected JComponent createCenterPanel() { JComponent root; if (myInputOptions != null && myOutputOptions != null) { - root = new JTabbedPane(); + root = new JBTabbedPane(); ((JTabbedPane)root).addTab("Input", myInputOptions.getRoot()); ((JTabbedPane)root).addTab("Output", myOutputOptions.getRoot()); } else if (myInputOptions != null) {