1 files changed, 10 insertions, 4 deletions
diff --git a/platform/projectModel-api/src/com/intellij/openapi/project/ProjectTypeService.java b/platform/projectModel-api/src/com/intellij/openapi/project/ProjectTypeService.java
index e43059390b19..6925a8c39c5e 100644
--- a/platform/projectModel-api/src/com/intellij/openapi/project/ProjectTypeService.java
+++ b/platform/projectModel-api/src/com/intellij/openapi/project/ProjectTypeService.java
@@ -26,8 +26,10 @@ import org.jetbrains.annotations.Nullable;
 @State(
   name = "ProjectType",
   storages = {
-    @Storage(file = StoragePathMacros.PROJECT_FILE),
-    @Storage(file = StoragePathMacros.PROJECT_CONFIG_DIR + "/misc.xml", scheme = StorageScheme.DIRECTORY_BASED)
+    @Storage(
+      id = "other",
+      file = StoragePathMacros.PROJECT_FILE
+    )
   }
 )
 public class ProjectTypeService implements PersistentStateComponent<ProjectType> {
@@ -41,10 +43,14 @@ public class ProjectTypeService implements PersistentStateComponent<ProjectType>
       projectType = getInstance(project).myProjectType;
       if (projectType != null) return projectType;
     }
-    return DefaultProjectTypeProvider.getDefaultProjectType();
+    return DefaultProjectTypeEP.getDefaultProjectType();
   }
 
-  public static ProjectTypeService getInstance(@NotNull Project project) {
+  public static void setProjectType(@NotNull Project project, @Nullable ProjectType projectType) {
+    getInstance(project).loadState(projectType);
+  }
+
+  private static ProjectTypeService getInstance(@NotNull Project project) {
     return ServiceManager.getService(project, ProjectTypeService.class);
   }