Use the JGit-internal @Nullable annotation
Update existing @Nullable uses to use the JGit-internal version of the annotation. Change-Id: I95234ffad4c3110f9597fbd3a2760f653e22ecf7 Signed-off-by: Terry Parker <tparker@google.com>
This commit is contained in:
parent
3a3bb2ce29
commit
6ddb8e703b
|
@ -65,7 +65,7 @@
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
import java.util.concurrent.atomic.AtomicBoolean;
|
||||||
|
|
||||||
import org.eclipse.jdt.annotation.Nullable;
|
import org.eclipse.jgit.annotations.Nullable;
|
||||||
import org.eclipse.jgit.api.errors.JGitInternalException;
|
import org.eclipse.jgit.api.errors.JGitInternalException;
|
||||||
import org.eclipse.jgit.internal.JGitText;
|
import org.eclipse.jgit.internal.JGitText;
|
||||||
import org.eclipse.jgit.lib.Constants;
|
import org.eclipse.jgit.lib.Constants;
|
||||||
|
@ -404,7 +404,8 @@ protected static File searchPath(final String path, final String... lookFor) {
|
||||||
* as component array
|
* as component array
|
||||||
* @param encoding
|
* @param encoding
|
||||||
* to be used to parse the command's output
|
* to be used to parse the command's output
|
||||||
* @return the one-line output of the command
|
* @return the one-line output of the command or {@code null} if there is
|
||||||
|
* none
|
||||||
*/
|
*/
|
||||||
@Nullable
|
@Nullable
|
||||||
protected static String readPipe(File dir, String[] command, String encoding) {
|
protected static String readPipe(File dir, String[] command, String encoding) {
|
||||||
|
@ -423,7 +424,8 @@ protected static String readPipe(File dir, String[] command, String encoding) {
|
||||||
* @param env
|
* @param env
|
||||||
* Map of environment variables to be merged with those of the
|
* Map of environment variables to be merged with those of the
|
||||||
* current process
|
* current process
|
||||||
* @return the one-line output of the command
|
* @return the one-line output of the command or {@code null} if there is
|
||||||
|
* none
|
||||||
* @since 4.0
|
* @since 4.0
|
||||||
*/
|
*/
|
||||||
@Nullable
|
@Nullable
|
||||||
|
|
Loading…
Reference in New Issue