Skip to content

Validate extracted Javadoc snippets during javadoc build; refresh GeneratedCN1Access (add java.time, remove impl entries) #4668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
liannacasper merged 2 commits into from
Mar 30, 2026
Merged

Validate extracted Javadoc snippets during javadoc build; refresh GeneratedCN1Access (add java.time, remove impl entries) #4668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c429e9
Restore CN1 API registry availability in playground
liannacasper Mar 30, 2026
8e0f63a
Merge branch 'master' into codex/fix-playground-component-recognition…
liannacasper Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions .github/scripts/build_javadocs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,15 @@ else
JAVADOC_CMD="javadoc"
fi

TMP_SNIPPETS_JSONL="$(mktemp)"
cleanup() {
rm -f "$TMP_SNIPPETS_JSONL"
run_with_timeout() {
local seconds="$1"
shift
if command -v timeout >/dev/null 2>&1; then
timeout "${seconds}" "$@"
return $?
fi
"$@"
}
trap cleanup EXIT

echo "Extracting JavaDoc snippets prior to JavaDoc generation..."
"$ROOT_DIR/scripts/extract-javadoc-java-snippets.sh" "$CN1_DIR/src" > "$TMP_SNIPPETS_JSONL"

echo "Validating JavaDoc snippets prior to JavaDoc generation..."
"$ROOT_DIR/scripts/validate-extracted-javadoc-snippets.sh" "$TMP_SNIPPETS_JSONL"

rm -rf "$CN1_DIR/dist/javadoc"
rm -rf "$CN1_DIR/build/tempJavaSources"
Expand All @@ -33,6 +31,18 @@ mkdir -p "$CN1_DIR/dist/javadoc"

cp -r "$CN1_DIR/src/"* "$CN1_DIR/build/tempJavaSources/"

VALIDATE_SNIPPETS_SCRIPT="${SCRIPT_DIR}/validate-extracted-javadoc-snippets.sh"
if [ -x "${VALIDATE_SNIPPETS_SCRIPT}" ]; then
echo "Validating JavaDoc snippets prior to JavaDoc generation..." >&2
if ! run_with_timeout 300 "${VALIDATE_SNIPPETS_SCRIPT}"; then
status=$?
if [ "${status}" -eq 124 ]; then
echo "JavaDoc snippet validation timed out after 300 seconds." >&2
fi
exit "${status}"
fi
fi

cat > "$CN1_DIR/build/tempJavaSources/com/codename1/impl/ImplementationFactory.java" <<'EOF'
package com.codename1.impl;

Expand Down
382 changes: 247 additions & 135 deletions scripts/cn1playground/common/src/main/java/bsh/cn1/GeneratedCN1Access.java
View file
Open in desktop

Large diffs are not rendered by default.

58 changes: 58 additions & 0 deletions ...playground/common/src/main/java/bsh/cn1/gen/GeneratedAccess_com_codename1_components.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26493,6 +26493,12 @@ private static Object invoke17(com.codename1.components.InteractionDialog typedT
typedTarget.clearClientProperties(); return null;
}
}
if ("configureCommands".equals(name)) {
if (matches(safeArgs, new Class<?>[]{com.codename1.ui.Command[].class, java.lang.Boolean.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{com.codename1.ui.Command[].class, java.lang.Boolean.class}, false);
typedTarget.configureCommands((com.codename1.ui.Command[]) adaptedArgs[0], ((Boolean) adaptedArgs[1]).booleanValue()); return null;
}
}
if ("contains".equals(name)) {
if (matches(safeArgs, new Class<?>[]{com.codename1.ui.Component.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{com.codename1.ui.Component.class}, false);
Expand Down Expand Up @@ -27757,6 +27763,18 @@ private static Object invoke17(com.codename1.components.InteractionDialog typedT
typedTarget.setCursor(((Number) adaptedArgs[0]).intValue()); return null;
}
}
if ("setDefaultCommand".equals(name)) {
if (matches(safeArgs, new Class<?>[]{com.codename1.ui.Command.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{com.codename1.ui.Command.class}, false);
typedTarget.setDefaultCommand((com.codename1.ui.Command) adaptedArgs[0]); return null;
}
}
if ("setDialogType".equals(name)) {
if (matches(safeArgs, new Class<?>[]{java.lang.Integer.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{java.lang.Integer.class}, false);
typedTarget.setDialogType(((Number) adaptedArgs[0]).intValue()); return null;
}
}
if ("setDialogUIID".equals(name)) {
if (matches(safeArgs, new Class<?>[]{java.lang.String.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{java.lang.String.class}, false);
Expand Down Expand Up @@ -28169,6 +28187,12 @@ private static Object invoke17(com.codename1.components.InteractionDialog typedT
typedTarget.setTensileLength(((Number) adaptedArgs[0]).intValue()); return null;
}
}
if ("setTimeout".equals(name)) {
if (matches(safeArgs, new Class<?>[]{java.lang.Long.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{java.lang.Long.class}, false);
typedTarget.setTimeout(((Number) adaptedArgs[0]).longValue()); return null;
}
}
if ("setTitle".equals(name)) {
if (matches(safeArgs, new Class<?>[]{java.lang.String.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{java.lang.String.class}, false);
Expand All @@ -28181,6 +28205,12 @@ private static Object invoke17(com.codename1.components.InteractionDialog typedT
typedTarget.setTooltip((java.lang.String) adaptedArgs[0]); return null;
}
}
if ("setTransitions".equals(name)) {
if (matches(safeArgs, new Class<?>[]{com.codename1.ui.animations.Transition.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{com.codename1.ui.animations.Transition.class}, false);
typedTarget.setTransitions((com.codename1.ui.animations.Transition) adaptedArgs[0]); return null;
}
}
if ("setTraversable".equals(name)) {
if (matches(safeArgs, new Class<?>[]{java.lang.Boolean.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{java.lang.Boolean.class}, false);
Expand Down Expand Up @@ -28239,6 +28269,11 @@ private static Object invoke17(com.codename1.components.InteractionDialog typedT
typedTarget.show(((Number) adaptedArgs[0]).intValue(), ((Number) adaptedArgs[1]).intValue(), ((Number) adaptedArgs[2]).intValue(), ((Number) adaptedArgs[3]).intValue()); return null;
}
}
if ("showDialog".equals(name)) {
if (safeArgs.length == 0) {
return typedTarget.showDialog();
}
}
if ("showPopupDialog".equals(name)) {
if (matches(safeArgs, new Class<?>[]{com.codename1.ui.Component.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{com.codename1.ui.Component.class}, false);
Expand Down Expand Up @@ -34978,6 +35013,12 @@ private static Object invoke21(com.codename1.components.Progress typedTarget, St
typedTarget.clearComponentsAwaitingRelease(); return null;
}
}
if ("configureCommands".equals(name)) {
if (matches(safeArgs, new Class<?>[]{com.codename1.ui.Command[].class, java.lang.Boolean.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{com.codename1.ui.Command[].class, java.lang.Boolean.class}, false);
typedTarget.configureCommands((com.codename1.ui.Command[]) adaptedArgs[0], ((Boolean) adaptedArgs[1]).booleanValue()); return null;
}
}
if ("contains".equals(name)) {
if (matches(safeArgs, new Class<?>[]{com.codename1.ui.Component.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{com.codename1.ui.Component.class}, false);
Expand Down Expand Up @@ -36011,6 +36052,11 @@ private static Object invoke21(com.codename1.components.Progress typedTarget, St
return typedTarget.isIgnorePointerEvents();
}
}
if ("isInteractionDialogMode".equals(name)) {
if (safeArgs.length == 0) {
return typedTarget.isInteractionDialogMode();
}
}
if ("isMinimizeOnBack".equals(name)) {
if (safeArgs.length == 0) {
return typedTarget.isMinimizeOnBack();
Expand Down Expand Up @@ -36841,6 +36887,12 @@ private static Object invoke21(com.codename1.components.Progress typedTarget, St
typedTarget.setInlineUnselectedStyles((java.lang.String) adaptedArgs[0]); return null;
}
}
if ("setInteractionDialogMode".equals(name)) {
if (matches(safeArgs, new Class<?>[]{java.lang.Boolean.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{java.lang.Boolean.class}, false);
typedTarget.setInteractionDialogMode(((Boolean) adaptedArgs[0]).booleanValue()); return null;
}
}
if ("setIsScrollVisible".equals(name)) {
if (matches(safeArgs, new Class<?>[]{java.lang.Boolean.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{java.lang.Boolean.class}, false);
Expand Down Expand Up @@ -37204,6 +37256,12 @@ private static Object invoke21(com.codename1.components.Progress typedTarget, St
typedTarget.setTransitionOutAnimator((com.codename1.ui.animations.Transition) adaptedArgs[0]); return null;
}
}
if ("setTransitions".equals(name)) {
if (matches(safeArgs, new Class<?>[]{com.codename1.ui.animations.Transition.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{com.codename1.ui.animations.Transition.class}, false);
typedTarget.setTransitions((com.codename1.ui.animations.Transition) adaptedArgs[0]); return null;
}
}
if ("setTraversable".equals(name)) {
if (matches(safeArgs, new Class<?>[]{java.lang.Boolean.class}, false)) {
Object[] adaptedArgs = adaptArgs(safeArgs, new Class<?>[]{java.lang.Boolean.class}, false);
Expand Down
Loading
Loading