MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

VcsRootDetectorI renamed

Browse Source
This commit is contained in:
Nadya Zabrodina
2014-01-30 16:44:29 +04:00
parent 77af356936
commit 5a75778497
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/META-INF/VcsExtensions.xml
+1 -1
View File
@@ -13,7 +13,7 @@
<projectService serviceImplementation="com.intellij.openapi.vcs.contentAnnotation.VcsContentAnnotationSettings"/>
<projectService serviceImplementation="com.intellij.openapi.diff.impl.settings.MergeToolSettings"/>
<projectService serviceImplementation="com.intellij.openapi.diff.impl.settings.DiffToolSettings"/>
<projectService serviceInterface="com.intellij.openapi.vcs.roots.VcsRootDetectorI"
<projectService serviceInterface="com.intellij.openapi.vcs.roots.VcsRootDetector"
serviceImplementation="com.intellij.openapi.vcs.roots.VcsRootDetectorImpl"/>
<selectInTarget implementation="com.intellij.openapi.vcs.changes.SelectInChangesViewTarget"/>
platform/vcs-api/src/com/intellij/openapi/vcs/roots/VcsRootDetectorI.java → platform/vcs-api/src/com/intellij/openapi/vcs/roots/VcsRootDetector.java
+1 -1
View File
@@ -12,7 +12,7 @@ import java.util.Collection;
*
* @author Nadya Zabrodina
*/
public interface VcsRootDetectorI {
public interface VcsRootDetector {
/**
* Detect vcs roots for whole project
platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
+2 -2
View File
@@ -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<VcsRoot> roots = ServiceManager.getService(project, VcsRootDetectorI.class).detect(rootDir);
Collection<VcsRoot> roots = ServiceManager.getService(project, VcsRootDetector.class).detect(rootDir);
Collection<VcsDirectoryMapping> result = ContainerUtilRt.newArrayList();
for (VcsRoot vcsRoot : roots) {
VirtualFile vFile = vcsRoot.getPath();
platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootDetectorImpl.java
+1 -1
View File
@@ -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;
platform/vcs-impl/src/com/intellij/openapi/vcs/roots/VcsRootErrorsFinder.java
+1 -1
View File
@@ -31,7 +31,7 @@ public class VcsRootErrorsFinder {
@NotNull
public Collection<VcsRootError> find() {
List<VcsDirectoryMapping> mappings = myVcsManager.getDirectoryMappings();
Collection<VcsRoot> vcsRoots = ServiceManager.getService(myProject, VcsRootDetectorI.class).detect();
Collection<VcsRoot> vcsRoots = ServiceManager.getService(myProject, VcsRootDetector.class).detect();
Collection<VcsRootError> errors = new ArrayList<VcsRootError>();
errors.addAll(findExtraMappings(mappings));
platform/vcs-impl/testSrc/com/intellij/openapi/vcs/roots/VcsRootDetectorTest.java
+1 -1
View File
@@ -171,7 +171,7 @@ public class VcsRootDetectorTest extends VcsRootPlatformTest {
@NotNull
private Collection<VcsRoot> 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,
plugins/git4idea/src/git4idea/GitVcs.java
+2 -2
View File
@@ -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<CommittedChangeList> {
public void enableIntegration() {
ApplicationManager.getApplication().executeOnPooledThread(new Runnable() {
public void run() {
Collection<VcsRoot> roots = ServiceManager.getService(myProject, VcsRootDetectorI.class).detect();
Collection<VcsRoot> roots = ServiceManager.getService(myProject, VcsRootDetector.class).detect();
new GitIntegrationEnabler(myProject, myGit, myPlatformFacade).enable(roots);
}
});