Using TYPE_USE causes compilation errors in Eclipse Neon.3 (JDT 3.12.3) and Eclipse Oxygen.2 (JDT 3.13.2). This reverts committags/v4.11.0.201803080745-r8e217517e2
. This reverts commit55eba8d0f5
. Reported-by: Thomas Wolf <thomas.wolf@paranor.ch> Change-Id: I96869f80dd11ee238911706581b224bca4fb12cd Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
@@ -82,7 +82,7 @@ public interface LargeFileRepository { | |||
* @return Action for verifying the object, or {@code null} if the server | |||
* doesn't support or require verification | |||
*/ | |||
public Response.@Nullable Action getVerifyAction(AnyLongObjectId id); | |||
public @Nullable Response.Action getVerifyAction(AnyLongObjectId id); | |||
/** | |||
* Get size of an object |
@@ -43,8 +43,12 @@ | |||
package org.eclipse.jgit.annotations; | |||
import static java.lang.annotation.ElementType.FIELD; | |||
import static java.lang.annotation.ElementType.LOCAL_VARIABLE; | |||
import static java.lang.annotation.ElementType.METHOD; | |||
import static java.lang.annotation.ElementType.PARAMETER; | |||
import java.lang.annotation.Documented; | |||
import java.lang.annotation.ElementType; | |||
import java.lang.annotation.Retention; | |||
import java.lang.annotation.RetentionPolicy; | |||
import java.lang.annotation.Target; | |||
@@ -59,7 +63,7 @@ import java.lang.annotation.Target; | |||
*/ | |||
@Documented | |||
@Retention(RetentionPolicy.CLASS) | |||
@Target(ElementType.TYPE_USE) | |||
@Target({ FIELD, METHOD, PARAMETER, LOCAL_VARIABLE }) | |||
public @interface NonNull { | |||
// marker annotation with no members | |||
} |
@@ -43,8 +43,12 @@ | |||
package org.eclipse.jgit.annotations; | |||
import static java.lang.annotation.ElementType.FIELD; | |||
import static java.lang.annotation.ElementType.LOCAL_VARIABLE; | |||
import static java.lang.annotation.ElementType.METHOD; | |||
import static java.lang.annotation.ElementType.PARAMETER; | |||
import java.lang.annotation.Documented; | |||
import java.lang.annotation.ElementType; | |||
import java.lang.annotation.Retention; | |||
import java.lang.annotation.RetentionPolicy; | |||
import java.lang.annotation.Target; | |||
@@ -89,7 +93,7 @@ import java.lang.annotation.Target; | |||
*/ | |||
@Documented | |||
@Retention(RetentionPolicy.RUNTIME) | |||
@Target(ElementType.TYPE_USE) | |||
@Target({ FIELD, METHOD, PARAMETER, LOCAL_VARIABLE }) | |||
public @interface Nullable { | |||
// marker annotation with no members | |||
} |
@@ -140,7 +140,8 @@ public class CorruptObjectException extends IOException { | |||
* @return error condition or null. | |||
* @since 4.2 | |||
*/ | |||
public ObjectChecker.@Nullable ErrorType getErrorType() { | |||
@Nullable | |||
public ObjectChecker.ErrorType getErrorType() { | |||
return errorType; | |||
} | |||
} |
@@ -89,7 +89,8 @@ public class FsckError { | |||
} | |||
/** @return error type of the corruption. */ | |||
public ObjectChecker.@Nullable ErrorType getErrorType() { | |||
@Nullable | |||
public ObjectChecker.ErrorType getErrorType() { | |||
return errorType; | |||
} | |||
} |
@@ -265,7 +265,8 @@ public class TransferConfig { | |||
} | |||
} | |||
static ObjectChecker.@Nullable ErrorType parse(String key) { | |||
@Nullable | |||
static ObjectChecker.ErrorType parse(String key) { | |||
return errors.get(toLowerCase(key)); | |||
} | |||