@Nullable

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java b/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java
index 0da2de7917da1af0187382409546eb5d190a9370..1d6c73e7549d3a91e3fd5e8cddc1c172eb6697f9 100644 (file)
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/ProjectLevelVcsManager.java
@@ -120,7 +120,7 @@ public abstract class ProjectLevelVcsManager {
    * @return the root, or null if the specified file is not in a VCS-managed directory.
    */
   @Nullable
-  public abstract VirtualFile getVcsRootFor(VirtualFile file);
+  public abstract VirtualFile getVcsRootFor(@Nullable VirtualFile file);
 
   /**
    * Return the parent directory of the specified file path which is mapped to a VCS.

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
index 49eadd1a22eb344cbf99888fad4415c8f5f8662e..12f0a6120d0c19fa807d37524d331102486607d3 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
@@ -252,7 +252,7 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
   }
 
   @Nullable
-  public VirtualFile getVcsRootFor(final VirtualFile file) {
+  public VirtualFile getVcsRootFor(final @Nullable VirtualFile file) {
     final VcsDirectoryMapping mapping = myMappings.getMappingFor(file);
     if (mapping == null) {
       return null;

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
index e52d3cc9e1fd6da9b72ca84eb55559d9e85a1a79..f05d319d92f0c6f07b1a719c8fdec199d3fa3c15 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
@@ -211,7 +211,7 @@ public class NewMappings {
   }
 
   @Nullable
-  public VcsDirectoryMapping getMappingFor(VirtualFile file) {
+  public VcsDirectoryMapping getMappingFor(@Nullable VirtualFile file) {
     if (file == null) return null;
     if (! file.isInLocalFileSystem()) {
       return null;