diff --git a/src/java.base/share/classes/org/checkerframework/checker/formatter/qual/Format.java b/src/java.base/share/classes/org/checkerframework/checker/formatter/qual/Format.java index d8f1d9a2b8a..fb422e10427 100644 --- a/src/java.base/share/classes/org/checkerframework/checker/formatter/qual/Format.java +++ b/src/java.base/share/classes/org/checkerframework/checker/formatter/qual/Format.java @@ -20,7 +20,7 @@ *
  * {@literal @}Format({GENERAL, INT}) String f = "String '%s' has length %d";
  *
- *  String.format(f, "Example", 7);
+ * String.format(f, "Example", 7);
  * 
* * diff --git a/src/java.base/share/classes/org/checkerframework/checker/index/qual/IndexOrLow.java b/src/java.base/share/classes/org/checkerframework/checker/index/qual/IndexOrLow.java index 594a6b3bb14..c4b1033413c 100644 --- a/src/java.base/share/classes/org/checkerframework/checker/index/qual/IndexOrLow.java +++ b/src/java.base/share/classes/org/checkerframework/checker/index/qual/IndexOrLow.java @@ -14,9 +14,9 @@ * {@code String.indexOf(String)} method is declared as * *

- *   class String {
+ *  class String {
  *    {@literal @}IndexOrLow("this") int indexOf(String str) { ... }
- *   }
+ *  }
  * 
* *

Writing {@code @IndexOrLow("arr")} is equivalent to writing {@link diff --git a/src/java.base/share/classes/org/checkerframework/checker/nonempty/qual/EnsuresNonEmpty.java b/src/java.base/share/classes/org/checkerframework/checker/nonempty/qual/EnsuresNonEmpty.java index 17993d6c3e6..cf7603dcd0f 100644 --- a/src/java.base/share/classes/org/checkerframework/checker/nonempty/qual/EnsuresNonEmpty.java +++ b/src/java.base/share/classes/org/checkerframework/checker/nonempty/qual/EnsuresNonEmpty.java @@ -19,19 +19,19 @@ * effect: * *


- *   {@literal @}EnsuresNonEmpty("ids")
- *   void addId(String id) {
- *     ids.add(id);
- *   }
+ *  {@literal @}EnsuresNonEmpty("ids")
+ *  void addId(String id) {
+ *    ids.add(id);
+ *  }
  * 
* * It can also be used for a method that fails if a given value is empty, indicating that the * argument is non-empty if the method returns normally: * *

- *   /** Throws an exception if the argument is empty. */
- *   {@literal @}EnsuresNonEmpty("#1")
- *   void useTheMap(Map<T, U> arg) { ... }
+ *  /** Throws an exception if the argument is empty. */
+ *  {@literal @}EnsuresNonEmpty("#1")
+ *  void useTheMap(Map<T, U> arg) { ... }
  * 
* * @see NonEmpty diff --git a/src/java.base/share/classes/org/checkerframework/checker/nullness/qual/AssertNonNullIfNonNull.java b/src/java.base/share/classes/org/checkerframework/checker/nullness/qual/AssertNonNullIfNonNull.java index 93150087869..02fb53c554b 100644 --- a/src/java.base/share/classes/org/checkerframework/checker/nullness/qual/AssertNonNullIfNonNull.java +++ b/src/java.base/share/classes/org/checkerframework/checker/nullness/qual/AssertNonNullIfNonNull.java @@ -15,11 +15,11 @@ *

Here is an example use: * *


- *    {@literal @}AssertNonNullIfNonNull("id")
- *    {@literal @}Pure
- *     public @Nullable Long getId() {
- *         return id;
- *     }
+ *  {@literal @}AssertNonNullIfNonNull("id")
+ *  {@literal @}Pure
+ *  public @Nullable Long getId() {
+ *    return id;
+ *  }
  * 
* * Note the direction of the implication. This annotation says that if the result is non-null, then diff --git a/src/java.base/share/classes/org/checkerframework/checker/optional/qual/EnsuresPresent.java b/src/java.base/share/classes/org/checkerframework/checker/optional/qual/EnsuresPresent.java index e96a1552312..6898b259bcb 100644 --- a/src/java.base/share/classes/org/checkerframework/checker/optional/qual/EnsuresPresent.java +++ b/src/java.base/share/classes/org/checkerframework/checker/optional/qual/EnsuresPresent.java @@ -16,19 +16,19 @@ *

This postcondition annotation is useful for methods that construct a present Optional: * *


- *   {@literal @}EnsuresPresent("optStr")
- *   void initialize() {
- *     optStr = Optional.of("abc");
- *   }
+ *  {@literal @}EnsuresPresent("optStr")
+ *  void initialize() {
+ *    optStr = Optional.of("abc");
+ *  }
  * 
* * It can also be used for a method that fails if a given Optional value is empty, indicating that * the argument is present if the method returns normally: * *

- *   /** Throws an exception if the argument is empty. */
- *   {@literal @}EnsuresPresent("#1")
- *   void useTheOptional(Optional<T> arg) { ... }
+ *  /** Throws an exception if the argument is empty. */
+ *  {@literal @}EnsuresPresent("#1")
+ *  void useTheOptional(Optional<T> arg) { ... }
  * 
* * @see Present diff --git a/src/java.base/share/classes/org/checkerframework/checker/regex/qual/PartialRegex.java b/src/java.base/share/classes/org/checkerframework/checker/regex/qual/PartialRegex.java index edfd6b591e2..7d5cd137d3f 100644 --- a/src/java.base/share/classes/org/checkerframework/checker/regex/qual/PartialRegex.java +++ b/src/java.base/share/classes/org/checkerframework/checker/regex/qual/PartialRegex.java @@ -22,7 +22,7 @@ @Retention(RetentionPolicy.RUNTIME) @Target({}) // empty target prevents programmers from writing this in a program @InvisibleQualifier -@SubtypeOf(org.checkerframework.checker.regex.qual.UnknownRegex.class) +@SubtypeOf(UnknownRegex.class) public @interface PartialRegex { /** diff --git a/src/java.base/share/classes/org/checkerframework/checker/regex/qual/RegexBottom.java b/src/java.base/share/classes/org/checkerframework/checker/regex/qual/RegexBottom.java index 301b6b74fc4..2b185916f79 100644 --- a/src/java.base/share/classes/org/checkerframework/checker/regex/qual/RegexBottom.java +++ b/src/java.base/share/classes/org/checkerframework/checker/regex/qual/RegexBottom.java @@ -23,6 +23,6 @@ @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER}) @TargetLocations({TypeUseLocation.LOWER_BOUND, TypeUseLocation.UPPER_BOUND}) @InvisibleQualifier -@SubtypeOf({Regex.class, org.checkerframework.checker.regex.qual.PartialRegex.class}) +@SubtypeOf({Regex.class, PartialRegex.class}) @DefaultFor(value = {TypeUseLocation.LOWER_BOUND}) public @interface RegexBottom {} diff --git a/src/java.base/share/classes/org/checkerframework/checker/signedness/qual/Signed.java b/src/java.base/share/classes/org/checkerframework/checker/signedness/qual/Signed.java index 5683f170df5..4ba8b7084e0 100644 --- a/src/java.base/share/classes/org/checkerframework/checker/signedness/qual/Signed.java +++ b/src/java.base/share/classes/org/checkerframework/checker/signedness/qual/Signed.java @@ -33,16 +33,9 @@ TypeKind.FLOAT, TypeKind.DOUBLE }, - types = { - java.lang.Byte.class, - java.lang.Integer.class, - java.lang.Long.class, - java.lang.Short.class, - java.lang.Float.class, - java.lang.Double.class - }, + types = {Byte.class, Integer.class, Long.class, Short.class, Float.class, Double.class}, value = TypeUseLocation.EXCEPTION_PARAMETER) @UpperBoundFor( typeKinds = {TypeKind.FLOAT, TypeKind.DOUBLE}, - types = {java.lang.Float.class, java.lang.Double.class}) + types = {Float.class, Double.class}) public @interface Signed {} diff --git a/src/java.base/share/classes/org/checkerframework/checker/signedness/qual/Unsigned.java b/src/java.base/share/classes/org/checkerframework/checker/signedness/qual/Unsigned.java index a3d1ce92894..72eb3af4956 100644 --- a/src/java.base/share/classes/org/checkerframework/checker/signedness/qual/Unsigned.java +++ b/src/java.base/share/classes/org/checkerframework/checker/signedness/qual/Unsigned.java @@ -24,8 +24,8 @@ @SubtypeOf({UnknownSignedness.class}) @DefaultFor( typeKinds = {TypeKind.CHAR}, - types = {java.lang.Character.class}) + types = {Character.class}) @UpperBoundFor( typeKinds = {TypeKind.CHAR}, - types = {java.lang.Character.class}) + types = {Character.class}) public @interface Unsigned {} diff --git a/src/java.base/share/classes/org/checkerframework/framework/qual/EnsuresQualifierIf.java b/src/java.base/share/classes/org/checkerframework/framework/qual/EnsuresQualifierIf.java index b44fff876e3..438917c6a70 100644 --- a/src/java.base/share/classes/org/checkerframework/framework/qual/EnsuresQualifierIf.java +++ b/src/java.base/share/classes/org/checkerframework/framework/qual/EnsuresQualifierIf.java @@ -18,10 +18,10 @@ *

Here is an example use: * *


- *   {@literal @}EnsuresQualifierIf(result = true, expression = "#1", qualifier = Odd.class)
- *    boolean isOdd(int p1, int p2) {
- *        return p1 % 2 == 1;
- *    }
+ *  {@literal @}EnsuresQualifierIf(result = true, expression = "#1", qualifier = Odd.class)
+ *   boolean isOdd(int p1, int p2) {
+ *     return p1 % 2 == 1;
+ *   }
  * 
* *

This annotation is only applicable to methods with a boolean return type. diff --git a/src/java.base/share/classes/org/checkerframework/framework/qual/PostconditionAnnotation.java b/src/java.base/share/classes/org/checkerframework/framework/qual/PostconditionAnnotation.java index 1678614c67c..62392f02d1c 100644 --- a/src/java.base/share/classes/org/checkerframework/framework/qual/PostconditionAnnotation.java +++ b/src/java.base/share/classes/org/checkerframework/framework/qual/PostconditionAnnotation.java @@ -31,8 +31,8 @@ * org.checkerframework.common.value.qual.MinLen} qualifier: * *


- * {@literal @}PostconditionAnnotation(qualifier = MinLen.class)
- * {@literal @}Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
+ *  {@literal @}PostconditionAnnotation(qualifier = MinLen.class)
+ *  {@literal @}Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
  *  public {@literal @}interface EnsuresMinLen {
  *    String[] value();
  *    {@literal @}QualifierArgument("value")
@@ -47,7 +47,7 @@
  * {@code @MinLen(2)} upon return.
  *
  * 

- * {@literal @}EnsuresMinLen(value = "field", targetValue = 2")
+ *  {@literal @}EnsuresMinLen(value = "field", targetValue = 2)
  *  public void setField(String argument) {
  *    field = "(" + argument + ")";
  *  }
diff --git a/src/java.base/share/classes/org/checkerframework/framework/qual/PreconditionAnnotation.java b/src/java.base/share/classes/org/checkerframework/framework/qual/PreconditionAnnotation.java
index 542b1fa13b4..a71dac79d1b 100644
--- a/src/java.base/share/classes/org/checkerframework/framework/qual/PreconditionAnnotation.java
+++ b/src/java.base/share/classes/org/checkerframework/framework/qual/PreconditionAnnotation.java
@@ -27,12 +27,12 @@
  * org.checkerframework.common.value.qual.MinLen} qualifier:
  *
  * 

- * {@literal @}PreconditionAnnotation(qualifier = MinLen.class)
- * {@literal @}Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
- * public {@literal @}interface RequiresMinLen {
- *   String[] value();
- *   {@literal @}QualifierArgument("value")
- *   int targetValue() default 0;
+ *  {@literal @}PreconditionAnnotation(qualifier = MinLen.class)
+ *  {@literal @}Target({ElementType.METHOD, ElementType.CONSTRUCTOR})
+ *  public {@literal @}interface RequiresMinLen {
+ *    String[] value();
+ *    {@literal @}QualifierArgument("value")
+ *    int targetValue() default 0;
  * 
* * The {@code value} element holds the expressions to which the qualifier applies and {@code @@ -43,10 +43,10 @@ * {@code @MinLen(2)} upon entry. * *

- * {@literal @}RequiresMinLen(value = "field", targetValue = 2")
- * public char getThirdCharacter() {
- *   return field.charAt(2);
- * }
+ *  {@literal @}RequiresMinLen(value = "field", targetValue = 2")
+ *  public char getThirdCharacter() {
+ *    return field.charAt(2);
+ *  }
  * 
* * @see RequiresQualifier