diff --git a/src/main/java/dev/zontreck/ariaslib/html/DOM.java b/src/main/java/dev/zontreck/ariaslib/html/DOM.java index 36c57d6..e27f6ac 100644 --- a/src/main/java/dev/zontreck/ariaslib/html/DOM.java +++ b/src/main/java/dev/zontreck/ariaslib/html/DOM.java @@ -1,46 +1,7 @@ package dev.zontreck.ariaslib.html; public class DOM { - /** - * Generates a HTML Header that automatically includes dependencies - * - * @return HTML - */ - public static String getHTMLHeader ( String pageTitle ) { - return "\n" + - "\n" + - " \n" + - " \n" + - " \n" + - " \n" + - "\n" + - " \n" + - " \n" + - " \n\n" + - "\n" + - " " + pageTitle + "\n" + - " \n" + - " \n" + - "\n" + - " \n" + - "\n" + - " \n" + - " \n" + - " \n\n" + - "\n" + - "\n\n" + - " "; - } + public static HTMLElementBuilder beginBootstrapDOM ( String pageTitle ) { diff --git a/src/main/java/dev/zontreck/ariaslib/html/HTMLElement.java b/src/main/java/dev/zontreck/ariaslib/html/HTMLElement.java index 7f01056..4058498 100644 --- a/src/main/java/dev/zontreck/ariaslib/html/HTMLElement.java +++ b/src/main/java/dev/zontreck/ariaslib/html/HTMLElement.java @@ -27,7 +27,7 @@ public class HTMLElement { StringBuilder builder = new StringBuilder ( ); if ( "!doctype".equalsIgnoreCase ( tagName ) ) { - builder.append ( "<" ).append ( tagName ).append ( " " ).append ( text ).append ( ">" ); + builder.append ( "<" ).append ( tagName ).append ( " " ).append ( text ).append ( ">\n" ); for ( HTMLElement child : children ) { builder.append ( child.generateHTML ( ) ); } @@ -46,23 +46,26 @@ public class HTMLElement { } } + /* if ( isEmptyElement ) { - builder.append ( " />" ); + builder.append ( " />\n" ); return builder.toString ( ); - } + }*/ - builder.append ( ">" ); + builder.append ( ">\n" ); if ( text != null ) { builder.append ( text ); } else { - for ( HTMLElement child : children ) { - builder.append ( child.generateHTML ( ) ); + if ( ! isEmptyElement ) { + for ( HTMLElement child : children ) { + builder.append ( child.generateHTML ( ) ); + } } } - builder.append ( "" ); + builder.append ( "\n" ); return builder.toString ( ); }