Update qualifiers

Author: mernst

README

@@ -96,17 +96,15 @@ Qualifier definitions
 The java.base module contains a copy of the Checker Framework qualifiers.
 To update that copy:
 
-# Get version number from https://checkerframework.org/ .
-VER=3.3.0
-cd src/java.base/share/classes
-rm -rf org/checkerframework
-wget https://repo1.maven.org/maven2/org/checkerframework/checker-qual/$VER/checker-qual-$VER-sources.jar
-unzip checker-qual-$VER-sources.jar -x 'META-INF*'
-chmod -R u+w org/checkerframework
-jar tf checker-qual-$VER-sources.jar  | grep '\.java$' | sed 's/\/[^/]*\.java/;/' | sed 's/\//./g' | sed 's/^/    exports /' | sort | uniq
-rm -f checker-qual-$VER-sources.jar
-
-Copy the exports lines that were printed by the penultimate command to
+(cd $CHECKERFRAMEWORK && rm -rf checker-qual/build/libs && ./gradlew :checker-qual:sourcesJar)
+cp -pf $CHECKERFRAMEWORK/checker-qual/build/libs/checker-qual-*-source.jar checker-qual.jar
+(cd src/java.base/share/classes && rm -rf org/checkerframework && \
+  unzip ../../../../checker-qual.jar -x 'META-INF*' && \
+  rm -f org/checkerframework/checker/signedness/SignednessUtilExtra.java && \
+  chmod -R u+w org/checkerframework)
+jar tf checker-qual.jar | grep '\.java$' | sed 's/\/[^/]*\.java/;/' | sed 's/\//./g' | sed 's/^/    exports /' | sort | uniq
+
+Copy the exports lines that were printed by the last command to
 src/java.base/share/classes/module-info.java .
 
 

checker-qual.jar

@@ -102,6 +102,7 @@
     exports org.checkerframework.checker.units.qual;
     exports org.checkerframework.common.aliasing.qual;
     exports org.checkerframework.common.reflection.qual;
+    exports org.checkerframework.common.returnsreceiver.qual;
     exports org.checkerframework.common.subtyping.qual;
     exports org.checkerframework.common.util.report.qual;
     exports org.checkerframework.common.value.qual;

src/java.base/share/classes/module-info.java

@@ -8,8 +8,7 @@
 import org.checkerframework.framework.qual.SubtypeOf;
 
 /**
- * The annotation to distinguish compiler message Strings from normal Strings. The programmer should
- * hardly ever need to use it explicitly.
+ * A string that is definitely a compiler message key.
  *
  * @checker_framework.manual #compilermsgs-checker Compiler Message Key Checker
  */

src/java.base/share/classes/org/checkerframework/checker/compilermsgs/qual/CompilerMessageKey.java

@@ -10,7 +10,7 @@
 import org.checkerframework.framework.qual.SubtypeOf;
 
 /**
- * Indicates that the {@code String} type has an unknown compiler message key property.
+ * A {@code String} that might or might not be a compiler message key.
  *
  * @checker_framework.manual #compilermsgs-checker Compiler Message Key Checker
  */

src/java.base/share/classes/org/checkerframework/checker/compilermsgs/qual/UnknownCompilerMessageKey.java

@@ -7,7 +7,11 @@
 import java.lang.annotation.Target;
 import org.checkerframework.framework.qual.SubtypeOf;
 
-/** @checker_framework.manual #fenum-checker Fake Enum Checker */
+/**
+ * AwtCursorType.
+ *
+ * @checker_framework.manual #fenum-checker Fake Enum Checker
+ */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})

src/java.base/share/classes/org/checkerframework/checker/fenum/qual/AwtCursorType.java

@@ -7,7 +7,11 @@
 import java.lang.annotation.Target;
 import org.checkerframework.framework.qual.SubtypeOf;
 
-/** @checker_framework.manual #fenum-checker Fake Enum Checker */
+/**
+ * SwingBoxOrientation.
+ *
+ * @checker_framework.manual #fenum-checker Fake Enum Checker
+ */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})

src/java.base/share/classes/org/checkerframework/checker/fenum/qual/SwingBoxOrientation.java

@@ -7,7 +7,11 @@
 import java.lang.annotation.Target;
 import org.checkerframework.framework.qual.SubtypeOf;
 
-/** @checker_framework.manual #fenum-checker Fake Enum Checker */
+/**
+ * SwingCompassDirection.
+ *
+ * @checker_framework.manual #fenum-checker Fake Enum Checker
+ */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})

src/java.base/share/classes/org/checkerframework/checker/fenum/qual/SwingCompassDirection.java

@@ -7,7 +7,11 @@
 import java.lang.annotation.Target;
 import org.checkerframework.framework.qual.SubtypeOf;
 
-/** @checker_framework.manual #fenum-checker Fake Enum Checker */
+/**
+ * SwingElementOrientation.
+ *
+ * @checker_framework.manual #fenum-checker Fake Enum Checker
+ */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})

src/java.base/share/classes/org/checkerframework/checker/fenum/qual/SwingElementOrientation.java

@@ -7,7 +7,11 @@
 import java.lang.annotation.Target;
 import org.checkerframework.framework.qual.SubtypeOf;
 
-/** @checker_framework.manual #fenum-checker Fake Enum Checker */
+/**
+ * SwingHorizontalOrientation.
+ *
+ * @checker_framework.manual #fenum-checker Fake Enum Checker
+ */
 @Documented
 @Retention(RetentionPolicy.RUNTIME)
 @Target({ElementType.TYPE_USE, ElementType.TYPE_PARAMETER})