From eea091a388254bf36c1637ae9335d487603a944e Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 24 Jul 2015 10:35:09 +0200
Subject: [PATCH] move getFile to StorageUtil to avoid dependency on
 DirectoryBasedStorage

---
 .../src/SchemeManagerImpl.kt                  |  2 +-
 .../impl/stores/DirectoryBasedStorage.java    | 20 ++-----------------
 .../components/impl/stores/StorageUtil.java   | 16 +++++++++++++++
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/platform/configuration-store-impl/src/SchemeManagerImpl.kt b/platform/configuration-store-impl/src/SchemeManagerImpl.kt
index 6d7e8446f6a2..83bc001a79dc 100644
--- a/platform/configuration-store-impl/src/SchemeManagerImpl.kt
+++ b/platform/configuration-store-impl/src/SchemeManagerImpl.kt
@@ -545,7 +545,7 @@ public class SchemeManagerImpl<T : Scheme, E : ExternalizableScheme>(private val
         }
 
         if (file == null) {
-          file = DirectoryBasedStorage.getFile(fileName, dir, this)
+          file = StorageUtil.getFile(fileName, dir, this)
         }
 
         runWriteAction {
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java
index aac73c443129..7cb81a3e25bd 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/DirectoryBasedStorage.java
@@ -142,23 +142,7 @@ public class DirectoryBasedStorage extends StateStorageBase<DirectoryStorageData
     if (parentVirtualFile == null) {
       throw new StateStorageException(ProjectBundle.message("project.configuration.save.file.not.found", parentFile));
     }
-    return getFile(ioDir.getName(), parentVirtualFile, requestor);
-  }
-
-  @NotNull
-  public static VirtualFile getFile(@NotNull String fileName, @NotNull VirtualFile parent, @NotNull Object requestor) throws IOException {
-    VirtualFile file = parent.findChild(fileName);
-    if (file != null) {
-      return file;
-    }
-
-    AccessToken token = WriteAction.start();
-    try {
-      return parent.createChildData(requestor, fileName);
-    }
-    finally {
-      token.finish();
-    }
+    return StorageUtil.getFile(ioDir.getName(), parentVirtualFile, requestor);
   }
 
   private static class MySaveSession extends SaveSessionBase {
@@ -258,7 +242,7 @@ public class DirectoryBasedStorage extends StateStorageBase<DirectoryStorageData
               storeElement.setAttribute(StorageData.NAME, componentName);
               storeElement.addContent(element);
 
-              VirtualFile file = getFile(fileName, dir, MySaveSession.this);
+              VirtualFile file = StorageUtil.getFile(fileName, dir, MySaveSession.this);
               StorageUtil.writeFile(null, MySaveSession.this, file, storeElement, LineSeparator.fromString(file.exists() ? StorageUtil.loadFile(file).second : SystemProperties.getLineSeparator()));
             }
             catch (IOException e) {
diff --git a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java
index 030b39ac084c..f0663498442b 100644
--- a/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/components/impl/stores/StorageUtil.java
@@ -356,4 +356,20 @@ public class StorageUtil {
   public static boolean isProjectOrModuleFile(@NotNull String fileSpec) {
     return StoragePathMacros.PROJECT_FILE.equals(fileSpec) || fileSpec.startsWith(StoragePathMacros.PROJECT_CONFIG_DIR) || fileSpec.equals(StoragePathMacros.MODULE_FILE);
   }
+
+  @NotNull
+  public static VirtualFile getFile(@NotNull String fileName, @NotNull VirtualFile parent, @NotNull Object requestor) throws IOException {
+    VirtualFile file = parent.findChild(fileName);
+    if (file != null) {
+      return file;
+    }
+
+    AccessToken token = WriteAction.start();
+    try {
+      return parent.createChildData(requestor, fileName);
+    }
+    finally {
+      token.finish();
+    }
+  }
 }