diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutProjectOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutProjectOperation.java
index 781f341a51b2..46792fd2aec0 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutProjectOperation.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/CheckoutProjectOperation.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.cvsSupport2.cvsoperations.cvsCheckOut;
 
+import com.intellij.application.options.CodeStyle;
 import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration;
 import com.intellij.cvsSupport2.connections.CvsEnvironment;
 import com.intellij.cvsSupport2.connections.CvsRootProvider;
@@ -23,11 +24,8 @@ import com.intellij.cvsSupport2.cvsoperations.common.CvsCommandOperation;
 import com.intellij.cvsSupport2.cvsoperations.common.CvsExecutionEnvironment;
 import com.intellij.cvsSupport2.javacvsImpl.io.SendTextFilePreprocessor;
 import com.intellij.cvsSupport2.keywordSubstitution.KeywordSubstitutionWrapper;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import com.intellij.util.ThrowableRunnable;
 import org.netbeans.lib.cvsclient.command.Command;
 import org.netbeans.lib.cvsclient.command.GlobalOptions;
-import org.netbeans.lib.cvsclient.command.IOCommandException;
 import org.netbeans.lib.cvsclient.command.KeywordSubstitution;
 import org.netbeans.lib.cvsclient.command.checkout.CheckoutCommand;
 import org.netbeans.lib.cvsclient.file.ILocalFileReader;
@@ -60,7 +58,7 @@ public class CheckoutProjectOperation extends CvsCommandOperation {
                                  boolean pruneEmptyDirectories,
                                  KeywordSubstitution keywordSubstitution) {
     super(new CheckoutAdminReader(),
-      new CheckoutAdminWriter(CodeStyleSettingsManager.getInstance().getCurrentSettings().getLineSeparator(),
+      new CheckoutAdminWriter(CodeStyle.getDefaultSettings().getLineSeparator(),
         CvsApplicationLevelConfiguration.getCharset()));
     myModuleNames = moduleNames;
     myEnvironment = environment;
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterOnCache.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterOnCache.java
index b77014a99714..d65bcb22860b 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterOnCache.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/javacvsSpecificImpls/AdminWriterOnCache.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.cvsSupport2.cvsoperations.javacvsSpecificImpls;
 
+import com.intellij.application.options.CodeStyle;
 import com.intellij.cvsSupport2.CvsUtil;
 import com.intellij.cvsSupport2.application.CvsEntriesManager;
 import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration;
@@ -24,14 +25,13 @@ import com.intellij.cvsSupport2.util.CvsVfsUtil;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
+import org.jetbrains.annotations.NotNull;
 import org.netbeans.lib.cvsclient.CvsRoot;
 import org.netbeans.lib.cvsclient.IClientEnvironment;
 import org.netbeans.lib.cvsclient.admin.AdminWriter;
 import org.netbeans.lib.cvsclient.admin.Entry;
 import org.netbeans.lib.cvsclient.admin.IAdminWriter;
 import org.netbeans.lib.cvsclient.file.*;
-import org.jetbrains.annotations.NotNull;
 
 import java.io.File;
 import java.io.IOException;
@@ -55,7 +55,7 @@ public class AdminWriterOnCache implements IAdminWriter {
     myUpdatedFilesManager = updatedFilesManager;
     myProjectContentInfoProvider = projectContentInfoProvider;
     myAdminWriter = new AdminWriter(
-      CodeStyleSettingsManager.getInstance().getCurrentSettings().getLineSeparator(),
+      CodeStyle.getDefaultSettings().getLineSeparator(),
       CvsApplicationLevelConfiguration.getCharset());    
   }
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/ReceiveTextFilePreprocessor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/ReceiveTextFilePreprocessor.java
index d7101a439419..32feaaf72ae8 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/ReceiveTextFilePreprocessor.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/ReceiveTextFilePreprocessor.java
@@ -15,18 +15,18 @@
  */
 package com.intellij.cvsSupport2.javacvsImpl.io;
 
+import com.intellij.application.options.CodeStyle;
 import com.intellij.cvsSupport2.CvsUtil;
 import com.intellij.cvsSupport2.cvsoperations.common.ReceivedFileProcessor;
 import com.intellij.cvsSupport2.util.CvsVfsUtil;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
-import java.util.HashMap;
 import org.netbeans.lib.cvsclient.file.IReaderFactory;
 import org.netbeans.lib.cvsclient.file.IReceiveTextFilePreprocessor;
 
 import java.io.*;
 import java.nio.charset.Charset;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -84,7 +84,7 @@ public class ReceiveTextFilePreprocessor implements IReceiveTextFilePreprocessor
       return myFileToSeparator.get(file);
     }
     else {
-      return CodeStyleSettingsManager.getInstance().getCurrentSettings().getLineSeparator();
+      return CodeStyle.getDefaultSettings().getLineSeparator();
     }
   }
 
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/StoringLineSeparatorsLocalFileWriter.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/StoringLineSeparatorsLocalFileWriter.java
index d9b5db14b4e7..cc41d476ebf0 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/StoringLineSeparatorsLocalFileWriter.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/javacvsImpl/io/StoringLineSeparatorsLocalFileWriter.java
@@ -15,6 +15,7 @@
  */
 package com.intellij.cvsSupport2.javacvsImpl.io;
 
+import com.intellij.application.options.CodeStyle;
 import com.intellij.cvsSupport2.CvsUtil;
 import com.intellij.cvsSupport2.cvsoperations.common.UpdatedFilesManager;
 import com.intellij.cvsSupport2.cvsoperations.cvsErrors.ErrorProcessor;
@@ -26,7 +27,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vcs.VcsException;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import org.jetbrains.annotations.NonNls;
 import org.netbeans.lib.cvsclient.file.*;
 
@@ -179,7 +179,7 @@ public class StoringLineSeparatorsLocalFileWriter implements ILocalFileWriter {
       return FileDocumentManager.getInstance().getLineSeparator(virtualFile, null);
     }
     catch (Exception ex) {
-      return CodeStyleSettingsManager.getInstance().getCurrentSettings().getLineSeparator();
+      return CodeStyle.getDefaultSettings().getLineSeparator();
     }
 
   }
diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsFileUtil.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsFileUtil.java
index a4bf0442b4f0..2136f4c9d688 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsFileUtil.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/util/CvsFileUtil.java
@@ -15,12 +15,12 @@
  */
 package com.intellij.cvsSupport2.util;
 
+import com.intellij.application.options.CodeStyle;
 import com.intellij.cvsSupport2.config.CvsApplicationLevelConfiguration;
 import com.intellij.cvsSupport2.javacvsImpl.FileReadOnlyHandler;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 
 import java.io.*;
 import java.util.ArrayList;
@@ -70,7 +70,7 @@ public class CvsFileUtil {
       return FileDocumentManager.getInstance().getLineSeparator(virtualFile, null);
     }
     else {
-      return CodeStyleSettingsManager.getInstance().getCurrentSettings().getLineSeparator();
+      return CodeStyle.getDefaultSettings().getLineSeparator();
     }
   }