[cp-patches] FYI: fixlet for gcj 4.0.x and HTMLDocument.java

[Mark Wielaard]

Hi,

The autobuilder was complaining about the fact that gcj 4.0.x couldn't
find ElementSpec in HTMLDocument. This fixes that by fully qualifying
the type.

2006-03-04  Mark Wielaard  <[EMAIL PROTECTED]>

    * javax/swing/text/html/HTMLDocument.java: Qualify ElementSpec as
    DefaultStyledDocument.ElementSpec for gcj 4.0.x.

Now everything distchecks again even against gcj 4.0.x.

Committed,

Mark

Index: javax/swing/text/html/HTMLDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/HTMLDocument.java,v
retrieving revision 1.26
diff -u -r1.26 HTMLDocument.java
--- javax/swing/text/html/HTMLDocument.java	3 Mar 2006 10:47:11 -0000	1.26
+++ javax/swing/text/html/HTMLDocument.java	4 Mar 2006 09:20:20 -0000
@@ -136,7 +136,7 @@
    * 
    * @param data - the date that replaces the content of the document
    */
-  protected void create(ElementSpec[] data)
+  protected void create(DefaultStyledDocument.ElementSpec[] data)
   {
     // Once the super behaviour is properly implemented it should be sufficient
     // to simply call super.create(data).
@@ -1297,7 +1297,7 @@
       // we must also close the p-implied.
       if (parseStack.size() > 0 && parseStack.peek() == HTML.Tag.IMPLIED)
         {
-          element = new ElementSpec(null,
+          element = new DefaultStyledDocument.ElementSpec(null,
                                     DefaultStyledDocument.ElementSpec.EndTagType);
           parseBuffer.addElement(element);
           parseStack.pop();
@@ -1326,14 +1326,17 @@
 
       // If the previous tag is a start tag then we insert a synthetic
       // content tag.
-      ElementSpec prev = (ElementSpec) parseBuffer.get(parseBuffer.size() - 1);
-      if (prev.getType() == ElementSpec.StartTagType)
+      DefaultStyledDocument.ElementSpec prev;
+      prev = (DefaultStyledDocument.ElementSpec)
+	      parseBuffer.get(parseBuffer.size() - 1);
+      if (prev.getType() == DefaultStyledDocument.ElementSpec.StartTagType)
         {
           AbstractDocument.AttributeContext ctx = getAttributeContext();
           AttributeSet attributes = ctx.getEmptySet();
           attributes = ctx.addAttribute(attributes, StyleConstants.NameAttribute,
                                         HTML.Tag.CONTENT);
-          element = new ElementSpec(attributes, ElementSpec.ContentType,
+          element = new DefaultStyledDocument.ElementSpec(attributes,
+			  DefaultStyledDocument.ElementSpec.ContentType,
                                     new char[0], 0, 0);
           parseBuffer.add(element);
         }
@@ -1341,7 +1344,7 @@
       // we must also close the p-implied.
       else if (parseStack.peek() == HTML.Tag.IMPLIED)
         {
-          element = new ElementSpec(null,
+          element = new DefaultStyledDocument.ElementSpec(null,
                                  DefaultStyledDocument.ElementSpec.EndTagType);
           parseBuffer.addElement(element);
           if (parseStack.size() > 0)
@@ -1401,7 +1404,8 @@
           attributes = ctx.addAttribute(attributes,
                                         StyleConstants.NameAttribute,
                                         HTML.Tag.IMPLIED);
-          element = new ElementSpec(attributes, ElementSpec.StartTagType);
+          element = new DefaultStyledDocument.ElementSpec(attributes,
+                       DefaultStyledDocument.ElementSpec.StartTagType);
           parseBuffer.add(element);
           parseStack.push(HTML.Tag.IMPLIED);
         }

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