diff options
Diffstat (limited to 'platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsRootIterator.java')
| -rw-r--r-- | platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsRootIterator.java | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsRootIterator.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsRootIterator.java index 8caa6f2bc981..122988896cb2 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsRootIterator.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/VcsRootIterator.java @@ -54,12 +54,10 @@ public class VcsRootIterator { public boolean acceptFolderUnderVcs(final VirtualFile vcsRoot, final VirtualFile file) { final String vcsUrl = vcsRoot.getUrl(); final MyRootFilter rootFilter = myOtherVcsFolders.get(vcsUrl); - if ((rootFilter != null) && (! rootFilter.accept(file))) { + if ((rootFilter != null) && (!rootFilter.accept(file))) { return false; } - final Boolean excluded = isExcluded(myExcludedFileIndex, file); - if (excluded) return false; - return true; + return !isExcluded(myExcludedFileIndex, file); } private static boolean isExcluded(final FileIndexFacade indexFacade, final VirtualFile file) { @@ -128,9 +126,9 @@ public class VcsRootIterator { } public static void iterateVcsRoot(final Project project, - final VirtualFile root, - final Processor<FilePath> processor, - @Nullable VirtualFileFilter directoryFilter) { + final VirtualFile root, + final Processor<FilePath> processor, + @Nullable VirtualFileFilter directoryFilter) { final MyRootIterator rootIterator = new MyRootIterator(project, root, processor, null, directoryFilter); rootIterator.iterate(); } @@ -177,9 +175,9 @@ public class VcsRootIterator { @Override public Result visitFileEx(@NotNull VirtualFile file) { if (isExcluded(myExcludedFileIndex, file)) return SKIP_CHILDREN; - if (myRootPresentFilter != null && ! myRootPresentFilter.accept(file)) return SKIP_CHILDREN; - if (myProject.isDisposed() || ! process(file)) return skipTo(myRoot); - if (myDirectoryFilter != null && file.isDirectory() && ! myDirectoryFilter.shouldGoIntoDirectory(file)) return SKIP_CHILDREN; + if (myRootPresentFilter != null && !myRootPresentFilter.accept(file)) return SKIP_CHILDREN; + if (myProject.isDisposed() || !process(file)) return skipTo(myRoot); + if (myDirectoryFilter != null && file.isDirectory() && !myDirectoryFilter.shouldGoIntoDirectory(file)) return SKIP_CHILDREN; return CONTINUE; } }); |