Imported GNU Classpath 0.19 + gcj-import-20051115.

       * sources.am: Regenerated.
       * Makefile.in: Likewise.
       * scripts/makemake.tcl: Use glob -nocomplain.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@107049 138bc75d-0d04-0410-961f-82ee72b054a4

5 files changed, 25 insertions, 5 deletions

diff --git a/libjava/classpath/javax/swing/text/html/parser/ContentModel.java b/libjava/classpath/javax/swing/text/html/parser/ContentModel.java
index deb7b1602bb..70e9c2acbff 100644
--- a/libjava/classpath/javax/swing/text/html/parser/ContentModel.java
+++ b/libjava/classpath/javax/swing/text/html/parser/ContentModel.java
@@ -95,9 +95,12 @@ public final class ContentModel
    */
   public int type;
 
-  /** Create a content model initializing all fields to default values. */
+  /**
+   * Create a content model initializing all fields to default values.
+   */
   public ContentModel()
   {
+    // Nothing to do here.
   }
 
   /**
diff --git a/libjava/classpath/javax/swing/text/html/parser/DTD.java b/libjava/classpath/javax/swing/text/html/parser/DTD.java
index f17ca011ea0..16bc5b0d6af 100644
--- a/libjava/classpath/javax/swing/text/html/parser/DTD.java
+++ b/libjava/classpath/javax/swing/text/html/parser/DTD.java
@@ -81,8 +81,9 @@ public class DTD
 {
   /**
    * The version of the persistent data format.
+   * @specnote This was made <code>final</code> in 1.5.
    */
-  public static int FILE_VERSION = 1;
+  public static final int FILE_VERSION = 1;
 
   /**
    * The table of existing available DTDs.
@@ -590,8 +591,7 @@ public class DTD
    * @param name the name of the entity
    * @param type the type of the entity, a bitwise combination
    * of GENERAL, PARAMETER, SYSTEM and PUBLIC.
-   * @throws an error if the parameter is both GENERAL and PARAMETER
-   * of both PUBLIC and SYSTEM.
+   *
    * @return the created entity
    */
   private Entity newEntity(String name, int type)
diff --git a/libjava/classpath/javax/swing/text/html/parser/DocumentParser.java b/libjava/classpath/javax/swing/text/html/parser/DocumentParser.java
index 164297f1882..062606d17ba 100644
--- a/libjava/classpath/javax/swing/text/html/parser/DocumentParser.java
+++ b/libjava/classpath/javax/swing/text/html/parser/DocumentParser.java
@@ -168,6 +168,7 @@ public class DocumentParser
    * specific packages, write your own DTD or obtain the working instance
    * of parser in other way, for example, by calling
    * {@link javax.swing.text.html.HTMLEditorKit#getParser()}.
+   *
    * @param a_dtd a DTD to use.
    */
   public DocumentParser(DTD a_dtd)
@@ -212,6 +213,7 @@ public class DocumentParser
    */
   protected void handleComment(char[] comment)
   {
+    // This default implementation does nothing.
   }
 
   /**
@@ -224,6 +226,7 @@ public class DocumentParser
   protected void handleEmptyTag(TagElement tag)
                          throws javax.swing.text.ChangedCharSetException
   {
+    // This default implementation does nothing.
   }
 
   /**
@@ -234,11 +237,13 @@ public class DocumentParser
    */
   protected void handleEndTag(TagElement tag)
   {
+    // This default implementation does nothing.
   }
 
   /* Handle error that has occured in the given line. */
   protected void handleError(int line, String message)
   {
+    // This default implementation does nothing.
   }
 
   /**
@@ -249,6 +254,7 @@ public class DocumentParser
    */
   protected void handleStartTag(TagElement tag)
   {
+    // This default implementation does nothing.
   }
 
   /**
@@ -257,5 +263,6 @@ public class DocumentParser
    */
   protected void handleText(char[] text)
   {
+    // This default implementation does nothing.
   }
 }
diff --git a/libjava/classpath/javax/swing/text/html/parser/Element.java b/libjava/classpath/javax/swing/text/html/parser/Element.java
index 098983c6923..c07c07f5426 100644
--- a/libjava/classpath/javax/swing/text/html/parser/Element.java
+++ b/libjava/classpath/javax/swing/text/html/parser/Element.java
@@ -148,10 +148,10 @@ public final class Element
   /**
    * The default constructor must have package level access in this
    * class. Use DTD.defineElement(..) to create an element when required.
-   * @todo MAKE THIS PACKAGE in the final version. Now the Parser needs it!
    */
   Element()
   {
+    // Nothing to do here.
   }
 
   /**
diff --git a/libjava/classpath/javax/swing/text/html/parser/Parser.java b/libjava/classpath/javax/swing/text/html/parser/Parser.java
index 7ff6853da82..a88e9ce1953 100644
--- a/libjava/classpath/javax/swing/text/html/parser/Parser.java
+++ b/libjava/classpath/javax/swing/text/html/parser/Parser.java
@@ -256,6 +256,7 @@ public class Parser
    */
   protected void endTag(boolean omitted)
   {
+    // This default implementation does nothing.
   }
 
   /**
@@ -310,6 +311,7 @@ public class Parser
    */
   protected void handleComment(char[] comment)
   {
+    // This default implementation does nothing.
   }
 
   /**
@@ -333,6 +335,7 @@ public class Parser
   protected void handleEmptyTag(TagElement tag)
     throws ChangedCharSetException
   {
+    // This default implementation does nothing.
   }
 
   /**
@@ -343,11 +346,13 @@ public class Parser
    */
   protected void handleEndTag(TagElement tag)
   {
+    // This default implementation does nothing.
   }
 
   /* Handle error that has occured in the given line. */
   protected void handleError(int line, String message)
   {
+    // This default implementation does nothing.
   }
 
   /**
@@ -358,6 +363,7 @@ public class Parser
    */
   protected void handleStartTag(TagElement tag)
   {
+    // This default implementation does nothing.
   }
 
   /**
@@ -376,6 +382,7 @@ public class Parser
    */
   protected void handleText(char[] text)
   {
+    // This default implementation does nothing.
   }
 
   /**
@@ -387,6 +394,7 @@ public class Parser
    */
   protected void handleTitle(char[] title)
   {
+    // This default implementation does nothing.
   }
 
   /**
@@ -420,6 +428,7 @@ public class Parser
    */
   protected void markFirstTime(Element element)
   {
+    // This default implementation does nothing.
   }
 
   /**
@@ -432,5 +441,6 @@ public class Parser
   protected void startTag(TagElement tag)
     throws ChangedCharSetException
   {
+    // This default implementation does nothing.
   }
 }