From 954b2db5afdb490e74423ac0ae73d38711444622 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 1 Aug 2018 11:10:25 +0200
Subject: [PATCH] remove outdated storage specs

---
 .../com/intellij/ide/todo/TodoConfiguration.java |  8 +-------
 .../ex/ApplicationInspectionProfileManager.java  |  5 +----
 .../openapi/util/registry/RegistryState.java     |  8 +-------
 .../com/intellij/util/net/HttpConfigurable.java  |  9 +--------
 .../util/net/ssl/CertificateManager.java         | 16 +++++-----------
 5 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/platform/editor-ui-ex/src/com/intellij/ide/todo/TodoConfiguration.java b/platform/editor-ui-ex/src/com/intellij/ide/todo/TodoConfiguration.java
index b31eaa9b72a2..983a7de3ae25 100644
--- a/platform/editor-ui-ex/src/com/intellij/ide/todo/TodoConfiguration.java
+++ b/platform/editor-ui-ex/src/com/intellij/ide/todo/TodoConfiguration.java
@@ -22,13 +22,7 @@ import java.beans.PropertyChangeListener;
 import java.util.Arrays;
 import java.util.List;
 
-@State(
-  name = "TodoConfiguration",
-  storages = {
-    @Storage("editor.xml"),
-    @Storage(value = "other.xml", deprecated = true)
-  }
-)
+@State(name = "TodoConfiguration", storages = @Storage("editor.xml"))
 public class TodoConfiguration implements PersistentStateComponent<Element> {
   private boolean myMultiLine = true;
   private TodoPattern[] myTodoPatterns;
diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/ApplicationInspectionProfileManager.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/ApplicationInspectionProfileManager.java
index 85dde4517aed..b3cfcef749d9 100644
--- a/platform/lang-impl/src/com/intellij/codeInspection/ex/ApplicationInspectionProfileManager.java
+++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/ApplicationInspectionProfileManager.java
@@ -45,10 +45,7 @@ import java.util.function.Function;
 
 @State(
   name = "InspectionProfileManager",
-  storages = {
-    @Storage("editor.xml"),
-    @Storage(value = "other.xml", deprecated = true)
-  },
+  storages = @Storage("editor.xml"),
   additionalExportFile = InspectionProfileManager.INSPECTION_DIR
 )
 public class ApplicationInspectionProfileManager extends BaseInspectionProfileManager implements InspectionProfileManager, PersistentStateComponent<Element> {
diff --git a/platform/platform-api/src/com/intellij/openapi/util/registry/RegistryState.java b/platform/platform-api/src/com/intellij/openapi/util/registry/RegistryState.java
index b1aee760ca94..e89ef0148f32 100644
--- a/platform/platform-api/src/com/intellij/openapi/util/registry/RegistryState.java
+++ b/platform/platform-api/src/com/intellij/openapi/util/registry/RegistryState.java
@@ -13,13 +13,7 @@ import org.jetbrains.annotations.NotNull;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@State(
-  name = "Registry",
-  storages = {
-    @Storage("ide.general.xml"),
-    @Storage(value = "other.xml", deprecated = true)
-  }
-)
+@State(name = "Registry", storages = @Storage("ide.general.xml"))
 public class RegistryState implements PersistentStateComponent<Element> {
   private static final Logger LOG = Logger.getInstance(RegistryState.class);
 
diff --git a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
index 5a0ea52aa971..b9fd78e53900 100644
--- a/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
+++ b/platform/platform-api/src/com/intellij/util/net/HttpConfigurable.java
@@ -54,14 +54,7 @@ import java.util.stream.Collectors;
 
 import static com.intellij.openapi.util.Pair.pair;
 
-@State(
-  name = "HttpConfigurable",
-  storages = {
-    @Storage("proxy.settings.xml"),
-    // we use two storages due to backward compatibility, see http://crucible.labs.intellij.net/cru/CR-IC-5142
-    @Storage(value = "other.xml", deprecated = true)
-  }
-)
+@State(name = "HttpConfigurable", storages = @Storage("proxy.settings.xml"))
 public class HttpConfigurable implements PersistentStateComponent<HttpConfigurable>, Disposable, ApplicationComponent {
   private static final Logger LOG = Logger.getInstance("#com.intellij.util.net.HttpConfigurable");
   private static final File PROXY_CREDENTIALS_FILE = new File(PathManager.getOptionsPath(), "proxy.settings.pwd");
diff --git a/platform/platform-api/src/com/intellij/util/net/ssl/CertificateManager.java b/platform/platform-api/src/com/intellij/util/net/ssl/CertificateManager.java
index 5dd21670cc72..ebd15653f5ac 100644
--- a/platform/platform-api/src/com/intellij/util/net/ssl/CertificateManager.java
+++ b/platform/platform-api/src/com/intellij/util/net/ssl/CertificateManager.java
@@ -60,13 +60,7 @@ import java.util.concurrent.atomic.AtomicReference;
  *
  * @author Mikhail Golubev
  */
-@State(
-  name = "CertificateManager",
-  storages = {
-    @Storage("certificates.xml"),
-    @Storage(value = "other.xml", deprecated = true)
-  }
-)
+@State(name = "CertificateManager", storages = @Storage("certificates.xml"))
 public class CertificateManager implements PersistentStateComponent<CertificateManager.Config> {
 
   @NonNls public static final String COMPONENT_NAME = "Certificate Manager";
@@ -76,15 +70,15 @@ public class CertificateManager implements PersistentStateComponent<CertificateM
   private static final Logger LOG = Logger.getInstance(CertificateManager.class);
 
   /**
-   * Note that deprecated {@link org.apache.http.conn.ssl.BrowserCompatHostnameVerifier} is used intentionally here 
-   * since external clients might expect implementor of {@link org.apache.http.conn.ssl.X509HostnameVerifier} and 
+   * Note that deprecated {@link org.apache.http.conn.ssl.BrowserCompatHostnameVerifier} is used intentionally here
+   * since external clients might expect implementor of {@link org.apache.http.conn.ssl.X509HostnameVerifier} and
    * {@link org.apache.http.conn.ssl.DefaultHostnameVerifier} is not.
-   * 
+   *
    * @deprecated To be removed in IDEA 18. Use specific host name verifiers from httpclient-4.x instead.
    */
   @Deprecated
   public static final HostnameVerifier HOSTNAME_VERIFIER = new BrowserCompatHostnameVerifier();
-  
+
   /**
    * Used to check whether dialog is visible to prevent possible deadlock, e.g. when some external resource is loaded by
    * {@link java.awt.MediaTracker}.