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

vcs: add NotNulls, lambdify, simplify

Browse Source
This commit is contained in:
Kirill Likhodedov
2017-01-24 18:22:18 +03:00
parent ba5c02569c
commit f6454d2bce
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/BasicDefaultVcsRootPolicy.java
+2 -2
View File
@@ -50,7 +50,7 @@ public class BasicDefaultVcsRootPolicy extends DefaultVcsRootPolicy {
return result;
}
public boolean matchesDefaultMapping(final VirtualFile file, final Object matchContext) {
public boolean matchesDefaultMapping(@NotNull final VirtualFile file, final Object matchContext) {
return VfsUtil.isAncestor(ProjectBaseDirectory.getInstance(myProject).getBaseDir(myBaseDir), file, false);
}
@@ -60,7 +60,7 @@ public class BasicDefaultVcsRootPolicy extends DefaultVcsRootPolicy {
}
@Nullable
public VirtualFile getVcsRootFor(final VirtualFile file) {
public VirtualFile getVcsRootFor(@NotNull final VirtualFile file) {
return ProjectBaseDirectory.getInstance(myProject).getBaseDir(myBaseDir);
}
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/DefaultVcsRootPolicy.java
+2 -2
View File
@@ -38,13 +38,13 @@ public abstract class DefaultVcsRootPolicy {
@NotNull
public abstract List<VirtualFile> getDefaultVcsRoots(@NotNull NewMappings mappingList, @NotNull String vcsName);
public abstract boolean matchesDefaultMapping(final VirtualFile file, final Object matchContext);
public abstract boolean matchesDefaultMapping(@NotNull VirtualFile file, final Object matchContext);
@Nullable
public abstract Object getMatchContext(final VirtualFile file);
@Nullable
public abstract VirtualFile getVcsRootFor(final VirtualFile file);
public abstract VirtualFile getVcsRootFor(@NotNull VirtualFile file);
@NotNull
public abstract Collection<VirtualFile> getDirtyRoots();
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java
+6 -6
View File
@@ -98,7 +98,7 @@ public class ModuleDefaultVcsRootPolicy extends DefaultVcsRootPolicy {
}
@Override
public boolean matchesDefaultMapping(final VirtualFile file, final Object matchContext) {
public boolean matchesDefaultMapping(@NotNull final VirtualFile file, final Object matchContext) {
if (matchContext != null) {
return true;
}
@@ -113,17 +113,17 @@ public class ModuleDefaultVcsRootPolicy extends DefaultVcsRootPolicy {
@Override
@Nullable
public VirtualFile getVcsRootFor(final VirtualFile file) {
if (myBaseDir != null && PeriodicalTasksCloser.getInstance().safeGetService(myProject, FileIndexFacade.class)
.isValidAncestor(myBaseDir, file)) {
public VirtualFile getVcsRootFor(@NotNull VirtualFile file) {
FileIndexFacade indexFacade = PeriodicalTasksCloser.getInstance().safeGetService(myProject, FileIndexFacade.class);
if (myBaseDir != null && indexFacade.isValidAncestor(myBaseDir, file)) {
return myBaseDir;
}
final VirtualFile contentRoot = ProjectRootManager.getInstance(myProject).getFileIndex().getContentRootForFile(file, Registry.is("ide.hide.excluded.files"));
VirtualFile contentRoot = ProjectRootManager.getInstance(myProject).getFileIndex().getContentRootForFile(file, Registry.is("ide.hide.excluded.files"));
if (contentRoot != null && contentRoot.isDirectory()) {
return contentRoot;
}
if (ProjectKt.isDirectoryBased(myProject)) {
final VirtualFile ideaDir = ProjectKt.getStateStore(myProject).getDirectoryStoreFile();
VirtualFile ideaDir = ProjectKt.getStateStore(myProject).getDirectoryStoreFile();
if (ideaDir != null && VfsUtilCore.isAncestor(ideaDir, file, false)) {
return ideaDir;
}
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
+1
View File
@@ -295,6 +295,7 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
@Override
@Nullable
public VirtualFile getVcsRootFor(@Nullable final VirtualFile file) {
if (file == null) return null;
final VcsDirectoryMapping mapping = myMappings.getMappingFor(file);
if (mapping == null) {
return null;
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
+1 -1
View File
@@ -247,7 +247,7 @@ public class NewMappings {
return mapping.getVcs();
}
private boolean fileMatchesMapping(final VirtualFile file,
private boolean fileMatchesMapping(@NotNull VirtualFile file,
final Object matchContext,
final String systemIndependentPath,
final VcsDirectoryMapping mapping) {