checkpoint

[sbp.git] / src / edu / berkeley / sbp / util / ToHTML.java

diff --git a/src/edu/berkeley/sbp/util/ToHTML.java b/src/edu/berkeley/sbp/util/ToHTML.java
index fe3b3a3..88e4f57 100644 (file)
--- a/src/edu/berkeley/sbp/util/ToHTML.java
+++ b/src/edu/berkeley/sbp/util/ToHTML.java
@@ -9,11 +9,19 @@ public interface ToHTML {
         private final StringBuffer sb;
         public HTML(StringBuffer sb) { this.sb = sb; }
 
+        public void appendLiterally(String s) {
+            sb.append(s);
+        }
         public void append(String s) {
             /* FIXME */
             sb.append(s);
         }
 
+        public void appendText(String s) {
+            /* FIXME: escapify this!!! */
+            sb.append(s);
+        }
+
         public void entity(int entity) { sb.append("&#"+entity+";"); }
         public void entity(String entity) { sb.append("&"+entity+";"); }
 
@@ -38,9 +46,7 @@ public interface ToHTML {
             append(s);
             sb.append("/>");
         }
-        public void tag(String s, Object o) { tag(s, null, o); }
-        public void tag(String s, Object[] attrs, Object o) {
-            if (s != null) {
+        public void openTag(String s, Object[] attrs) {
                 sb.append("<");
                 append(s);
                 if (attrs != null)
@@ -52,7 +58,15 @@ public interface ToHTML {
                         sb.append("\'");
                     }
                 sb.append(">");
-            }
+        }
+        public void closeTag(String s) {
+            sb.append("<");
+            append(s);
+            sb.append(">");
+        }
+        public void tag(String s, Object o) { tag(s, null, o); }
+        public void tag(String s, Object[] attrs, Object o) {
+            if (s != null) openTag(s, attrs);
             append(o);
             if (s != null) {
                 sb.append("</");