diff --git a/platform/platform-resources/src/META-INF/VcsExtensions.xml b/platform/platform-resources/src/META-INF/VcsExtensions.xml
index 664a9b35c7fc..a8ef04f81c62 100644
--- a/platform/platform-resources/src/META-INF/VcsExtensions.xml
+++ b/platform/platform-resources/src/META-INF/VcsExtensions.xml
@@ -13,7 +13,7 @@
-
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/roots/VcsRootDetectorI.java b/platform/vcs-api/src/com/intellij/openapi/vcs/roots/VcsRootDetector.java
similarity index 93%
rename from platform/vcs-api/src/com/intellij/openapi/vcs/roots/VcsRootDetectorI.java
rename to platform/vcs-api/src/com/intellij/openapi/vcs/roots/VcsRootDetector.java
index 493eaec0928c..23a7e6b89cee 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/roots/VcsRootDetectorI.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/roots/VcsRootDetector.java
@@ -12,7 +12,7 @@ import java.util.Collection;
*
* @author Nadya Zabrodina
*/
-public interface VcsRootDetectorI {
+public interface VcsRootDetector {
/**
* Detect vcs roots for whole project
diff --git a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
index 05e8461dd195..eafd649b3686 100644
--- a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
+++ b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
@@ -38,7 +38,7 @@ import com.intellij.openapi.vcs.actions.VcsContextFactory;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ContentRevision;
import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager;
-import com.intellij.openapi.vcs.roots.VcsRootDetectorI;
+import com.intellij.openapi.vcs.roots.VcsRootDetector;
import com.intellij.openapi.vfs.*;
import com.intellij.openapi.vfs.newvfs.RefreshQueue;
import com.intellij.openapi.wm.StatusBar;
@@ -629,7 +629,7 @@ public class VcsUtil {
+ rootDir.getParent()
);
}
- Collection roots = ServiceManager.getService(project, VcsRootDetectorI.class).detect(rootDir);
+ Collection roots = ServiceManager.getService(project, VcsRootDetector.class).detect(rootDir);
Collection result = ContainerUtilRt.newArrayList();
for (VcsRoot vcsRoot : roots) {
VirtualFile vFile = vcsRoot.getPath();
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootDetectorImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootDetectorImpl.java
index 753b4d3ff4c1..338023582e0f 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootDetectorImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootDetectorImpl.java
@@ -31,7 +31,7 @@ import java.util.*;
/**
* @author Nadya Zabrodina
*/
-public class VcsRootDetectorImpl implements VcsRootDetectorI {
+public class VcsRootDetectorImpl implements VcsRootDetector {
private static final int MAXIMUM_SCAN_DEPTH = 2;
@NotNull private final Project myProject;
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java
index 2742b1897601..2769b3ca84cb 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java
@@ -31,7 +31,7 @@ public class VcsRootErrorsFinder {
@NotNull
public Collection find() {
List mappings = myVcsManager.getDirectoryMappings();
- Collection vcsRoots = ServiceManager.getService(myProject, VcsRootDetectorI.class).detect();
+ Collection vcsRoots = ServiceManager.getService(myProject, VcsRootDetector.class).detect();
Collection errors = new ArrayList();
errors.addAll(findExtraMappings(mappings));
diff --git a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java
index a7118f2346ad..aa6238188d6b 100644
--- a/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java
+++ b/platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java
@@ -171,7 +171,7 @@ public class VcsRootDetectorTest extends VcsRootPlatformTest {
@NotNull
private Collection detect(@Nullable VirtualFile startDir) {
- return ServiceManager.getService(myProject, VcsRootDetectorI.class).detect(startDir);
+ return ServiceManager.getService(myProject, VcsRootDetector.class).detect(startDir);
}
public void doTest(@NotNull VcsRootConfiguration vcsRootConfiguration,
diff --git a/plugins/git4idea/src/git4idea/GitVcs.java b/plugins/git4idea/src/git4idea/GitVcs.java
index 99c43f93ee13..714f6096a3e4 100644
--- a/plugins/git4idea/src/git4idea/GitVcs.java
+++ b/plugins/git4idea/src/git4idea/GitVcs.java
@@ -46,7 +46,7 @@ import com.intellij.openapi.vcs.history.VcsHistoryProvider;
import com.intellij.openapi.vcs.history.VcsRevisionNumber;
import com.intellij.openapi.vcs.merge.MergeProvider;
import com.intellij.openapi.vcs.rollback.RollbackEnvironment;
-import com.intellij.openapi.vcs.roots.VcsRootDetectorI;
+import com.intellij.openapi.vcs.roots.VcsRootDetector;
import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier;
import com.intellij.openapi.vcs.update.UpdateEnvironment;
import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList;
@@ -586,7 +586,7 @@ public class GitVcs extends AbstractVcs {
public void enableIntegration() {
ApplicationManager.getApplication().executeOnPooledThread(new Runnable() {
public void run() {
- Collection roots = ServiceManager.getService(myProject, VcsRootDetectorI.class).detect();
+ Collection roots = ServiceManager.getService(myProject, VcsRootDetector.class).detect();
new GitIntegrationEnabler(myProject, myGit, myPlatformFacade).enable(roots);
}
});