From 843b8b1d46eabddc9828f60997802460ee09a3b2 Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Fri, 8 Jan 2021 03:15:11 +0100 Subject: [PATCH] Managed empty data case in check page. --- .../htmlize/PropertyFileCheckPage.java | 68 +++++++++++++------ .../htmlize/propertyFileCheck.xhtml | 17 +---- 2 files changed, 50 insertions(+), 35 deletions(-) diff --git a/src/fr/devinsy/statoolinfos/htmlize/PropertyFileCheckPage.java b/src/fr/devinsy/statoolinfos/htmlize/PropertyFileCheckPage.java index f4803ed..578e8f6 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/PropertyFileCheckPage.java +++ b/src/fr/devinsy/statoolinfos/htmlize/PropertyFileCheckPage.java @@ -107,40 +107,66 @@ public class PropertyFileCheckPage // data.setContent("statsTitle", title); + // int index = 0; - for (PropertyCheck check : checks) + if (checks.isEmpty()) { - // - data.setContent("line", index, "lineIndex", check.getIndex()); - data.setEscapedContent("line", index, "lineComment", check.getComment()); - data.setEscapedContent("line", index, "lineContent", check.getLine()); - data.setAttribute("line", index, "lineContent", "class", statusToCSS(check.getStatus())); + data.setAttribute("fullBlockTable", "class", "xid:nodisplay"); + } + else + { + for (PropertyCheck check : checks) + { + // + data.setContent("line", index, "lineIndex", check.getIndex()); + data.setEscapedContent("line", index, "lineComment", check.getComment()); + data.setEscapedContent("line", index, "lineContent", check.getLine()); + data.setAttribute("line", index, "lineContent", "class", statusToCSS(check.getStatus())); - index += 1; + index += 1; + } } + // index = 0; - for (PropertyCheck check : checks.extractActiveLines()) + PropertyChecks subchecks = checks.extractActiveLines(); + if (subchecks.isEmpty()) { - // - data.setContent("shrunkLine", index, "shrunkLineIndex", check.getIndex()); - data.setEscapedContent("shrunkLine", index, "shrunkLineContent", check.getLine()); - data.setEscapedContent("shrunkLine", index, "shrunkLineComment", check.getComment()); - data.setAttribute("shrunkLine", index, "shrunkLineContent", "class", statusToCSS(check.getStatus())); + data.setAttribute("shrunkBlockTable", "class", "xid:nodisplay"); + } + else + { + for (PropertyCheck check : subchecks) + { + // + data.setContent("shrunkLine", index, "shrunkLineIndex", check.getIndex()); + data.setEscapedContent("shrunkLine", index, "shrunkLineContent", check.getLine()); + data.setEscapedContent("shrunkLine", index, "shrunkLineComment", check.getComment()); + data.setAttribute("shrunkLine", index, "shrunkLineContent", "class", statusToCSS(check.getStatus())); - index += 1; + index += 1; + } } + // index = 0; - for (PropertyCheck check : checks.extractAlertLines()) + subchecks = checks.extractAlertLines(); + if (subchecks.isEmpty()) { - // - data.setContent("alertLine", index, "alertLineIndex", check.getIndex()); - data.setEscapedContent("alertLine", index, "alertLineContent", check.getLine()); - data.setEscapedContent("alertLine", index, "alertLineComment", check.getComment()); - data.setAttribute("alertLine", index, "alertLineContent", "class", statusToCSS(check.getStatus())); + data.setAttribute("alertBlockTable", "class", "xid:nodisplay"); + } + else + { + for (PropertyCheck check : subchecks) + { + // + data.setContent("alertLine", index, "alertLineIndex", check.getIndex()); + data.setEscapedContent("alertLine", index, "alertLineContent", check.getLine()); + data.setEscapedContent("alertLine", index, "alertLineComment", check.getComment()); + data.setAttribute("alertLine", index, "alertLineContent", "class", statusToCSS(check.getStatus())); - index += 1; + index += 1; + } } // diff --git a/src/fr/devinsy/statoolinfos/htmlize/propertyFileCheck.xhtml b/src/fr/devinsy/statoolinfos/htmlize/propertyFileCheck.xhtml index ced70c7..6c17a2b 100644 --- a/src/fr/devinsy/statoolinfos/htmlize/propertyFileCheck.xhtml +++ b/src/fr/devinsy/statoolinfos/htmlize/propertyFileCheck.xhtml @@ -27,7 +27,7 @@ n/a
- +
@@ -38,7 +38,7 @@
000
-