htmlparser-cvs

[Ian M. <ian...@us...>]

Update of /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25403/src/org/htmlparser/tags

Modified Files:
	TableColumn.java TableHeader.java TableRow.java 
Added Files:
	DefinitionList.java DefinitionListBullet.java HeadingTag.java 
	ParagraphTag.java 
Log Message:
Added support for P and h1-h6 tags.
Added support for definition list tags (dl, dt, dd).
Let table row/column tags know when to close if encounter TBODY/TFOOT/THEAD.

--- NEW FILE: ParagraphTag.java ---
// HTMLParser Library $Name:  $ - A java-based parser for HTML
// http://sourceforge.org/projects/htmlparser
// Copyright (C) 2004 Somik Raha
//
// Revision Control Information
//
// $Source: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/ParagraphTag.java,v $
// $Author: ian_macfarlane $
// $Date: 2005/10/31 16:26:11 $
// $Revision: 1.1 $
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//

package org.htmlparser.tags;

/**
 * A paragraph (p) tag.
 */
public class ParagraphTag extends CompositeTag
{
    /**
     * The set of names handled by this tag.
     */
    private static final String[] mIds = new String[] {"P"};

    /**
     * The set of tag names that indicate the end of this tag.
     */
    private static final String[] mEnders = new String[] {"ADDRESS", "BLOCKQUOTE", "CENTER", "DD", "DIR", "DIV", "DL", "DT", "FIELDSET", "FORM", "H1", "H2", "H3", "H4", "H5", "H6", "HR", "ISINDEX", "LI", "MENU", "NOFRAMES", "OL", "P", "PARAM", "PRE", "UL"};
    
    /**
     * The set of end tag names that indicate the end of this tag.
     */
    private static final String[] mEndTagEnders = new String[] {"BODY", "HTML"};

    /**
     * Create a new p tag.
     */
    public ParagraphTag ()
    {
    }

    /**
     * Return the set of names handled by this tag.
     * @return The names to be matched that create tags of this type.
     */
    public String[] getIds ()
    {
        return (mIds);
    }
    
    /**
     * Return the set of tag names that cause this tag to finish.
     * @return The names of following tags that stop further scanning.
     */
    public String[] getEnders ()
    {
        return (mEnders);
    }

    /**
     * Return the set of end tag names that cause this tag to finish.
     * @return The names of following end tags that stop further scanning.
     */
    public String[] getEndTagEnders ()
    {
        return (mEndTagEnders);
    }
}

--- NEW FILE: DefinitionListBullet.java ---
// HTMLParser Library $Name:  $ - A java-based parser for HTML
// http://sourceforge.org/projects/htmlparser
// Copyright (C) 2004 Somik Raha
//
// Revision Control Information
//
// $Source: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/DefinitionListBullet.java,v $
// $Author: ian_macfarlane $
// $Date: 2005/10/31 16:26:11 $
// $Revision: 1.1 $
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//

package org.htmlparser.tags;

/**
 * A definition list bullet tag (either DD or DT).
 */
public class DefinitionListBullet extends CompositeTag
{
    /**
     * The set of names handled by this tag.
     */
    private static final String[] mIds = new String[] {"DD", "DT"};

    /**
     * The set of end tag names that indicate the end of this tag.
     */
    private static final String[] mEndTagEnders = new String[] {"DL", "BODY", "HTML"};

    /**
     * Create a new bullet tag.
     */
    public DefinitionListBullet ()
    {
    }

    /**
     * Return the set of names handled by this tag.
     * @return The names to be matched that create tags of this type.
     */
    public String[] getIds ()
    {
        return (mIds);
    }

    /**
     * Return the set of tag names that cause this tag to finish.
     * @return The names of following tags that stop further scanning.
     */
    public String[] getEnders ()
    {
        return (mIds);
    }

    /**
     * Return the set of end tag names that cause this tag to finish.
     * @return The names of following end tags that stop further scanning.
     */
    public String[] getEndTagEnders ()
    {
        return (mEndTagEnders);
    }
}

--- NEW FILE: DefinitionList.java ---
// HTMLParser Library $Name:  $ - A java-based parser for HTML
// http://sourceforge.org/projects/htmlparser
// Copyright (C) 2004 Somik Raha
//
// Revision Control Information
//
// $Source: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/DefinitionList.java,v $
// $Author: ian_macfarlane $
// $Date: 2005/10/31 16:26:11 $
// $Revision: 1.1 $
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//

package org.htmlparser.tags;

/**
 * A definition list tag (dl).
 */
public class DefinitionList extends CompositeTag
{
    /**
     * The set of names handled by this tag.
     */
    private static final String[] mIds = new String[] {"DL"};

    /**
     * The set of end tag names that indicate the end of this tag.
     */
    private static final String[] mEndTagEnders = new String[] {"BODY", "HTML"};

    /**
     * Create a new bullet list (ordered or unordered) tag.
     */
    public DefinitionList ()
    {
    }

    /**
     * Return the set of names handled by this tag.
     * @return The names to be matched that create tags of this type.
     */
    public String[] getIds ()
    {
        return (mIds);
    }

    /**
     * Return the set of end tag names that cause this tag to finish.
     * @return The names of following end tags that stop further scanning.
     */
    public String[] getEndTagEnders ()
    {
        return (mEndTagEnders);
    }
}

Index: TableHeader.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/TableHeader.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TableHeader.java	31 Jul 2004 16:42:34 -0000	1.2
--- TableHeader.java	31 Oct 2005 16:26:11 -0000	1.3
***************
*** 1,82 ****
! // HTMLParser Library $Name$ - A java-based parser for HTML
! // http://sourceforge.org/projects/htmlparser
! // Copyright (C) 2004 Pim Schrama
! //
! // Revision Control Information
! //
! // $Source$
! // $Author$
! // $Date$
! // $Revision$
! //
! // This library is free software; you can redistribute it and/or
! // modify it under the terms of the GNU Lesser General Public
! // License as published by the Free Software Foundation; either
! // version 2.1 of the License, or (at your option) any later version.
! //
! // This library is distributed in the hope that it will be useful,
! // but WITHOUT ANY WARRANTY; without even the implied warranty of
! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! // Lesser General Public License for more details.
! //
! // You should have received a copy of the GNU Lesser General Public
! // License along with this library; if not, write to the Free Software
! // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! //
! 
! package org.htmlparser.tags;
! 
! /**
!  * A table header tag.
!  */
! public class TableHeader extends CompositeTag
! {
!     /**
!      * The set of names handled by this tag.
!      */
!     private static final String[] mIds = new String[] {"TH"};
! 
!     /**
!      * The set of tag names that indicate the end of this tag.
!      */
!     private static final String[] mEnders = new String[] {"TH", "TR"};
! 
!     /**
!      * The set of end tag names that indicate the end of this tag.
!      */
!     private static final String[] mEndTagEnders = new String[] {"TR", "TABLE"};
! 
!     /**
!      * Create a new table header tag.
!      */
!     public TableHeader ()
!     {
!     }
! 
!     /**
!      * Return the set of names handled by this tag.
!      * @return The names to be matched that create tags of this type.
!      */
!     public String[] getIds ()
!     {
!         return (mIds);
!     }
! 
!     /**
!      * Return the set of tag names that cause this tag to finish.
!      * @return The names of following tags that stop further scanning.
!      */
!     public String[] getEnders ()
!     {
!         return (mEnders);
!     }
! 
!     /**
!      * Return the set of end tag names that cause this tag to finish.
!      * @return The names of following end tags that stop further scanning.
!      */
!     public String[] getEndTagEnders ()
!     {
!         return (mEndTagEnders);
!     }
! }
--- 1,84 ----
! // HTMLParser Library $Name$ - A java-based parser for HTML
! // http://sourceforge.org/projects/htmlparser
! // Copyright (C) 2004 Pim Schrama
! //
! // Revision Control Information
! //
! // $Source$
! // $Author$
! // $Date$
! // $Revision$
! //
! // This library is free software; you can redistribute it and/or
! // modify it under the terms of the GNU Lesser General Public
! // License as published by the Free Software Foundation; either
! // version 2.1 of the License, or (at your option) any later version.
! //
! // This library is distributed in the hope that it will be useful,
! // but WITHOUT ANY WARRANTY; without even the implied warranty of
! // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
! // Lesser General Public License for more details.
! //
! // You should have received a copy of the GNU Lesser General Public
! // License along with this library; if not, write to the Free Software
! // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
! //
! 
! package org.htmlparser.tags;
! 
! /**
! 
!  * A table header tag.
! 
!  */
! public class TableHeader extends CompositeTag
! {
!     /**
!      * The set of names handled by this tag.
!      */
!     private static final String[] mIds = new String[] {"TH"};
! 
!     /**
!      * The set of tag names that indicate the end of this tag.
!      */
!     private static final String[] mEnders = new String[] {"TH", "TR", "TBODY", "TFOOT", "THEAD"};
! 
!     /**
!      * The set of end tag names that indicate the end of this tag.
!      */
!     private static final String[] mEndTagEnders = new String[] {"TR", "TBODY", "TFOOT", "THEAD", "TABLE"};
! 
!     /**
!      * Create a new table header tag.
!      */
!     public TableHeader ()
!     {
!     }
! 
!     /**
!      * Return the set of names handled by this tag.
!      * @return The names to be matched that create tags of this type.
!      */
!     public String[] getIds ()
!     {
!         return (mIds);
!     }
! 
!     /**
!      * Return the set of tag names that cause this tag to finish.
!      * @return The names of following tags that stop further scanning.
!      */
!     public String[] getEnders ()
!     {
!         return (mEnders);
!     }
! 
!     /**
!      * Return the set of end tag names that cause this tag to finish.
!      * @return The names of following end tags that stop further scanning.
!      */
!     public String[] getEndTagEnders ()
!     {
!         return (mEndTagEnders);
!     }
! }

Index: TableColumn.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/TableColumn.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** TableColumn.java	31 Jul 2004 16:42:34 -0000	1.37
--- TableColumn.java	31 Oct 2005 16:26:11 -0000	1.38
***************
*** 40,49 ****
       * The set of tag names that indicate the end of this tag.
       */
!     private static final String[] mEnders = new String[] {"TD", "TR"};
  
      /**
       * The set of end tag names that indicate the end of this tag.
       */
!     private static final String[] mEndTagEnders = new String[] {"TR", "TABLE"};
  
      /**
--- 40,49 ----
       * The set of tag names that indicate the end of this tag.
       */
!     private static final String[] mEnders = new String[] {"TD", "TR", "TBODY", "TFOOT", "THEAD"};
  
      /**
       * The set of end tag names that indicate the end of this tag.
       */
!     private static final String[] mEndTagEnders = new String[] {"TR", "TBODY", "TFOOT", "THEAD", "TABLE"};
  
      /**

Index: TableRow.java
===================================================================
RCS file: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/TableRow.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** TableRow.java	10 Apr 2005 23:20:45 -0000	1.42
--- TableRow.java	31 Oct 2005 16:26:11 -0000	1.43
***************
*** 45,53 ****
       */
      private static final String[] mIds = new String[] {"TR"};
! 
      /**
       * The set of end tag names that indicate the end of this tag.
       */
!     private static final String[] mEndTagEnders = new String[] {"TABLE"};
  
      /**
--- 45,58 ----
       */
      private static final String[] mIds = new String[] {"TR"};
!     
!     /**
!      * The set of tag names that indicate the end of this tag.
!      */
!     private static final String[] mEnders = new String[] {"TBODY", "TFOOT", "THEAD"};
!     
      /**
       * The set of end tag names that indicate the end of this tag.
       */
!     private static final String[] mEndTagEnders = new String[] {"TBODY", "TFOOT", "THEAD", "TABLE"};
  
      /**
***************
*** 73,77 ****
      public String[] getEnders ()
      {
!         return (mIds);
      }
  
--- 78,82 ----
      public String[] getEnders ()
      {
!         return (mEnders);
      }
  

--- NEW FILE: HeadingTag.java ---
// HTMLParser Library $Name:  $ - A java-based parser for HTML
// http://sourceforge.org/projects/htmlparser
// Copyright (C) 2004 Somik Raha
//
// Revision Control Information
//
// $Source: /cvsroot/htmlparser/htmlparser/src/org/htmlparser/tags/HeadingTag.java,v $
// $Author: ian_macfarlane $
// $Date: 2005/10/31 16:26:11 $
// $Revision: 1.1 $
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
// License as published by the Free Software Foundation; either
// version 2.1 of the License, or (at your option) any later version.
//
// This library is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
// Lesser General Public License for more details.
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//

package org.htmlparser.tags;

/**
 * A heading (h1 - h6) tag.
 */
public class HeadingTag extends CompositeTag
{
    /**
     * The set of names handled by this tag.
     */
    private static final String[] mIds = new String[] {"H1", "H2", "H3", "H4", "H5", "H6"};

    /**
     * The set of tag names that indicate the end of this tag.
     */
    private static final String[] mEnders = new String[] {"H1", "H2", "H3", "H4", "H5", "H6", "PARAM"};
    
    /**
     * The set of end tag names that indicate the end of this tag.
     */
    private static final String[] mEndTagEnders = new String[] {"BODY", "HTML"};

    /**
     * Create a new heading tag.
     */
    public HeadingTag()
    {
    }

    /**
     * Return the set of names handled by this tag.
     * @return The names to be matched that create tags of this type.
     */
    public String[] getIds ()
    {
        return (mIds);
    }
    
    /**
     * Return the set of tag names that cause this tag to finish.
     * @return The names of following tags that stop further scanning.
     */
    public String[] getEnders ()
    {
        return (mEnders);
    }

    /**
     * Return the set of end tag names that cause this tag to finish.
     * @return The names of following end tags that stop further scanning.
     */
    public String[] getEndTagEnders ()
    {
        return (mEndTagEnders);
    }
}