diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/AnnotationProvider.java b/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/AnnotationProvider.java index b977e9c3e852..736265e33484 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/AnnotationProvider.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/AnnotationProvider.java @@ -34,5 +34,5 @@ public interface AnnotationProvider extends VcsProviderMarker { * @param rev File revision to be checked. * @return true if annotation it valid for the given revision. */ - boolean isAnnotationValid(@NotNull VcsFileRevision rev); + default boolean isAnnotationValid(@NotNull VcsFileRevision rev) { return true; } } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsAnnotationCachedProxy.java b/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsAnnotationCachedProxy.java index 58692aa4459e..702e2bf3bb41 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsAnnotationCachedProxy.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsAnnotationCachedProxy.java @@ -146,7 +146,7 @@ public class VcsAnnotationCachedProxy implements AnnotationProvider { } @Override - public boolean isAnnotationValid(VcsFileRevision rev) { + public boolean isAnnotationValid(@NotNull VcsFileRevision rev) { return myAnnotationProvider.isAnnotationValid(rev); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java index 118f806f9bb5..e52aa61f5be3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/annotate/CvsAnnotationProvider.java @@ -83,10 +83,6 @@ public class CvsAnnotationProvider implements AnnotationProvider{ return annotate(file, revision.getRevisionNumber().asString(), settings); } - public boolean isAnnotationValid(VcsFileRevision rev){ - return true; - } - public FileAnnotation annotate(VirtualFile cvsVirtualFile, String revision, CvsEnvironment environment) throws VcsException { // the VirtualFile has a full path if annotate is called from history (when we have a real file on disk), // and has the path equal to a CVS module name if annotate is called from the CVS repository browser diff --git a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java index b0787d127b32..816ca215af30 100644 --- a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java +++ b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java @@ -249,8 +249,4 @@ public class GitAnnotationProvider implements AnnotationProviderEx, VcsCacheable } return new GitFileAnnotation(myProject, virtualFile, revisionNumber, lines); } - - public boolean isAnnotationValid(VcsFileRevision rev) { - return true; - } } diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotationProvider.java b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotationProvider.java index f51aeced79ff..0d83adb93556 100644 --- a/plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotationProvider.java +++ b/plugins/hg4idea/src/org/zmlx/hg4idea/provider/annotate/HgAnnotationProvider.java @@ -80,8 +80,4 @@ public class HgAnnotationProvider implements AnnotationProviderEx { .getHistory(hgFile.toFilePath(), vcsRoot, myProject, (HgRevisionNumber)revision, -1); return new HgAnnotation(myProject, hgFile, annotationResult, logResult, revision); } - - public boolean isAnnotationValid(@NotNull VcsFileRevision rev) { - return true; - } } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java index 8cdabb6c7ebf..fb9f07d3f4c8 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/annotate/SvnAnnotationProvider.java @@ -451,10 +451,6 @@ public class SvnAnnotationProvider implements AnnotationProvider, VcsCacheableAn } } - public boolean isAnnotationValid( VcsFileRevision rev ){ - return true; - } - @Nullable private static DiffOptions getLogClientOptions(@NotNull SvnVcs vcs) { return SvnConfiguration.getInstance(vcs.getProject()).isIgnoreSpacesInAnnotate() ? new DiffOptions(true, true, true) : null;