Index: javax/swing/text/html/HTMLFrameHyperlinkEvent.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/HTMLFrameHyperlinkEvent.java,v retrieving revision 1.1 diff -u -r1.1 HTMLFrameHyperlinkEvent.java --- javax/swing/text/html/HTMLFrameHyperlinkEvent.java 10 Mar 2005 12:10:38 -0000 1.1 +++ javax/swing/text/html/HTMLFrameHyperlinkEvent.java 12 Apr 2005 16:53:32 -0000 @@ -65,8 +65,7 @@ * @param frame - the Frame to display the document in. */ public HTMLFrameHyperlinkEvent(Object source, EventType type, URL url, - Element element, String frame - ) + Element element, String frame) { super(source, type, url, frame, element); target_frame = frame; @@ -81,8 +80,7 @@ * @param frame - the Frame to display the document in. */ public HTMLFrameHyperlinkEvent(Object source, EventType type, URL url, - String frame - ) + String frame) { super(source, type, url, frame); target_frame = frame; @@ -100,8 +98,7 @@ */ public HTMLFrameHyperlinkEvent(Object source, EventType type, URL url, String description, Element element, - String frame - ) + String frame) { super(source, type, url, description, element); target_frame = frame; @@ -117,8 +114,7 @@ * @param frame - the Frame to display the document in. */ public HTMLFrameHyperlinkEvent(Object source, EventType type, URL url, - String description, String frame - ) + String description, String frame) { super(source, type, url, description); target_frame = frame; Index: javax/swing/text/html/parser/AttributeList.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/parser/AttributeList.java,v retrieving revision 1.2 diff -u -r1.2 AttributeList.java --- javax/swing/text/html/parser/AttributeList.java 14 Mar 2005 15:59:08 -0000 1.2 +++ javax/swing/text/html/parser/AttributeList.java 12 Apr 2005 16:53:32 -0000 @@ -42,8 +42,8 @@ import java.io.Serializable; -import java.util.Vector; import java.util.Enumeration; +import java.util.Vector; /** *

@@ -69,11 +69,11 @@ *

* @author Audrius Meskauskas, Lithuania (address@hidden) */ -public class AttributeList +public final class AttributeList implements DTDConstants, Serializable { /** Maps between type names and they string values. */ - private final static gnuStringIntMapper mapper = + private static final gnuStringIntMapper mapper = new gnuStringIntMapper() { protected void create() @@ -97,7 +97,7 @@ }; /** Use serialVersionUID for interoperability. */ - private final static long serialVersionUID = -1361214058742015233L; + private static final long serialVersionUID = -1361214058742015233L; /** * The value of ( = pointer to ) the next attribute in the linked list, Index: javax/swing/text/html/parser/ContentModel.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/parser/ContentModel.java,v retrieving revision 1.1 diff -u -r1.1 ContentModel.java --- javax/swing/text/html/parser/ContentModel.java 10 Mar 2005 12:10:38 -0000 1.1 +++ javax/swing/text/html/parser/ContentModel.java 12 Apr 2005 16:53:33 -0000 @@ -51,8 +51,8 @@ * following way: * 
  * a = new ContentModel('+', A, null); // a reprensents A+
- * b = new ContentModel('&', B, a); // b represents B & A+
- * c = new ContentModel('*', b, null); // c represents ( B & A+) *
+ * b = new ContentModel('&', B, a); // b represents B & A+
+ * c = new ContentModel('*', b, null); // c represents ( B & A+) *
  * d = new ContentModel('|', new ContentModel('*', A, null),
  *          new ContentModel('?', B, null)); // d represents ( A* | B? )
  *
@@ -65,7 +65,7 @@ *
  • A|B both A and B are permitted in any order. * The '|' alone does not permit the repetetive occurence of A or B * (use (A|B)*.
    • - *
  • A&B both A and B must occur once (in any order)
    • + *
  • A&B both A and B must occur once (in any order)
    • * * @author Audrius Meskauskas, Lithuania (address@hidden) */ @@ -73,11 +73,11 @@ implements Serializable { /** Use serialVersionUID for interoperability. */ - private final static long serialVersionUID = -1130825523866321257L; + private static final long serialVersionUID = -1130825523866321257L; /** * The next content model model ( = pointer to the next element of - * the linked list) for the binary expression (',','&' or '|'). Null + * the linked list) for the binary expression (',','&' or '|'). Null * for the last element in the list. */ public ContentModel next; @@ -105,8 +105,8 @@ * Examples: * * a = new ContentModel('+', A, null); // a reprensents A+ - * b = new ContentModel('&', B, a); // b represents B & A+ - * c = new ContentModel('*', b, null); // c represents ( B & A+) * + * b = new ContentModel('&', B, a); // b represents B & A+ + * c = new ContentModel('*', b, null); // c represents ( B & A+) * * d = new ContentModel('|', A, * new ContentModel('?',b, null); * // d represents @@ -130,7 +130,7 @@ /** * Create a content model, involving binary expression of the given type. - * @param a_type The expression operation type ( ',', '|' or '&'). + * @param a_type The expression operation type ( ',', '|' or '&'). * @param a_content The content of the left part of the expression. * @param a_next The content model, representing the right part of the * expression. Index: javax/swing/text/html/parser/DTD.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/parser/DTD.java,v retrieving revision 1.1 diff -u -r1.1 DTD.java --- javax/swing/text/html/parser/DTD.java 10 Mar 2005 12:10:38 -0000 1.1 +++ javax/swing/text/html/parser/DTD.java 12 Apr 2005 16:53:33 -0000 @@ -42,11 +42,8 @@ import java.io.EOFException; import java.io.IOException; import java.io.ObjectInputStream; -import java.io.Serializable; - import java.lang.reflect.Field; import java.lang.reflect.Modifier; - import java.util.BitSet; import java.util.Hashtable; import java.util.StringTokenizer; @@ -79,7 +76,7 @@ * @author Audrius Meskauskas, Lithuania (address@hidden) */ public class DTD - implements DTDConstants, Serializable + implements DTDConstants { /** * The version of the persistent data format. @@ -201,8 +198,7 @@ */ public Element getElement(String element_name) { - Element e = newElement(element_name); - return e; + return newElement(element_name); } /** Index: javax/swing/text/html/parser/DTDConstants.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/parser/DTDConstants.java,v retrieving revision 1.1 diff -u -r1.1 DTDConstants.java --- javax/swing/text/html/parser/DTDConstants.java 10 Mar 2005 12:10:38 -0000 1.1 +++ javax/swing/text/html/parser/DTDConstants.java 12 Apr 2005 16:53:33 -0000 @@ -35,9 +35,8 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ - -package javax.swing.text.html.parser; +package javax.swing.text.html.parser; /** *

    This class defines the SGML basic types, used for describing HTML 4.01 Index: javax/swing/text/html/parser/Element.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/parser/Element.java,v retrieving revision 1.1 diff -u -r1.1 Element.java --- javax/swing/text/html/parser/Element.java 10 Mar 2005 12:10:38 -0000 1.1 +++ javax/swing/text/html/parser/Element.java 12 Apr 2005 16:53:33 -0000 @@ -65,7 +65,7 @@ /** * Package level mapper between type names and they string values. */ - final static gnuStringIntMapper mapper = + static final gnuStringIntMapper mapper = new gnuStringIntMapper() { protected void create() @@ -78,7 +78,7 @@ }; /** Use serialVersionUID for interoperability. */ - private final static long serialVersionUID = -6717939384601675586L; + private static final long serialVersionUID = -6717939384601675586L; /** * The element attributes. Index: javax/swing/text/html/parser/Parser.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/parser/Parser.java,v retrieving revision 1.2 diff -u -r1.2 Parser.java --- javax/swing/text/html/parser/Parser.java 14 Mar 2005 15:59:09 -0000 1.2 +++ javax/swing/text/html/parser/Parser.java 12 Apr 2005 16:53:33 -0000 @@ -1,4 +1,4 @@ -/* Parser.java -- HTML parser. +/* Parser.java -- HTML parser Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -34,12 +34,7 @@ this exception to your version of the library, but you are not obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ - -/* -* FOR DEVELOPERS: To avoid regression, please run the package test -* textsuite/javax.swing.text.html.parser/AllParserTests after your -* modifications. -*/ + package javax.swing.text.html.parser; @@ -49,6 +44,12 @@ import javax.swing.text.ChangedCharSetException; import javax.swing.text.SimpleAttributeSet; +/* + * FOR DEVELOPERS: To avoid regression, please run the package test + * textsuite/javax.swing.text.html.parser/AllParserTests after your + * modifications. + */ + /** *

    A simple error-tolerant HTML parser that uses a DTD document * to access data on the possible tokens, arguments and syntax.

    @@ -159,7 +160,7 @@ } protected final void startTag(TagElement tag) - throws ChangedCharSetException + throws ChangedCharSetException { j.startTag(tag); } @@ -188,7 +189,7 @@ * @throws IOException If the reader throws one. */ public synchronized void parse(Reader reader) - throws IOException + throws IOException { gnu.parse(reader); } @@ -199,7 +200,7 @@ * @throws java.io.IOException */ public String parseDTDMarkup() - throws IOException + throws IOException { return gnu.parseDTDMarkup(); } @@ -211,8 +212,8 @@ * @return true if this is a valid DTD markup declaration. * @throws IOException */ - public boolean parseMarkupDeclarations(StringBuffer strBuff) - throws IOException + protected boolean parseMarkupDeclarations(StringBuffer strBuff) + throws IOException { return gnu.parseMarkupDeclarations(strBuff); } @@ -330,7 +331,7 @@ * @throws javax.swing.text.ChangedCharSetException */ protected void handleEmptyTag(TagElement tag) - throws javax.swing.text.ChangedCharSetException + throws ChangedCharSetException { } @@ -429,7 +430,7 @@ * @param The tag */ protected void startTag(TagElement tag) - throws ChangedCharSetException + throws ChangedCharSetException { } } Index: javax/swing/text/html/parser/ParserDelegator.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/html/parser/ParserDelegator.java,v retrieving revision 1.2 diff -u -r1.2 ParserDelegator.java --- javax/swing/text/html/parser/ParserDelegator.java 10 Mar 2005 12:10:38 -0000 1.2 +++ javax/swing/text/html/parser/ParserDelegator.java 12 Apr 2005 16:53:33 -0000 @@ -1,5 +1,5 @@ /* ParserDelegator.java -- Delegator for ParserDocument. - Copyright (C) 2005 Free Software Foundation, Inc. + Copyright (C) 2005 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -35,7 +35,6 @@ obligated to do so. If you do not wish to do so, delete this exception statement from your version. */ - package javax.swing.text.html.parser; import gnu.javax.swing.text.html.parser.HTML_401F; @@ -65,7 +64,7 @@ private class gnuParser extends gnu.javax.swing.text.html.parser.support.Parser { - private final static long serialVersionUID = 1; + private static final long serialVersionUID = 1; private gnuParser(DTD d) { @@ -121,7 +120,8 @@ /** * Use serialVersionUID for interoperability. */ - private final static long serialVersionUID = -1276686502624777206L; + private static final long serialVersionUID = -1276686502624777206L; + private static DTD dtd = HTML_401F.getInstance(); /** Index: javax/swing/text/rtf/RTFParser.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/rtf/RTFParser.java,v retrieving revision 1.1 diff -u -r1.1 RTFParser.java --- javax/swing/text/rtf/RTFParser.java 4 Mar 2005 14:12:22 -0000 1.1 +++ javax/swing/text/rtf/RTFParser.java 12 Apr 2005 16:53:33 -0000 @@ -41,8 +41,9 @@ import java.io.IOException; import java.io.InputStream; import java.io.Reader; -import javax.swing.text.Document; + import javax.swing.text.BadLocationException; +import javax.swing.text.Document; /** * Parses an RTF file into a address@hidden Document}. The parser utilizes Index: javax/swing/text/rtf/RTFScanner.java =================================================================== RCS file: /cvsroot/classpath/classpath/javax/swing/text/rtf/RTFScanner.java,v retrieving revision 1.1 diff -u -r1.1 RTFScanner.java --- javax/swing/text/rtf/RTFScanner.java 4 Mar 2005 14:12:22 -0000 1.1 +++ javax/swing/text/rtf/RTFScanner.java 12 Apr 2005 16:53:33 -0000 @@ -38,14 +38,12 @@ package javax.swing.text.rtf; -import java.io.BufferedInputStream; import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.io.Reader; - /** * Provides a scanner that scans an address@hidden InputStream} for tokens of the * RTF syntax.