Index: javax/swing/text/html/HTMLDocument.java
===================================================================
RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/HTMLDocument.java,v
retrieving revision 1.2
diff -u -r1.2 HTMLDocument.java
--- javax/swing/text/html/HTMLDocument.java	2 Jul 2005 20:32:51 -0000	1.2
+++ javax/swing/text/html/HTMLDocument.java	21 Sep 2005 18:18:06 -0000
@@ -38,7 +38,10 @@
 
 package javax.swing.text.html;
 
+import javax.swing.text.AttributeSet;
 import javax.swing.text.DefaultStyledDocument;
+import javax.swing.text.ElementIterator;
+import javax.swing.text.html.HTML.Tag;
 
 /**
  * TODO: This class is not yet completetely implemented.
@@ -47,7 +50,146 @@
  */
 public class HTMLDocument extends DefaultStyledDocument
 {
+
+  /**
+   * An iterator to iterate through LeafElements in the document.
+   */
+  class LeafIterator extends Iterator
+  {
+    HTML.Tag tag;
+    HTMLDocument doc;
+    ElementIterator it;
+
+    public LeafIterator (HTML.Tag t, HTMLDocument d)
+    {
+      doc = d;
+      tag = t;
+      it = new ElementIterator(doc);
+    }
+    
+    /**
+     * Return the attributes for the tag associated with this iteartor
+     * @return the AttributeSet
+     */
+    public AttributeSet getAttributes()
+    {
+      if (it.current() != null)
+        return it.current().getAttributes();
+      return null;
+    }
+
+    /**
+     * Get the end of the range for the current occurrence of the tag
+     * being defined and having the same attributes.
+     * @return the end of the range
+     */
+    public int getEndOffset()
+    {
+      if (it.current() != null)
+        return it.current().getEndOffset();
+      return -1;
+    }
+
+    /**
+     * Get the start of the range for the current occurrence of the tag
+     * being defined and having the same attributes.
+     * @return the start of the range (-1 if it can't be found).
+     */
+
+    public int getStartOffset()
+    {
+      if (it.current() != null)
+        return it.current().getStartOffset();
+      return -1;
+    }
+
+    /**
+     * Advance the iterator to the next LeafElement .
+     */
+    public void next()
+    {
+      it.next();
+      while (it.current()!= null && !it.current().isLeaf())
+        it.next();
+    }
+
+    /**
+     * Indicates whether or not the iterator currently represents an occurrence
+     * of the tag.
+     * @return true if the iterator currently represents an occurrence of the
+     * tag.
+     */
+    public boolean isValid()
+    {
+      return it.current() != null;
+    }
+
+    /**
+     * Type of tag for this iterator.
+     */
+    public Tag getTag()
+    {
+      return tag;
+    }
+
+  }
+
   public void processHTMLFrameHyperlinkEvent(HTMLFrameHyperlinkEvent event)
   {
+  }
+  
+  /**
+   * Gets an iterator for the given HTML.Tag.
+   * @param t the requested HTML.Tag
+   * @return the Iterator
+   */
+  public HTMLDocument.Iterator getIterator (HTML.Tag t)
+  {
+    return new HTMLDocument.LeafIterator(t, this);
+  }
+  
+  /**
+   * An iterator over a particular type of tag.
+   */
+  public abstract static class Iterator
+  {
+    /**
+     * Return the attribute set for this tag.
+     * @return the <code>AttributeSet</code> (null if none found).
+     */
+    public abstract AttributeSet getAttributes();
+    
+    /**
+     * Get the end of the range for the current occurrence of the tag
+     * being defined and having the same attributes.
+     * @return the end of the range
+     */
+    public abstract int getEndOffset();
+    
+    /**
+     * Get the start of the range for the current occurrence of the tag
+     * being defined and having the same attributes.
+     * @return the start of the range (-1 if it can't be found).
+     */
+    public abstract int getStartOffset();
+    
+    /**
+     * Move the iterator forward.
+     */
+    public abstract void next();
+    
+    /**
+     * Indicates whether or not the iterator currently represents an occurrence
+     * of the tag.
+     * @return true if the iterator currently represents an occurrence of the
+     * tag.
+     */
+    public abstract boolean isValid();
+    
+    /**
+     * Type of tag this iterator represents.
+     * @return the tag.
+     */
+    public abstract HTML.Tag getTag();
   }
 }