X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Futil%2FToHTML.java;h=88e4f57b24de60dc8c2f5a73451593a44a53bed4;hp=bec40bf467bd4f47fc4073a7faa84502862d362e;hb=59eead6bf0f2d9a7abeba03f3fdab04625521faf;hpb=e2bfdb3f53cd40b7e3c92ce27ac473b7585c6177

diff --git a/src/edu/berkeley/sbp/util/ToHTML.java b/src/edu/berkeley/sbp/util/ToHTML.java
index bec40bf..88e4f57 100644
--- a/src/edu/berkeley/sbp/util/ToHTML.java
+++ b/src/edu/berkeley/sbp/util/ToHTML.java
@@ -8,10 +8,23 @@ public interface ToHTML {
     public static class HTML {
         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+";"); }
+
         public void append(Object o) {
             if (o==null)                    append("<tt><font color=red>null</font></tt>");
             else if (o instanceof ToHTML)   ((ToHTML)o).toHTML(this);
@@ -28,17 +41,37 @@ public interface ToHTML {
             }
         }
 
-        public void tag(String s, Object o) {
-            if (s != null) {
-                append("<");
+        public void tag(String s) {
+            sb.append("<");
+            append(s);
+            sb.append("/>");
+        }
+        public void openTag(String s, Object[] attrs) {
+                sb.append("<");
                 append(s);
-                append(">");
-            }
+                if (attrs != null)
+                    for(int i=0; i<attrs.length; i+=2) {
+                        sb.append(' ');
+                        append(attrs[i]);
+                        sb.append("=\'");
+                        append(attrs[i+1]);
+                        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) {
-                append("</");
+                sb.append("</");
                 append(s);
-                append(">");
+                sb.append(">");
             }
         }