From 72c4e23fe5400b3bc961cb38d7f43b3426aac14b Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Tue, 20 Sep 2016 14:37:13 +0200 Subject: [PATCH] =?UTF-8?q?DefaultVcsRootPolicy=20=E2=80=94=20do=20not=20u?= =?UTF-8?q?se=20Project.DIRECTORY=5FSTORE=5FFOLDER?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../openapi/vcs/impl/DefaultVcsRootPolicy.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/DefaultVcsRootPolicy.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/DefaultVcsRootPolicy.java index e5bce26e1151..1c27736534a3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/DefaultVcsRootPolicy.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/DefaultVcsRootPolicy.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.impl.projectlevelman.NewMappings; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.project.ProjectKt; +import com.intellij.util.PathUtilRt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -47,14 +48,15 @@ public abstract class DefaultVcsRootPolicy { @NotNull public abstract Collection getDirtyRoots(); - public String getProjectConfigurationMessage(final Project project) { + public String getProjectConfigurationMessage(@NotNull Project project) { boolean isDirectoryBased = ProjectKt.isDirectoryBased(project); - final String[] parts = new String[] {"Content roots of all modules", "all immediate descendants of project base directory", - Project.DIRECTORY_STORE_FOLDER + " directory contents"}; + String[] parts = new String[]{"Content roots of all modules", "all immediate descendants of project base directory", + PathUtilRt.getFileName(ProjectKt.getStateStore(project).getDirectoryStorePath(true)) + " directory contents"}; final StringBuilder sb = new StringBuilder(parts[0]); if (isDirectoryBased) { sb.append(", "); - } else { + } + else { sb.append(", and "); } sb.append(parts[1]);