From 6cff4ccbd95f8270fc58d637c76991d9d30d3290 Mon Sep 17 00:00:00 2001
From: Alexey Pegov <alexey.pegov@jetbrains.com>
Date: Wed, 11 Nov 2009 17:14:38 +0300
Subject: [PATCH] more code style settings editor fixes: do not dispose panels
 on reset (do reset instead)

---
 .../intellij/application/options/CodeStyleSchemesConfigurable.java   | 4 +++-
 .../intellij/application/options/codeStyle/CodeStyleMainPanel.java   | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java
index a02395bd6f..3bfdb90d9d 100644
--- a/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java
+++ b/platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java
@@ -334,7 +334,9 @@ public class CodeStyleSchemesConfigurable extends SearchableConfigurable.Parent.
     }
 
     public void resetPanel() {
-      ensurePanel().reset();
+      if (myPanel != null) {
+        myPanel.reset();
+      }
     }
 
     public void reset() {
diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
index 65874d2c18..1b22827a30 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/CodeStyleMainPanel.java
@@ -132,7 +132,10 @@ public class CodeStyleMainPanel extends JPanel {
   }
 
   public void reset() {
-    clearPanels();
+    for (NewCodeStyleSettingsPanel panel : mySettingsPanels.values()) {
+      panel.reset();
+    }
+
     onCurrentSchemeChanged();
   }
 
-- 
2.11.4.GIT