diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/history/CurrentRevision.java b/platform/vcs-api/src/com/intellij/openapi/vcs/history/CurrentRevision.java index 987e9b37443f..b51987365828 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/history/CurrentRevision.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/history/CurrentRevision.java @@ -24,6 +24,7 @@ import com.intellij.openapi.vcs.RepositoryLocation; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vfs.VirtualFile; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.IOException; @@ -36,7 +37,7 @@ public class CurrentRevision implements VcsFileRevision { public static final String CURRENT = VcsBundle.message("vcs.revision.name.current"); private final VcsRevisionNumber myRevisionNumber; - public CurrentRevision(VirtualFile file, VcsRevisionNumber revision) { + public CurrentRevision(@NotNull VirtualFile file, @NotNull VcsRevisionNumber revision) { myFile = file; myRevisionNumber = revision; } @@ -77,6 +78,7 @@ public class CurrentRevision implements VcsFileRevision { return ""; } + @NotNull public VcsRevisionNumber getRevisionNumber() { return myRevisionNumber; } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsFileRevision.java b/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsFileRevision.java index 6c0a2b7e5984..69fc9aa78abd 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsFileRevision.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsFileRevision.java @@ -18,6 +18,7 @@ package com.intellij.openapi.vcs.history; import com.intellij.openapi.vcs.RepositoryLocation; import com.intellij.openapi.vcs.VcsException; import com.intellij.util.ArrayUtil; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.IOException; @@ -25,6 +26,7 @@ import java.util.Date; public interface VcsFileRevision extends VcsFileContent, VcsRevisionDescription { VcsFileRevision NULL = new VcsFileRevision() { + @NotNull public VcsRevisionNumber getRevisionNumber() { return VcsRevisionNumber.NULL; } diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsRevisionDescription.java b/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsRevisionDescription.java index 4963903a05d5..f5e7b35d7a42 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsRevisionDescription.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsRevisionDescription.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.vcs.history; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Date; @@ -27,6 +28,7 @@ import java.util.Date; * To change this template use File | Settings | File Templates. */ public interface VcsRevisionDescription { + @NotNull VcsRevisionNumber getRevisionNumber(); Date getRevisionDate(); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsRevisionDescriptionImpl.java b/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsRevisionDescriptionImpl.java index a540addb48a3..d96234e06395 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsRevisionDescriptionImpl.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/history/VcsRevisionDescriptionImpl.java @@ -15,6 +15,8 @@ */ package com.intellij.openapi.vcs.history; +import org.jetbrains.annotations.NotNull; + import java.util.Date; /** @@ -30,7 +32,7 @@ public class VcsRevisionDescriptionImpl implements VcsRevisionDescription { private String myAuthor; private String myMessage; - public VcsRevisionDescriptionImpl(VcsRevisionNumber number, Date date, String author, String message) { + public VcsRevisionDescriptionImpl(@NotNull VcsRevisionNumber number, Date date, String author, String message) { myNumber = number; myDate = date; myAuthor = author; @@ -41,6 +43,7 @@ public class VcsRevisionDescriptionImpl implements VcsRevisionDescription { myNumber = number; } + @NotNull @Override public VcsRevisionNumber getRevisionNumber() { return myNumber; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/TreeNodeOnVcsRevision.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/TreeNodeOnVcsRevision.java index 9143076440fb..4a68b883baee 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/TreeNodeOnVcsRevision.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/TreeNodeOnVcsRevision.java @@ -61,6 +61,7 @@ class TreeNodeOnVcsRevision extends DefaultMutableTreeNode implements VcsFileRev return myRevision.loadContent(); } + @NotNull public VcsRevisionNumber getRevisionNumber() { return myRevision.getRevisionNumber(); } 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 e52aa61f5be3..eb331647db37 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 @@ -180,6 +180,7 @@ public class CvsAnnotationProvider implements AnnotationProvider{ myDate = date; } + @NotNull public VcsRevisionNumber getRevisionNumber() { return myNumber; } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/ComparableVcsRevisionOnOperation.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/ComparableVcsRevisionOnOperation.java index dbd47ebd15f0..df2f24a866c3 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/ComparableVcsRevisionOnOperation.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/ComparableVcsRevisionOnOperation.java @@ -28,6 +28,7 @@ import com.intellij.openapi.vcs.RepositoryLocation; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vcs.history.VcsFileRevision; import com.intellij.openapi.vcs.history.VcsRevisionNumber; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.io.IOException; @@ -81,6 +82,7 @@ public class ComparableVcsRevisionOnOperation implements VcsFileRevision { return myOperation.isLoaded(); } + @NotNull public VcsRevisionNumber getRevisionNumber() { return getRevision(); } diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileRevisionImpl.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileRevisionImpl.java index 554b2ed6c18c..872aa7457bd5 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileRevisionImpl.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/history/CvsFileRevisionImpl.java @@ -22,6 +22,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.RepositoryLocation; import com.intellij.openapi.vcs.history.VcsRevisionNumber; +import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.netbeans.lib.cvsclient.command.log.LogInformation; import org.netbeans.lib.cvsclient.command.log.Revision; @@ -149,6 +150,7 @@ public class CvsFileRevisionImpl extends CvsFileContent implements CvsFileRevisi return result; } + @NotNull public VcsRevisionNumber getRevisionNumber() { if (myCvsRevision != null) { return new CvsRevisionNumber(myCvsRevision.getNumber()); diff --git a/plugins/git4idea/src/git4idea/GitFileRevision.java b/plugins/git4idea/src/git4idea/GitFileRevision.java index 2932eeff9b1a..dbbc7edb1c3b 100644 --- a/plugins/git4idea/src/git4idea/GitFileRevision.java +++ b/plugins/git4idea/src/git4idea/GitFileRevision.java @@ -77,6 +77,7 @@ public class GitFileRevision extends VcsFileRevisionEx implements Comparable