Code Review / aaf / authz.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: bdb54b7)
Minor HTML Gen improvments 09/110809/1
authorInstrumental <jgonap@stl.gathman.org>
Fri, 31 Jul 2020 12:31:41 +0000 (07:31 -0500)
committerInstrumental <jgonap@stl.gathman.org>
Fri, 31 Jul 2020 12:31:47 +0000 (07:31 -0500)
Handle Null Text, Add DOCTYPE

Issue-ID: AAF-1190
Signed-off-by: Instrumental <jgonap@stl.gathman.org>
Change-Id: I4c9177cc402b4c0af58a5236610d178b28f2a5e4

misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java patch | blob | history
misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/HTML5Gen.java patch | blob | history

diff --git a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java
index b68ad6e..258715e 100644 (file)
--- a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java
+++ b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java
@@ -151,7 +151,9 @@ public class XGen<RT extends XGen<RT>> {
 \r
     @SuppressWarnings("unchecked")\r
     public RT text(String txt) {\r
-        forward.append(txt);\r
+       if(txt!=null) {\r
+               forward.append(txt);\r
+       }\r
         return (RT)this;\r
     }\r
     \r
@@ -182,8 +184,12 @@ public class XGen<RT extends XGen<RT>> {
         for (int i=0;i<tabs;++i) {\r
             forward.append("  ");\r
         }\r
-        forward.append(txt);\r
-        if (pretty)forward.println();\r
+        if(txt!=null) {\r
+               forward.append(txt);\r
+        }\r
+       if (pretty) {\r
+               forward.println();\r
+       }\r
         return (RT)this;\r
     }\r
 \r
diff --git a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/HTML5Gen.java b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/HTML5Gen.java
index 89a39b3..7cf3929 100644 (file)
--- a/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/HTML5Gen.java
+++ b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/html/HTML5Gen.java
@@ -32,7 +32,7 @@ public class HTML5Gen extends HTMLGen {
 \r
     @Override\r
     public HTMLGen html(String ... attrib) {\r
-        //forward.println("<!DOCTYPE html>");\r
+        forward.println("<!DOCTYPE html>");\r
         incr("html",attrib);\r
         return this;\r
     }\r
ARCHIVED- 2022-02-15 at the request of the project