Tabbed panes. Correct background on Mac.

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 f6165bdc21b46b7f73e6080da5bb923ad4212dea..1f01d4d51f0bd83c6494f3788954e9ec991988b0 100644 (file)
--- 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<PaletteGroup> myGroups = new HashSet<PaletteGroup>();
-  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 1a8dd40036fffbfd2a24e7531a1034d65c67c3e1..fffe5b8a2428e9685b6c30dc4a9a51a3aa64422d 100644 (file)
--- 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 b92c58256395a33bfd5e5a95398ecf2183f2bede..ce88a88654d4ecd6399ff6f9f4e5369570819f80 100644 (file)
--- 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<CodeStyleAbstractPanel>();
       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 9ed2425fe6213deeecf731bd248dec877a905eb3..a00a2e8f06885bcbfc43cb3483cbde289cf978fa 100644 (file)
--- 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 fc46d047bb3b36275324431dc6fa2d9a2c85f349..cabd12f2b882fa56b5f39bec246ecf84ca69551a 100644 (file)
--- 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.intellij.execution.impl.ConfigurationSettingsEditorWrapper">
   <grid id="27dc6" binding="myWholePanel" layout-manager="GridLayoutManager" row-count="5" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-    <margin top="5" left="8" bottom="5" right="5"/>
+    <margin top="5" left="8" bottom="5" right="0"/>
     <constraints>
       <xy x="124" y="274" width="276" height="150"/>
     </constraints>

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 286385e686c9a40c91ebdce9650c24799b36571b..b8a4aeee5fb6692731ddb67d28cc65b4979f89fa 100644 (file)
--- 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 @@
         <children/>
       </xy>
       <grid id="bb10e" layout-manager="GridLayoutManager" row-count="1" column-count="2" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-        <margin top="5" left="8" bottom="5" right="5"/>
+        <margin top="5" left="8" bottom="5" right="0"/>
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
         </constraints>

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 2cfabadd553d92fc63e430d1cdb7afd787ccbaf3..b6e97511d9b5524c40af9c2acd3c1f39ddeef78c 100644 (file)
--- 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<T> implements CompositeSettingsBuilder<T> {
     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<String, SettingsEditor<T>> 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 (file)
index 0000000..86bf103
--- /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 e43f68ee7882c2ee43aa60c054c577dba44e3a23..d9035d8242e0e4a378d38437d861bec75095b2b0 100644 (file)
--- 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 15814ad08fcc0aaf4a86d861289a1633295b517d..367350c4354d1b69c10c56d0acc4a0142677a90e 100644 (file)
--- 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 3c850c1740233c51a8fde691e71f5a6b9c561f33..8d9539f047c8a0852ffe470ee7993208cc35186c 100644 (file)
--- 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 0ca194eff7ed647b7a32a12738c2cd97c74bcb65..00eab3b5b741c3239b1a7bd236932670eda50313 100644 (file)
--- 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<AnAction>();
             toolbarActions = new ArrayList<AnAction>();
           }

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 1385088c2761fe69bdfcb16198a4c1c791ee38bb..ea9ac7b45f1f0f7892f0f915001ee97860478e72 100644 (file)
--- 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<AbstractVcs> vcses = new ArrayList<AbstractVcs>(confs.values());
       Collections.sort(vcses, new Comparator<AbstractVcs>() {
         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 361a2cb70c242a1c5143ce02862778b77670427e..1f56645d5a5b23ad2c686f39ba88548545b5407f 100644 (file)
--- 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<Configurable> configurables = new ArrayList<Configurable>();

diff --git a/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.form b/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.form
index 2f8101b1858668320ca2ab366488a56030fcecb5..e4e4c4c51eb24db976ec732f92cf676036def881 100644 (file)
--- a/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.form
+++ b/plugins/android/src/org/jetbrains/android/facet/AndroidFacetEditorTab.form
@@ -35,7 +35,7 @@
           <text resource-bundle="messages/AndroidBundle" key="android.facet.editor.is.library.checkbox"/>
         </properties>
       </component>
-      <tabbedpane id="bec33">
+      <tabbedpane id="bec33" class="com.intellij.ui.components.JBTabbedPane">
         <constraints>
           <grid row="1" column="0" row-span="1" col-span="2" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <preferred-size width="200" height="200"/>

diff --git a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form
index 2d9c3a6b9471c584b4231343772cc0b12dabe94f..4fcd4fff249707f4b7f988d9ef5a12570515c91a 100644 (file)
--- a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form
+++ b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.form
@@ -15,7 +15,7 @@
           </grid>
         </constraints>
       </vspacer>
-      <tabbedpane id="f3a" binding="myTabbedPane">
+      <tabbedpane id="f3a" class="com.intellij.ui.components.JBTabbedPane">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <preferred-size width="200" height="200"/>
@@ -24,7 +24,7 @@
         <properties/>
         <border type="none"/>
         <children>
-          <grid id="37ff8" layout-manager="GridLayoutManager" row-count="5" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+          <grid id="37ff8" layout-manager="GridLayoutManager" row-count="4" column-count="3" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
             <margin top="7" left="7" bottom="7" right="7"/>
             <constraints>
               <tabbedpane title-resource-bundle="messages/AndroidBundle" title-key="android.run.configuration.general.tab.title"/>
@@ -43,7 +43,7 @@
               </component>
               <vspacer id="ff5d5">
                 <constraints>
-                  <grid row="4" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
+                  <grid row="3" column="0" row-span="1" col-span="1" vsize-policy="6" hsize-policy="1" anchor="0" fill="2" indent="0" use-parent-layout="false"/>
                 </constraints>
               </vspacer>
               <component id="a005a" class="javax.swing.JComboBox" binding="myModulesComboBox">
@@ -68,7 +68,7 @@
               <grid id="e9e4a" layout-manager="GridLayoutManager" row-count="2" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="0">
                 <margin top="0" left="0" bottom="0" right="0"/>
                 <constraints>
-                  <grid row="2" column="0" row-span="2" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+                  <grid row="2" column="0" row-span="1" col-span="3" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                 </constraints>
                 <properties/>
                 <border type="none"/>
@@ -82,7 +82,7 @@
                     </properties>
                   </component>
                   <grid id="4d07" layout-manager="GridLayoutManager" row-count="1" column-count="1" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
-                    <margin top="0" left="28" bottom="0" right="0"/>
+                    <margin top="0" left="26" bottom="0" right="0"/>
                     <constraints>
                       <grid row="1" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
                     </constraints>

diff --git a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java
index a96ccf3a426b1354ebb9ee60b4478557dfd1b243..ca32757c488866147cb64e384d655e0682471307 100644 (file)
--- 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<T extends AndroidRunConfigurationBase
   private JComboBox myNetworkLatencyCombo;
   private JCheckBox myDisableBootAnimationCombo;
   private JCheckBox myClearLogCheckBox;
-  private JTabbedPane myTabbedPane;
   private JBLabel myModuleJBLabel;
   private ComboboxWithBrowseButton myAvdBox;
   private RawCommandLineEditor myCommandLineField;

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/CompositeConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/CompositeConfigurable.java
index f24509ce85389798709b72e81cb9b2c2848f8a7a..34f75c871b2d12d841c13ec928c7791821333206 100644 (file)
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/CompositeConfigurable.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/CompositeConfigurable.java
@@ -17,6 +17,7 @@ package org.jetbrains.idea.maven.execution;
 
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
+import com.intellij.ui.components.JBTabbedPane;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
@@ -41,7 +42,7 @@ public class CompositeConfigurable implements Configurable {
   }
 
   public JComponent createComponent() {
-    tabbedPane = new JTabbedPane();
+    tabbedPane = new JBTabbedPane();
     for (Configurable configurable : configurables) {
       JComponent component = configurable.createComponent();
       component.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));

diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form
index c5ac48740d20c12922eb902336ab9998ad86848b..5f4ca2897a54bc47256a51acff6807319d3fd601 100644 (file)
--- a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form
+++ b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettingsPane.form
@@ -37,7 +37,7 @@
         <properties/>
         <border type="none"/>
         <children>
-          <tabbedpane id="b70bc" default-binding="true">
+          <tabbedpane id="b70bc" class="com.intellij.ui.components.JBTabbedPane" default-binding="true">
             <constraints>
               <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
                 <preferred-size width="200" height="200"/>
@@ -93,13 +93,13 @@
                         <border type="none"/>
                         <children/>
                       </grid>
-                      <component id="a371c" class="javax.swing.JLabel">
+                      <component id="9988" class="com.intellij.ui.components.JBLabel">
                         <constraints>
-                          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+                          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                         </constraints>
                         <properties>
-                          <font size="10"/>
-                          <foreground color="-10066330"/>
+                          <componentStyle value="SMALL"/>
+                          <fontColor value="BRIGHTER"/>
                           <text resource-bundle="com/intellij/spellchecker/util/SpellCheckerBundle" key="dictionaries.panel.description"/>
                         </properties>
                       </component>
@@ -125,13 +125,13 @@
                         <border type="none"/>
                         <children/>
                       </grid>
-                      <component id="be7e9" class="javax.swing.JLabel">
+                      <component id="114cf" class="com.intellij.ui.components.JBLabel">
                         <constraints>
-                          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="9" fill="0" indent="0" use-parent-layout="false"/>
+                          <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
                         </constraints>
                         <properties>
-                          <font size="10"/>
-                          <foreground color="-10066330"/>
+                          <componentStyle value="SMALL"/>
+                          <fontColor value="BRIGHTER"/>
                           <text resource-bundle="com/intellij/spellchecker/util/SpellCheckerBundle" key="add.directory.description"/>
                         </properties>
                       </component>

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 c41d23cd59c557eca95d5265fb41c7d2ef3c5fa8..d507aed3a21cd6e2b4d7ec5eb566813afffe62e7 100644 (file)
--- 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 4fc7d0565b48a0b6c4dae5f17f8ea178a35020ee..43d91e66608b61e7e1c68227ed5201389ccf9788 100644 (file)
--- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form
+++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.form
@@ -144,7 +144,7 @@
           </component>
         </children>
       </grid>
-      <tabbedpane id="7ce0a" default-binding="true">
+      <tabbedpane id="7ce0a" class="com.intellij.ui.components.JBTabbedPane" default-binding="true">
         <constraints>
           <grid row="2" column="0" row-span="1" col-span="5" vsize-policy="0" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <preferred-size width="200" height="200"/>

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 33246b4c6b64ae46011f6f1e637c6e37885cd723..0df98422f84b7a608ce1ec3c09cd309f913ee7d6 100644 (file)
--- 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 @@
     <properties/>
     <border type="none"/>
     <children>
-      <tabbedpane id="d5ff" binding="myTabbedPane">
+      <tabbedpane id="d5ff" class="com.intellij.ui.components.JBTabbedPane" binding="myTabbedPane">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <preferred-size width="200" height="200"/>

diff --git a/plugins/ui-designer/testData/TestTabbedPane.form b/plugins/ui-designer/testData/TestTabbedPane.form
index fc2951e6621a7dcca11f1c4c98b4d89548a00995..fdc151a3f5bb7840f6a768fee853b428199061b0 100644 (file)
--- a/plugins/ui-designer/testData/TestTabbedPane.form
+++ b/plugins/ui-designer/testData/TestTabbedPane.form
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="BindingTest">
-  <tabbedpane id="2bb0a" binding="myRootComponent">
+  <tabbedpane id="2bb0a" class="com.intellij.ui.components.JBTabbedPane" binding="myRootComponent">
     <constraints>
       <xy x="159" y="99" width="200" height="200"/>
       <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3">

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 3033c3dd087adb25005ccc3dc7190e9859e60716..a2b9afbfe13392bdbe4bca9c43b5590b870ebdbc 100644 (file)
--- 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 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="org.intellij.lang.xpath.xslt.run.XsltRunSettingsEditor.Editor">
-  <tabbedpane id="fb52f" binding="myComponent">
+  <tabbedpane id="fb52f" class="com.intellij.ui.components.JBTabbedPane" binding="myComponent">
     <constraints>
       <xy x="115" y="24" width="580" height="497"/>
     </constraints>

diff --git a/samples/textEditor/src/myDocumentFiles/OpenFileForm.form b/samples/textEditor/src/myDocumentFiles/OpenFileForm.form
index 7e71f042101d42e7ef8f1577416295412a640752..87939cdd951b1c36bea423312028de7bdf16d332 100644 (file)
--- a/samples/textEditor/src/myDocumentFiles/OpenFileForm.form
+++ b/samples/textEditor/src/myDocumentFiles/OpenFileForm.form
@@ -11,7 +11,7 @@
     </properties>
     <border type="none" title-justification="2" title-position="1"/>
     <children>
-      <tabbedpane id="7b4c" binding="viewFileTab">
+      <tabbedpane id="7b4c" class="com.intellij.ui.components.JBTabbedPane" binding="viewFileTab">
         <constraints>
           <grid row="0" column="0" row-span="1" col-span="1" vsize-policy="3" hsize-policy="3" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <preferred-size width="200" height="200"/>

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 fdcbed8cada14018520f5782835b89dbcb72cd0a..9f6da66b182069482b59901cb63c9d8920ecb368 100644 (file)
--- 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) {