Skip to content

Commit 50fc43f

Browse files
authored
Javadoc fixes
1 parent c48800f commit 50fc43f

File tree

5 files changed

+12
-11
lines changed

5 files changed

+12
-11
lines changed

checker/bin-devel/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ source "$SCRIPTDIR"/clone-related.sh
1111
# Download dependencies, trying a second time if there is a failure.
1212
# echo "NO_WRITE_VERIFICATION_METADATA=$NO_WRITE_VERIFICATION_METADATA"
1313
if [ -z "${NO_WRITE_VERIFICATION_METADATA+x}" ]; then
14-
(TERM=dumb timeout 300 ./gradlew --write-verification-metadata sha256 help --dry-run \
15-
|| (sleep 1m && TERM=dumb timeout 300 ./gradlew --write-verification-metadata sha256 help --dry-run))
14+
(date && TERM=dumb timeout 300 ./gradlew --write-verification-metadata sha256 help --dry-run) \
15+
|| (sleep 1m && date && TERM=dumb timeout 300 ./gradlew --write-verification-metadata sha256 help --dry-run)
1616
fi
1717
echo "running \"./gradlew assemble\" for checker-framework"
1818
./gradlew assemble --console=plain -Dorg.gradle.internal.http.socketTimeout=60000 -Dorg.gradle.internal.http.connectionTimeout=60000

checker/bin-devel/git.pre-commit

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ if [ -n "$CHANGED_JAVA_FILES" ]; then
1919
if [ "$BRANCH" = "master" ]; then
2020
git diff --staged > /tmp/diff.txt
2121
./gradlew --stacktrace getPlumeScripts
22-
(./gradlew requireJavadoc > /tmp/warnings-rjp.txt 2>&1) || true
23-
checker/bin-devel/.plume-scripts/lint-diff.py --guess-strip /tmp/diff.txt /tmp/warnings-rjp.txt
24-
(./gradlew javadocDoclintAll > /tmp/warnings-jda.txt 2>&1) || true
25-
checker/bin-devel/.plume-scripts/lint-diff.py --guess-strip /tmp/diff.txt /tmp/warnings-jda.txt
22+
(./gradlew requireJavadoc > /tmp/warnings-requireJavadoc.txt 2>&1) || true
23+
checker/bin-devel/.plume-scripts/lint-diff.py --guess-strip /tmp/diff.txt /tmp/warnings-requireJavadoc.txt
24+
(./gradlew javadocDoclintAll > /tmp/warnings-javadocDoclintAll.txt 2>&1) || true
25+
checker/bin-devel/.plume-scripts/lint-diff.py --guess-strip /tmp/diff.txt /tmp/warnings-javadocDoclintAll.txt
2626
fi
2727
fi
2828

checker/bin-devel/test-misc.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ make style-check --jobs="$(getconf _NPROCESSORS_ONLN)"
3737
if [ -f SKIP-REQUIRE-JAVADOC ]; then
3838
echo "Skipping requireJavadoc because file SKIP-REQUIRE-JAVADOC exists."
3939
else
40-
(./gradlew requireJavadoc --console=plain --warning-mode=all > /tmp/warnings-rjp.txt 2>&1) || true
41-
"$PLUME_SCRIPTS"/ci-lint-diff /tmp/warnings-rjp.txt || status=1
42-
(./gradlew javadocDoclintAll --console=plain --warning-mode=all > /tmp/warnings-jda.txt 2>&1) || true
43-
"$PLUME_SCRIPTS"/ci-lint-diff /tmp/warnings-jda.txt || status=1
40+
(./gradlew requireJavadoc --console=plain --warning-mode=all > /tmp/warnings-requireJavadoc.txt 2>&1) || true
41+
"$PLUME_SCRIPTS"/ci-lint-diff /tmp/warnings-requireJavadoc.txt || status=1
42+
(./gradlew javadocDoclintAll --console=plain --warning-mode=all > /tmp/warnings-javadocDoclintAll.txt 2>&1) || true
43+
"$PLUME_SCRIPTS"/ci-lint-diff /tmp/warnings-javadocDoclintAll.txt || status=1
4444
fi
4545
if [ $status -ne 0 ]; then exit $status; fi
4646

checker/src/main/java/org/checkerframework/checker/index/substringindex/SubstringIndexAnnotatedTypeFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ protected DependentTypesHelper createDependentTypesHelper() {
7474

7575
/**
7676
* The Substring Index qualifier hierarchy. The hierarchy consists of a top element {@link
77-
* UNKNOWN} of type {@link SubstringIndexUnknown}, bottom element {@link BOTTOM} of type {@link
77+
* #UNKNOWN} of type {@link SubstringIndexUnknown}, bottom element {@link #BOTTOM} of type {@link
7878
* SubstringIndexBottom}, and elements of type {@link SubstringIndexFor} that follow the subtyping
7979
* relation of {@link UBQualifier}.
8080
*/

checker/src/main/java/org/checkerframework/checker/rlccalledmethods/RLCCalledMethodsAnalysis.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import javax.lang.model.type.TypeMirror;
44
import org.checkerframework.checker.calledmethods.CalledMethodsAnalysis;
55
import org.checkerframework.checker.calledmethods.CalledMethodsAnnotatedTypeFactory;
6+
import org.checkerframework.checker.resourceleak.ResourceLeakChecker;
67
import org.checkerframework.checker.resourceleak.SetOfTypes;
78

89
/**

0 commit comments

Comments
 (0)