X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=src%2Forg%2Fxwt%2Ftranslators%2FHTML.java;h=4801971dd23aa419e45363c1669daf4723291dee;hb=8c1756ef3fd42cc2f324baf47e13a83f51045efe;hp=b8ece5683d4ffb9c8d05d3aaf66b55b3bc1505c4;hpb=de71be6ed2ac0542abb790006896980b2c2211a8;p=org.ibex.core.git

diff --git a/src/org/xwt/translators/HTML.java b/src/org/xwt/translators/HTML.java
index b8ece56..4801971 100644
--- a/src/org/xwt/translators/HTML.java
+++ b/src/org/xwt/translators/HTML.java
@@ -37,8 +37,9 @@ import org.xwt.util.*;
  */
 public class HTML {
 
-    // FIXME: fill in
-    private final static String[] bodylessTags = new String[] { "br", "hr", "input", "img", "isindex" };
+    private final static String[] noEndTag =
+        new String[] { "area", "base", "basefont", "br", "col", "frame", "hr", "img",
+                       "input", "isindex", "link", "meta", "param" };
 
     /** we keep a char[] around for use by removeRedundantWhitespace() */
     private static char[] cbuf = null;
@@ -51,7 +52,7 @@ public class HTML {
 
     public static synchronized JS parseReader(Reader r) throws IOException {
         CharStream cs = new CharStream(r);
-        JS.Obj h = new JS.Obj();
+        JS h = new JS();
 
         withinLI = false;
         h.put("$name", "html");
@@ -62,13 +63,14 @@ public class HTML {
             // continue until we get an EOFException
         }
         
+        /* FIXME
         Object[] ids = h.keys();
         for(int i=0; i<ids.length; i++) {
             Object el = h.get((String)ids[i]);
             if (el instanceof JS && "html".equals(((JS)el).get("$name")))
                 return (JS)el;
         }
-        
+        */        
         return h;
     }
 
@@ -87,7 +89,6 @@ public class HTML {
         while(Character.isSpace(cs.peek())) cs.get();
         String elementName = parseElementName(cs);
 
-        // FIXME: this might not deal correctly with EOFExceptions
         boolean saveWithinLI = withinLI;
         if (elementName.equals("li")) {
             if (withinLI) {
@@ -119,8 +120,8 @@ public class HTML {
         cs.get();
 
         // bodyless tags return here
-        for(int i=0; i<bodylessTags.length; i++)
-            if (bodylessTags[i].equals(elementName))
+        for(int i=0; i<noEndTag.length; i++)
+            if (noEndTag[i].equals(elementName))
                 return null;
 
         // scan body
@@ -162,7 +163,7 @@ public class HTML {
             try {
                 // scan subelement
                 if (cs.peek() != '/') {
-                    JS kid = new JS.Obj();
+                    JS kid = new JS();
                     closetag = parseElement(cs, kid);
                     h.put(String.valueOf(length), kid); 
                     h.put("$numchildren", new Integer(++length));
@@ -270,7 +271,7 @@ public class HTML {
                 sb.append("\"");
                 i = nextamp + 6;
             } else if (s.regionMatches(nextamp, "&nbsp;", 0, 6)) {
-                // FIXME: should have a way to indicate this...
+                // FEATURE: perhaps we should distinguish this somehow
                 sb.append(" ");
                 i = nextamp + 6;
             } else {
@@ -281,7 +282,6 @@ public class HTML {
         return sb.toString();
     }
 
-    // FIXME double check this
     /** removes all redundant whitespace */
     private static String removeRedundantWhitespace(String s) {