From d70687cd1b72c12150903084dc61dd84d9e7516b Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 2 Aug 2018 18:11:40 +0200
Subject: [PATCH] store all debugger settings in debugger.xml

---
 .../debugger/settings/NodeRendererSettings.java       | 11 +++++++----
 .../debugger/settings/ThreadsViewSettings.java        |  9 ++++-----
 .../debugger/settings/ViewsGeneralSettings.java       |  8 ++++----
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java
index b334c3f502ec..e62fb6895b28 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/NodeRendererSettings.java
@@ -12,8 +12,8 @@ import com.intellij.debugger.ui.impl.watch.ValueDescriptorImpl;
 import com.intellij.debugger.ui.impl.watch.WatchItemDescriptor;
 import com.intellij.debugger.ui.tree.DebuggerTreeNode;
 import com.intellij.debugger.ui.tree.ValueDescriptor;
-import com.intellij.debugger.ui.tree.render.*;
 import com.intellij.debugger.ui.tree.render.Renderer;
+import com.intellij.debugger.ui.tree.render.*;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.components.PersistentStateComponent;
 import com.intellij.openapi.components.ServiceManager;
@@ -38,7 +38,10 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-@State(name = "NodeRendererSettings", storages = @Storage("debugger.renderers.xml"))
+@State(name = "NodeRendererSettings", storages = {
+  @Storage("debugger.xml"),
+  @Storage(value = "debugger.renderers.xml", deprecated = true),
+})
 public class NodeRendererSettings implements PersistentStateComponent<Element> {
   @NonNls private static final String REFERENCE_RENDERER = "Reference renderer";
   @NonNls public static final String RENDERER_TAG = "Renderer";
@@ -75,14 +78,14 @@ public class NodeRendererSettings implements PersistentStateComponent<Element> {
   @NonNls private static final String HEX_VIEW_ENABLED = "HEX_VIEW_ENABLED";
   @NonNls private static final String ALTERNATIVE_COLLECTION_VIEW_ENABLED = "ALTERNATIVE_COLLECTION_VIEW_ENABLED";
   @NonNls private static final String CUSTOM_RENDERERS_TAG_NAME = "CustomRenderers";
-  
+
   public NodeRendererSettings() {
     // default configuration
     myHexRenderer.setEnabled(false);
     myToStringRenderer.setEnabled(true);
     setAlternateCollectionViewsEnabled(true);
   }
-  
+
   public static NodeRendererSettings getInstance() {
     return ServiceManager.getService(NodeRendererSettings.class);
   }
diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewSettings.java
index 562750550339..f03ff2e633ef 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewSettings.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/ThreadsViewSettings.java
@@ -8,11 +8,10 @@ import com.intellij.openapi.components.Storage;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import org.jetbrains.annotations.NotNull;
 
-@State(
-  name="ThreadsViewSettings",
-  storages= {
-    @Storage("debugger.threadsview.xml")}
-)
+@State(name = "ThreadsViewSettings", storages = {
+  @Storage("debugger.xml"),
+  @Storage(value = "debugger.threadsview.xml", deprecated = true),
+})
 public class ThreadsViewSettings implements PersistentStateComponent<ThreadsViewSettings> {
   public boolean SHOW_THREAD_GROUPS = false;
   public boolean SHOW_LINE_NUMBER = true;
diff --git a/java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java b/java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java
index 0f7c963f1d6b..0ff8d680e5cc 100644
--- a/java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java
+++ b/java/debugger/impl/src/com/intellij/debugger/settings/ViewsGeneralSettings.java
@@ -8,10 +8,10 @@ import com.intellij.openapi.components.Storage;
 import com.intellij.util.xmlb.XmlSerializerUtil;
 import org.jetbrains.annotations.NotNull;
 
-@State(
-  name = "ViewsSettings",
-  storages = @Storage("debugger.frameview.xml")
-)
+@State(name = "ViewsSettings", storages = {
+  @Storage("debugger.xml"),
+  @Storage(value = "debugger.frameview.xml", deprecated = true),
+})
 public class ViewsGeneralSettings implements PersistentStateComponent<ViewsGeneralSettings> {
   public boolean SHOW_OBJECTID = true;
   public boolean HIDE_NULL_ARRAY_ELEMENTS = true;