From 8622173af578bf2a38976ce5fbe25642a142e33c Mon Sep 17 00:00:00 2001
From: Ekaterina Shliakhovetskaja <shkate@jetbrains.com>
Date: Wed, 28 Oct 2009 12:51:59 +0300
Subject: [PATCH] Spellchecker: change storage - workspace will be used instead
 of special spellchecker file

---
 .../settings/SpellCheckerSettings.java        | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettings.java b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettings.java
index 9217bbae7d75..8ad57b734b1c 100644
--- a/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettings.java
+++ b/plugins/spellchecker/src/com/intellij/spellchecker/settings/SpellCheckerSettings.java
@@ -26,11 +26,7 @@ import java.util.*;
   name = "SpellCheckerSettings",
   storages = {@Storage(
     id = "other",
-    file = "$PROJECT_FILE$"),
-    @Storage(
-    id = "dir",
-    file = "$PROJECT_CONFIG_DIR$/spellchecker-settings.xml",
-    scheme = StorageScheme.DIRECTORY_BASED)})
+    file = "$WORKSPACE_FILE$")})
 public class SpellCheckerSettings implements PersistentStateComponent<Element> {
   // For xml serialization
   private static final String SPELLCHECKER_MANAGER_SETTINGS_TAG = "SpellCheckerSettings";
@@ -49,8 +45,8 @@ public class SpellCheckerSettings implements PersistentStateComponent<Element> {
 
   private Set<String> myBundledDisabledDictionariesPaths = new HashSet<String>();
 
-  public static SpellCheckerSettings getInstance(Project project){
-    return ServiceManager.getService(project,SpellCheckerSettings.class);
+  public static SpellCheckerSettings getInstance(Project project) {
+    return ServiceManager.getService(project, SpellCheckerSettings.class);
   }
 
 
@@ -118,20 +114,20 @@ public class SpellCheckerSettings implements PersistentStateComponent<Element> {
     // bundled
     element.setAttribute(BUNDLED_DICTIONARIES_ATTR_NAME, String.valueOf(myBundledDisabledDictionariesPaths.size()));
     Iterator<String> iterator = myBundledDisabledDictionariesPaths.iterator();
-    int i=0;
-    while (iterator.hasNext()){
+    int i = 0;
+    while (iterator.hasNext()) {
       element.setAttribute(BUNDLED_DICTIONARY_ATTR_NAME + i, iterator.next());
       i++;
     }
     // user
     element.setAttribute(FOLDERS_ATTR_NAME, String.valueOf(myDictionaryFoldersPaths.size()));
-    for (int j=0;j< myDictionaryFoldersPaths.size();j++){
+    for (int j = 0; j < myDictionaryFoldersPaths.size(); j++) {
       element.setAttribute(FOLDER_ATTR_NAME + j, myDictionaryFoldersPaths.get(j));
     }
     element.setAttribute(DICTIONARIES_ATTR_NAME, String.valueOf(myDisabledDictionariesPaths.size()));
     iterator = myDisabledDictionariesPaths.iterator();
-    i=0;
-    while (iterator.hasNext()){
+    i = 0;
+    while (iterator.hasNext()) {
       element.setAttribute(DICTIONARY_ATTR_NAME + i, iterator.next());
       i++;
     }
@@ -147,16 +143,16 @@ public class SpellCheckerSettings implements PersistentStateComponent<Element> {
     try {
       // bundled
       final int bundledDictionariesSize = Integer.valueOf(element.getAttributeValue(BUNDLED_DICTIONARIES_ATTR_NAME));
-      for (int i=0;i<bundledDictionariesSize;i++){
+      for (int i = 0; i < bundledDictionariesSize; i++) {
         myBundledDisabledDictionariesPaths.add(element.getAttributeValue(BUNDLED_DICTIONARY_ATTR_NAME + i));
       }
       // user
       final int foldersSize = Integer.valueOf(element.getAttributeValue(FOLDERS_ATTR_NAME));
-      for (int i=0;i<foldersSize;i++){
+      for (int i = 0; i < foldersSize; i++) {
         myDictionaryFoldersPaths.add(element.getAttributeValue(FOLDER_ATTR_NAME + i));
       }
       final int scriptsSize = Integer.valueOf(element.getAttributeValue(DICTIONARIES_ATTR_NAME));
-      for (int i=0;i<scriptsSize;i++){
+      for (int i = 0; i < scriptsSize; i++) {
         myDisabledDictionariesPaths.add(element.getAttributeValue(DICTIONARY_ATTR_NAME + i));
       }
     }