1 files changed, 59 insertions, 26 deletions

diff --git a/javax/swing/text/html/HTMLDocument.java b/javax/swing/text/html/HTMLDocument.java
index f7b081c6a..00372cd36 100644
--- a/javax/swing/text/html/HTMLDocument.java
+++ b/javax/swing/text/html/HTMLDocument.java
@@ -39,7 +39,6 @@ exception statement from your version. */
 package javax.swing.text.html;
 
 import gnu.classpath.NotImplementedException;
-import gnu.javax.swing.text.html.CharacterAttributeTranslator;
 import gnu.javax.swing.text.html.parser.htmlAttributeSet;
 
 import java.io.IOException;
@@ -50,8 +49,6 @@ import java.util.Stack;
 import java.util.Vector;
 
 import javax.swing.JEditorPane;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.HyperlinkEvent.EventType;
 import javax.swing.text.AbstractDocument;
 import javax.swing.text.AttributeSet;
 import javax.swing.text.BadLocationException;
@@ -87,8 +84,6 @@ public class HTMLDocument extends DefaultStyledDocument
   boolean preservesUnknownTags = true;
   int tokenThreshold = Integer.MAX_VALUE;
   HTMLEditorKit.Parser parser;
-  StyleSheet styleSheet;
-  AbstractDocument.Content content;
   
   /**
    * Constructs an HTML document using the default buffer size and a default
@@ -96,7 +91,7 @@ public class HTMLDocument extends DefaultStyledDocument
    */
   public HTMLDocument()
   {
-    this(null);
+    this(new GapContent(BUFFER_SIZE_DEFAULT), new StyleSheet());
   }
   
   /**
@@ -119,14 +114,7 @@ public class HTMLDocument extends DefaultStyledDocument
    */
   public HTMLDocument(AbstractDocument.Content c, StyleSheet styles)
   {
-    this.content = c;
-    if (styles == null)
-      {
-        styles = new StyleSheet();
-        styles.importStyleSheet(getClass().getResource(HTMLEditorKit.
-                                                       DEFAULT_CSS));
-      }
-    this.styleSheet = styles;
+    super(c, styles);
   }
   
   /**
@@ -137,7 +125,7 @@ public class HTMLDocument extends DefaultStyledDocument
    */
   public StyleSheet getStyleSheet()
   {
-    return styleSheet;
+    return (StyleSheet) getAttributeContext();
   }
   
   /**
@@ -269,7 +257,7 @@ public class HTMLDocument extends DefaultStyledDocument
   public void setBase(URL u)
   {
     baseURL = u;
-    styleSheet.setBase(u);
+    getStyleSheet().setBase(u);
   }
   
   /**
@@ -633,13 +621,8 @@ public class HTMLDocument extends DefaultStyledDocument
         // Put the old attribute set on the stack.
         pushCharacterStyle();
 
-	// Translate tag.. return if succesful.
-	if(CharacterAttributeTranslator.translateTag(charAttr, t, a))
-	  return;
-
         // Just add the attributes in <code>a</code>.
- 	if (a != null)
- 	  charAttr.addAttribute(t, a.copyAttributes());          
+        charAttr.addAttribute(t, a.copyAttributes());
       }
 
       /**
@@ -812,7 +795,42 @@ public class HTMLDocument extends DefaultStyledDocument
         print ("AreaAction.end not implemented");
       } 
     }
-    
+
+    /**
+     * Converts HTML tags to CSS attributes.
+     */
+    class ConvertAction
+      extends TagAction
+    {
+
+      public void start(HTML.Tag tag, MutableAttributeSet atts)
+      {
+        pushCharacterStyle();
+        charAttr.addAttribute(tag, atts.copyAttributes());
+        StyleSheet styleSheet = getStyleSheet();
+        // TODO: Add other tags here.
+        if (tag == HTML.Tag.FONT)
+          {
+            String color = (String) atts.getAttribute(HTML.Attribute.COLOR);
+            if (color != null)
+              styleSheet.addCSSAttribute(charAttr, CSS.Attribute.COLOR, color);
+            String face = (String) atts.getAttribute(HTML.Attribute.FACE);
+            if (face != null)
+              styleSheet.addCSSAttribute(charAttr, CSS.Attribute.FONT_FAMILY,
+                                         face);
+            String size = (String) atts.getAttribute(HTML.Attribute.SIZE);
+            if (size != null)
+              styleSheet.addCSSAttribute(charAttr, CSS.Attribute.FONT_SIZE,
+                                         size);
+          }
+      }
+
+      public void end(HTML.Tag tag)
+      {
+        popCharacterStyle();
+      }
+    }
+
     class BaseAction extends TagAction
     {
       /**
@@ -1028,7 +1046,7 @@ public class HTMLDocument extends DefaultStyledDocument
       StyleAction styleAction = new StyleAction();
       TitleAction titleAction = new TitleAction();
       
-      
+      ConvertAction convertAction = new ConvertAction();
       tagToAction.put(HTML.Tag.A, characterAction);
       tagToAction.put(HTML.Tag.ADDRESS, characterAction);
       tagToAction.put(HTML.Tag.APPLET, hiddenAction);
@@ -1051,7 +1069,7 @@ public class HTMLDocument extends DefaultStyledDocument
       tagToAction.put(HTML.Tag.DL, blockAction);
       tagToAction.put(HTML.Tag.DT, paragraphAction);
       tagToAction.put(HTML.Tag.EM, characterAction);
-      tagToAction.put(HTML.Tag.FONT, characterAction);
+      tagToAction.put(HTML.Tag.FONT, convertAction);
       tagToAction.put(HTML.Tag.FORM, blockAction);
       tagToAction.put(HTML.Tag.FRAME, specialAction);
       tagToAction.put(HTML.Tag.FRAMESET, blockAction);
@@ -1163,7 +1181,7 @@ public class HTMLDocument extends DefaultStyledDocument
      */
     public void handleText(char[] data, int pos)
     {
-      if (data != null && data.length > 0)
+      if (shouldInsert() && data != null && data.length > 0)
         addContent(data, 0, data.length);
     }
     
@@ -1728,4 +1746,19 @@ public void setOuterHTML(Element elem, String htmlText)
     // TODO charset
     getParser().parse(new StringReader(htmlText), reader, true);
   }
+
+  /**
+   * Overridden to tag content with the synthetic HTML.Tag.CONTENT
+   * tag.
+   */
+  protected void insertUpdate(DefaultDocumentEvent evt, AttributeSet att)
+  {
+    if (att == null)
+      {
+        SimpleAttributeSet sas = new SimpleAttributeSet();
+        sas.addAttribute(StyleConstants.NameAttribute, HTML.Tag.CONTENT);
+        att = sas;
+      }
+    super.insertUpdate(evt, att);
+  }
 }