From aea400252795fe5ff57062d4197868355859b147 Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Thu, 28 Jan 2016 13:07:16 +0100
Subject: [PATCH] =?UTF-8?q?CodeStyleSettingsManager=20=E2=80=94=C2=A0use?=
 =?UTF-8?q?=20standard=20code.style.schemes.xml=20DefaultColorSchemesManag?=
 =?UTF-8?q?er=20=E2=80=94=20disable=20roaming?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../colors/ex/DefaultColorSchemesManager.java       |  2 +-
 .../psi/codeStyle/AppCodeStyleSettingsManager.java  | 13 +++++--------
 .../src/messages/OptionsBundle.properties           |  1 +
 .../src/META-INF/LangExtensions.xml                 |  3 +--
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/ex/DefaultColorSchemesManager.java b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/ex/DefaultColorSchemesManager.java
index d58f8414734d..a9a26078d647 100644
--- a/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/ex/DefaultColorSchemesManager.java
+++ b/platform/editor-ui-ex/src/com/intellij/openapi/editor/colors/ex/DefaultColorSchemesManager.java
@@ -29,7 +29,7 @@ import java.util.List;
 @State(
   name = "DefaultColorSchemesManager",
   defaultStateAsResource = true,
-  storages = @Storage(file = StoragePathMacros.APP_CONFIG + "/other.xml")
+  storages = @Storage(file = "other.xml", roamingType = RoamingType.DISABLED)
 )
 public class DefaultColorSchemesManager implements PersistentStateComponent<Element> {
   private final List<DefaultColorsScheme> mySchemes;
diff --git a/platform/lang-api/src/com/intellij/psi/codeStyle/AppCodeStyleSettingsManager.java b/platform/lang-api/src/com/intellij/psi/codeStyle/AppCodeStyleSettingsManager.java
index c2116ae3c1e7..cf121bee7a4b 100644
--- a/platform/lang-api/src/com/intellij/psi/codeStyle/AppCodeStyleSettingsManager.java
+++ b/platform/lang-api/src/com/intellij/psi/codeStyle/AppCodeStyleSettingsManager.java
@@ -13,20 +13,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.psi.codeStyle;
 
 import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
-import com.intellij.openapi.components.StoragePathMacros;
-
 
 @State(
   name = "CodeStyleSettingsManager",
-    storages = {
-    @Storage(
-      file = StoragePathMacros.APP_CONFIG + "/other.xml"
-    )}
+  storages = {
+    @Storage(file = "code.style.schemes"),
+    @Storage(file = "other.xml", deprecated = true)
+  }
 )
-public class AppCodeStyleSettingsManager extends CodeStyleSettingsManager{
+public class AppCodeStyleSettingsManager extends CodeStyleSettingsManager {
 }
diff --git a/platform/platform-resources-en/src/messages/OptionsBundle.properties b/platform/platform-resources-en/src/messages/OptionsBundle.properties
index 1a326f41ed5b..bbb0c0ef486e 100644
--- a/platform/platform-resources-en/src/messages/OptionsBundle.properties
+++ b/platform/platform-resources-en/src/messages/OptionsBundle.properties
@@ -321,6 +321,7 @@ exportable.BaseRefactoringSettings.presentable.name=Refactoring
 exportable.DuplocatorSettings.presentable.name=Duplocator
 exportable.MultiLanguageDuplocatorSettings.presentable.name=Duplocator
 exportable.CodeStyleSchemeSettings.presentable.name=Code Style
+exportable.CodeStyleSettingsManager.presentable.name=Code Style
 exportable.InspectionProfileManager.presentable.name=Inspection profiles
 exportable.TodoConfiguration.presentable.name=Todo
 exportable.UISettings.presentable.name=UI Settings
diff --git a/platform/platform-resources/src/META-INF/LangExtensions.xml b/platform/platform-resources/src/META-INF/LangExtensions.xml
index a706a8731e61..ebb16ebb6e4c 100644
--- a/platform/platform-resources/src/META-INF/LangExtensions.xml
+++ b/platform/platform-resources/src/META-INF/LangExtensions.xml
@@ -132,8 +132,7 @@
     <applicationService serviceInterface="com.intellij.ui.mac.MacMessagesEmulation"
                         serviceImplementation="com.intellij.ui.messages.JBMacMessages"/>
 
-    <applicationService serviceInterface="com.intellij.psi.codeStyle.AppCodeStyleSettingsManager"
-                        serviceImplementation="com.intellij.psi.codeStyle.AppCodeStyleSettingsManager"/>
+    <applicationService serviceImplementation="com.intellij.psi.codeStyle.AppCodeStyleSettingsManager"/>
 
     <applicationService serviceInterface="com.intellij.psi.impl.source.resolve.reference.impl.providers.FileInfoManager"
                         serviceImplementation="com.intellij.psi.impl.source.resolve.reference.impl.providers.FileInfoManager"/>