From da77c53141c44718d99eac749bf2072469741a4b Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Fri, 2 Sep 2011 11:12:38 +0200
Subject: [PATCH] CodeStyleSettings: more fluent tabs order

---
 .../options/CommonCodeStyleSettingsConfigurable.java   | 10 +++++-----
 .../options/TabbedLanguageCodeStylePanel.java          |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/CommonCodeStyleSettingsConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/CommonCodeStyleSettingsConfigurable.java
index 367f9dab1919..ddcd4e3ddc17 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CommonCodeStyleSettingsConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/CommonCodeStyleSettingsConfigurable.java
@@ -45,8 +45,8 @@ public class CommonCodeStyleSettingsConfigurable extends CodeStyleAbstractConfig
 
   private static class MyCodeStylePanel extends TabbedLanguageCodeStylePanel {
     private CodeStyleSpacesPanel mySpacesPanel;
-    private CodeStyleBlankLinesPanel myBlankLinesPanel;
     private WrappingAndBracesPanel myWrappingAndBracesPanel;
+    private CodeStyleBlankLinesPanel myBlankLinesPanel;
 
     protected MyCodeStylePanel(CodeStyleSettings currentSettings, CodeStyleSettings settings) {
       super(null, currentSettings, settings);
@@ -55,25 +55,25 @@ public class CommonCodeStyleSettingsConfigurable extends CodeStyleAbstractConfig
     @Override
     protected void initTabs(CodeStyleSettings settings) {
       mySpacesPanel = new CodeStyleSpacesPanel(settings);
-      myBlankLinesPanel = new CodeStyleBlankLinesPanel(settings);
       myWrappingAndBracesPanel = new WrappingAndBracesPanel(settings);
+      myBlankLinesPanel = new CodeStyleBlankLinesPanel(settings);
       addTab(mySpacesPanel);
-      addTab(myBlankLinesPanel);
       addTab(myWrappingAndBracesPanel);
+      addTab(myBlankLinesPanel);
     }
 
     @Override
     public void setLanguageSelector(LanguageSelector langSelector) {
       mySpacesPanel.setLanguageSelector(langSelector);
-      myBlankLinesPanel.setLanguageSelector(langSelector);
       myWrappingAndBracesPanel.setLanguageSelector(langSelector);
+      myBlankLinesPanel.setLanguageSelector(langSelector);
     }
 
     @Override
     public boolean setPanelLanguage(Language language) {
       mySpacesPanel.setPanelLanguage(language);
-      myBlankLinesPanel.setPanelLanguage(language);
       myWrappingAndBracesPanel.setPanelLanguage(language);
+      myBlankLinesPanel.setPanelLanguage(language);
       return true;
     }
   }
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 73a0f3593db2..fc24deebbba2 100644
--- a/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/TabbedLanguageCodeStylePanel.java
@@ -71,8 +71,8 @@ public abstract class TabbedLanguageCodeStylePanel extends CodeStyleAbstractPane
     addIndentOptionsTab(settings);
     if (provider != null && !provider.usesSharedPreview()) {
       addSpacesTab(settings);
-      addBlankLinesTab(settings);
       addWrappingAndBracesTab(settings);
+      addBlankLinesTab(settings);
     }
   }