From 9d0aace8c4639d19b5af4e9702fbf0f2e6e1c21d Mon Sep 17 00:00:00 2001
From: Valentina Kiryushkina <valentina.kiryushkina@jetbrains.com>
Date: Tue, 7 Jun 2016 14:01:27 +0300
Subject: [PATCH] Fix according to review IDEA-CR-11224: Store CCSetting in
 other.xml

---
 .../course-creator/resources/META-INF/plugin.xml             | 5 +----
 .../com/jetbrains/edu/coursecreator/settings/CCSettings.java | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/python/educational-core/course-creator/resources/META-INF/plugin.xml b/python/educational-core/course-creator/resources/META-INF/plugin.xml
index ca47bf362d37..7ebe9ea844e3 100644
--- a/python/educational-core/course-creator/resources/META-INF/plugin.xml
+++ b/python/educational-core/course-creator/resources/META-INF/plugin.xml
@@ -29,6 +29,7 @@
   <extensions defaultExtensionNs="Edu">
     <studyActionsProvider implementation="com.jetbrains.edu.coursecreator.CCStudyActionsProvider"/>
     <studyActionListener implementation="com.jetbrains.edu.coursecreator.CCStudyActionListener"/>
+    <optionsProvider instance="com.jetbrains.edu.coursecreator.settings.CCOptions"/>
   </extensions>
 
   <project-components>
@@ -85,8 +86,4 @@
     <action id="UnpackCourse" class="com.jetbrains.edu.coursecreator.actions.CCFromCourseArchive"/>
   </actions>
 
-  <extensions defaultExtensionNs="Edu">
-    <optionsProvider instance="com.jetbrains.edu.coursecreator.settings.CCOptions"/>
-  </extensions>
-
 </idea-plugin>
\ No newline at end of file
diff --git a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/settings/CCSettings.java b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/settings/CCSettings.java
index 2d61fbf6ebf8..6204a7e7765c 100644
--- a/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/settings/CCSettings.java
+++ b/python/educational-core/course-creator/src/com/jetbrains/edu/coursecreator/settings/CCSettings.java
@@ -6,7 +6,7 @@ import com.intellij.openapi.components.State;
 import com.intellij.openapi.components.Storage;
 import org.jetbrains.annotations.Nullable;
 
-@State(name = "CCSettings", storages = @Storage("cc_settings.xml"))
+@State(name = "CCSettings", storages = @Storage("other.xml"))
 public class CCSettings implements PersistentStateComponent<CCSettings.State> {
   private CCSettings.State myState = new CCSettings.State();