From a6e9e0cf46366fc9bc3030bd53c5d3707dc0b214 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 28 Jul 2015 17:35:47 +0200 Subject: [PATCH] =?UTF-8?q?usage=20of=20other.xml=20is=20deprecated=20?= =?UTF-8?q?=E2=80=94=20custom=20file=20should=20be=20used=20instead?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/intellij/util/net/ssl/CertificateManager.java | 6 ++++-- .../src/com/intellij/tasks/config/TaskSettings.java | 9 ++++----- 2 files changed, 8 insertions(+), 7 deletions(-) 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 261258a4d7b3..612e78350add 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 @@ -78,10 +78,12 @@ import java.util.concurrent.atomic.AtomicReference; * * @author Mikhail Golubev */ - @State( name = "CertificateManager", - storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml") + storages = { + @Storage(file = StoragePathMacros.APP_CONFIG + "/certificates.xml"), + @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml", deprecated = true) + } ) public class CertificateManager implements PersistentStateComponent { diff --git a/plugins/tasks/tasks-api/src/com/intellij/tasks/config/TaskSettings.java b/plugins/tasks/tasks-api/src/com/intellij/tasks/config/TaskSettings.java index 3dc63be19b24..ae224fc71c23 100644 --- a/plugins/tasks/tasks-api/src/com/intellij/tasks/config/TaskSettings.java +++ b/plugins/tasks/tasks-api/src/com/intellij/tasks/config/TaskSettings.java @@ -25,12 +25,11 @@ import com.intellij.util.xmlb.XmlSerializerUtil; @State( name = "TaskSettings", storages = { - @Storage( - file = StoragePathMacros.APP_CONFIG + "/other.xml" - )} + @Storage(file = StoragePathMacros.APP_CONFIG + "/tasks.xml"), + @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml", deprecated = true) + } ) public class TaskSettings implements PersistentStateComponent { - public boolean ALWAYS_DISPLAY_COMBO = false; public int CONNECTION_TIMEOUT = 5000; @@ -47,4 +46,4 @@ public class TaskSettings implements PersistentStateComponent { public void loadState(TaskSettings state) { XmlSerializerUtil.copyBean(state, this); } -} +} \ No newline at end of file