From 457ce3fb7d0bd2198d1397912093cc1f99befe26 Mon Sep 17 00:00:00 2001 From: "David A. Madore" Date: Wed, 7 Sep 2011 18:01:38 +0200 Subject: Use HTML5 elements for header, hgroup, nav(bar), footer. --- org/madore/damlengine/TodoFooter.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'org/madore/damlengine/TodoFooter.java') diff --git a/org/madore/damlengine/TodoFooter.java b/org/madore/damlengine/TodoFooter.java index c47c951..ece31d4 100644 --- a/org/madore/damlengine/TodoFooter.java +++ b/org/madore/damlengine/TodoFooter.java @@ -14,15 +14,17 @@ public final class TodoFooter extends TodoElement { @Override public void handle() { + Element footer = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "footer"); + node.getParentNode().insertBefore(footer, node); + node.getParentNode().insertBefore(ctx.doc.createTextNode("\n"), node); + footer.setAttributeNS(null, "class", "cleared"); ArrayList toProcess = new ArrayList(2); Element hr = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "hr"); - hr.setAttributeNS(null, "class", "cleared"); - node.getParentNode().insertBefore(hr, node); - node.getParentNode().insertBefore(ctx.doc.createTextNode("\n"), node); - toProcess.add(TodoElement.getTodoElement(hr, this.ctx, this)); + footer.appendChild(hr); + footer.appendChild(ctx.doc.createTextNode("\n")); Element addr = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "address"); - node.getParentNode().insertBefore(addr, node); - node.getParentNode().insertBefore(ctx.doc.createTextNode("\n"), node); + footer.appendChild(addr); + footer.appendChild(ctx.doc.createTextNode("\n")); toProcess.add(TodoElement.getTodoElement(addr, this.ctx, this)); Element a = ctx.doc.createElementNS(DamlEngine.XHTML_NS, "a"); a.setAttributeNS(null, "href", @@ -40,7 +42,7 @@ public final class TodoFooter extends TodoElement { email.appendChild(ctx.doc.createElementNS(DamlEngine.DAML_NS, "d:email-dot")); email.appendChild(ctx.doc.createTextNode("org")); Node ws = node.getNextSibling(); - if ( ( ws.getNodeType() == Node.TEXT_NODE + if ( ws != null && ( ws.getNodeType() == Node.TEXT_NODE || ws.getNodeType() == Node.CDATA_SECTION_NODE ) && Pattern.matches("^\\s*$",((CharacterData)ws).getData()) ) node.getParentNode().removeChild(ws); -- cgit v1.2.3