[cp-patches] FYI: HTMLDocument fixlet to compile with gcj 4.0.x again

[Mark Wielaard]

Hi,

gcj 4.0.x needs the following workaround to compile HTMLDocument
correctly. This has been fixed in gcj 4.1.

2005-12-17  Mark Wielaard  <address@hidden>

    * javax/swing/text/html/HTMLDocument.java (flush): Qualify ElementSpec
    type comming from DefaultStyledDocument.
    (blockOpen): Likewise.
    (blockClose): Likewise.
    (addContent): Likewise.

Committed,

Mark

Index: javax/swing/text/html/HTMLDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/HTMLDocument.java,v
retrieving revision 1.17
diff -u -r1.17 HTMLDocument.java
--- javax/swing/text/html/HTMLDocument.java     16 Dec 2005 21:35:06 -0000      
1.17
+++ javax/swing/text/html/HTMLDocument.java     17 Dec 2005 23:58:27 -0000
@@ -1095,7 +1095,8 @@
      */
     public void flush() throws BadLocationException
     {
-      ElementSpec[] elements = new ElementSpec[parseBuffer.size()];
+      DefaultStyledDocument.ElementSpec[] elements;
+      elements = new DefaultStyledDocument.ElementSpec[parseBuffer.size()];
       parseBuffer.copyInto(elements);
       parseBuffer.removeAllElements();
       insert(offset, elements);
@@ -1245,7 +1246,9 @@
     protected void blockOpen(HTML.Tag t, MutableAttributeSet attr)
     {
       printBuffer();
-      ElementSpec element = new ElementSpec(attr.copyAttributes(), 
ElementSpec.StartTagType);
+      DefaultStyledDocument.ElementSpec element;
+      element = new DefaultStyledDocument.ElementSpec(attr.copyAttributes(),
+                       DefaultStyledDocument.ElementSpec.StartTagType);
       parseBuffer.addElement(element);
       printBuffer();
     }
@@ -1259,7 +1262,9 @@
     protected void blockClose(HTML.Tag t)
     {
       printBuffer();
-      ElementSpec element = new ElementSpec(null, ElementSpec.EndTagType);
+      DefaultStyledDocument.ElementSpec element;
+      element = new DefaultStyledDocument.ElementSpec(null,
+                               DefaultStyledDocument.ElementSpec.EndTagType);
       parseBuffer.addElement(element);
       printBuffer();
     }
@@ -1296,8 +1301,10 @@
       if (charAttr != null)
         attributes = charAttr.copyAttributes();
 
-      ElementSpec element = new ElementSpec(attributes, 
ElementSpec.ContentType,
-                                            data, offs, length);
+      DefaultStyledDocument.ElementSpec element;
+      element = new DefaultStyledDocument.ElementSpec(attributes,
+                             DefaultStyledDocument.ElementSpec.ContentType,
+                              data, offs, length);
       
       printBuffer();
       // Add the element to the buffer

signature.asc
Description: This is a digitally signed message part