From f1e96b558d344093ca76b9bac9a83cc2df096773 Mon Sep 17 00:00:00 2001 From: Rustam Vishnyakov Date: Fri, 11 May 2012 15:17:28 +0400 Subject: [PATCH] Reverted the change with TabbedPaneWrapper for default code style panel --- .../application/options/TabbedLanguageCodeStylePanel.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 3b2352bc3ef8..baf62a386e5e 100644 --- a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java +++ b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java @@ -29,7 +29,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectUtil; import com.intellij.openapi.util.Disposer; import com.intellij.psi.codeStyle.*; -import com.intellij.ui.TabbedPaneWrapper; +import com.intellij.ui.components.JBTabbedPane; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -50,7 +50,7 @@ public abstract class TabbedLanguageCodeStylePanel extends CodeStyleAbstractPane private CodeStyleAbstractPanel myActiveTab; private List myTabs; private JPanel myPanel; - private TabbedPaneWrapper myTabbedPane; + private JTabbedPane myTabbedPane; private PredefinedCodeStyle[] myPredefinedCodeStyles; private JPopupMenu myCopyFromMenu; @@ -113,9 +113,9 @@ public abstract class TabbedLanguageCodeStylePanel extends CodeStyleAbstractPane if (myTabs == null) { myPanel = new JPanel(); myPanel.setLayout(new BorderLayout()); - myTabbedPane = new TabbedPaneWrapper(this); + myTabbedPane = new JBTabbedPane(); myTabs = new ArrayList(); - myPanel.add(myTabbedPane.getComponent()); + myPanel.add(myTabbedPane); initTabs(getSettings()); } assert !myTabs.isEmpty();