diff options
| author | Tor Norbye <tnorbye@google.com> | 2014-08-19 22:27:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-08-19 21:25:05 +0000 |
| commit | 4ca751c002784c4bfd349cc5240b045b62277c80 (patch) | |
| tree | dfc17b31990e2429535609b85f6d080c4fa0d9fe /platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeModifier.java | |
| parent | 890d9a2952301682ffecaed4495f5f65c84c3642 (diff) | |
| parent | 060e58b3afea3ea39f5ba1cb5a443ca3ebda28c8 (diff) | |
| download | idea-4ca751c002784c4bfd349cc5240b045b62277c80.tar.gz | |
Merge "Merge remote-tracking branch 'aosp/upstream-master' into merge"
Diffstat (limited to 'platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeModifier.java')
| -rw-r--r-- | platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeModifier.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeModifier.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeModifier.java index b97305c1a0a3..c8a8eda7a436 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeModifier.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/VcsDirtyScopeModifier.java @@ -17,7 +17,7 @@ package com.intellij.openapi.vcs.changes; import com.intellij.openapi.vcs.FilePath; import com.intellij.openapi.vfs.VirtualFile; -import org.jetbrains.annotations.Nullable; +import org.jetbrains.annotations.NotNull; import java.util.Collection; import java.util.Iterator; @@ -28,7 +28,7 @@ import java.util.Iterator; public interface VcsDirtyScopeModifier { Iterator<FilePath> getDirtyFilesIterator(); Collection<VirtualFile> getAffectedVcsRoots(); - @Nullable + @NotNull Iterator<FilePath> getDirtyDirectoriesIterator(VirtualFile root); void recheckDirtyKeys(); } |