diff --git a/platform/configuration-store-impl/src/ProjectStoreImpl.kt b/platform/configuration-store-impl/src/ProjectStoreImpl.kt index 951f0138f9ed..d2458bc56b00 100644 --- a/platform/configuration-store-impl/src/ProjectStoreImpl.kt +++ b/platform/configuration-store-impl/src/ProjectStoreImpl.kt @@ -33,7 +33,7 @@ import com.intellij.openapi.module.Module import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.project.Project import com.intellij.openapi.project.ProjectCoreUtil -import com.intellij.openapi.project.ex.ProjectEx.NAME_PROVIDER_EP +import com.intellij.openapi.project.ex.ProjectNameProvider import com.intellij.openapi.project.impl.ProjectImpl import com.intellij.openapi.project.impl.ProjectManagerImpl.UnableToSaveProjectNotification import com.intellij.openapi.project.impl.ProjectStoreClassProvider @@ -320,7 +320,7 @@ private open class ProjectStoreImpl(project: ProjectImpl, private val pathMacroM } } - return NAME_PROVIDER_EP.extensions.computeOrNull { + return ProjectNameProvider.EP_NAME.extensions.computeOrNull { LOG.catchAndLog { it.getName(project) } } ?: PathUtilRt.getFileName(baseDir).replace(":", "") } diff --git a/platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectEx.java b/platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectEx.java index d6b1e7fa3550..da3255d0f931 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectEx.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectEx.java @@ -15,7 +15,6 @@ */ package com.intellij.openapi.project.ex; -import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.project.Project; import com.intellij.util.messages.Topic; import org.jetbrains.annotations.NotNull; @@ -27,8 +26,6 @@ public interface ProjectEx extends Project { void saved(@NotNull final Project project); } - ExtensionPointName NAME_PROVIDER_EP = ExtensionPointName.create("com.intellij.projectNameProvider"); - void init(); void setProjectName(@NotNull String name); diff --git a/platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectNameProvider.java b/platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectNameProvider.java index 580e48e137c0..dbf869c8e747 100644 --- a/platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectNameProvider.java +++ b/platform/platform-impl/src/com/intellij/openapi/project/ex/ProjectNameProvider.java @@ -15,11 +15,14 @@ */ package com.intellij.openapi.project.ex; +import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; public interface ProjectNameProvider { + ExtensionPointName EP_NAME = ExtensionPointName.create("com.intellij.projectNameProvider"); + @Nullable String getName(@NotNull Project project); }