Imported Classpath 0.18.

	* sources.am, Makefile.in: Updated.
	* Makefile.am (nat_source_files): Removed natProxy.cc.
	* java/lang/reflect/natProxy.cc: Removed.
	* gnu/classpath/jdwp/VMFrame.java,
	gnu/classpath/jdwp/VMIdManager.java,
	gnu/classpath/jdwp/VMVirtualMachine.java,
	java/lang/reflect/VMProxy.java: New files.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC
	list.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/java/net/DefaultContentHandlerFactory.java (getContent):
	Remove ClasspathToolkit references.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gnu/awt/xlib/XCanvasPeer.java: Add new peer methods.
	* gnu/awt/xlib/XFramePeer.java: Likewise.
	* gnu/awt/xlib/XGraphicsConfiguration.java: Likewise.

2005-09-23  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c.  Add
	classpath/native/jawt/jawt.c.
	* Makefile.in: Regenerate.
	* jawt.c: Remove file.
	* include/Makefile.am (tool_include__HEADERS): Remove jawt.h and
	jawt_md.h.  Add ../classpath/include/jawt.h and
	../classpath/include/jawt_md.h.
	* include/Makefile.in: Regenerate.
	* include/jawt.h: Regenerate.
	* include/jawt_md.h: Regenerate.


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

7 files changed, 27 insertions, 23 deletions

diff --git a/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java b/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
index 7ae78ec0725..c0182fe6ac9 100644
--- a/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
+++ b/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
@@ -38,6 +38,7 @@ exception statement from your version. */
 
 package javax.swing.text.html;
 
+import java.io.IOException;
 import java.io.Reader;
 import java.io.Serializable;
 
@@ -75,7 +76,7 @@ public class HTMLEditorKit
     public abstract void parse(Reader reader, ParserCallback callback,
                                boolean ignoreCharSet
                               )
-                        throws java.io.IOException;
+                        throws IOException;
   }
 
   /**
@@ -123,8 +124,8 @@ public class HTMLEditorKit
      * The method is called when the HTML closing tag ((like </table>)
      * is found or if the parser concludes that the one should be present
      * in the current position.
-     * @param The tag being handled
-     * @position the tag position in the text being parsed.
+     * @param tag The tag being handled
+     * @param position the tag position in the text being parsed.
      */
     public void handleEndTag(HTML.Tag tag, int position)
     {
diff --git a/libjava/classpath/javax/swing/text/html/parser/DTD.java b/libjava/classpath/javax/swing/text/html/parser/DTD.java
index 63d03eaccf0..f17ca011ea0 100644
--- a/libjava/classpath/javax/swing/text/html/parser/DTD.java
+++ b/libjava/classpath/javax/swing/text/html/parser/DTD.java
@@ -62,7 +62,8 @@ import java.util.Vector;
  * <p>
  * If you need more information about SGML DTD documents,
  * the author suggests to read SGML tutorial on
- * {@link http://www.w3.org/TR/WD-html40-970708/intro/sgmltut.html}.
+ * <a href="http://www.w3.org/TR/WD-html40-970708/intro/sgmltut.html"
+ * >http://www.w3.org/TR/WD-html40-970708/intro/sgmltut.html</a>.
  * We also recommend Goldfarb C.F (1991) <i>The SGML Handbook</i>,
  * Oxford University Press, 688 p, ISBN: 0198537379.
  * </p>
@@ -402,7 +403,7 @@ public class DTD
    * placed to the field
    * {@link javax.swing.text.html.parser.AttributeList#next },
    * creating a linked list.
-   * @return
+   * @return The attributes.
    */
   protected AttributeList defAttributeList(String name, int type, int modifier,
                                            String default_value,
@@ -541,7 +542,7 @@ public class DTD
    * The unknown elements are automatically defined and added
    * to the element table.
    * @param elements
-   * @return
+   * @return The bit set.
    */
   private BitSet bitSet(String[] elements)
   {
diff --git a/libjava/classpath/javax/swing/text/html/parser/DTDConstants.java b/libjava/classpath/javax/swing/text/html/parser/DTDConstants.java
index a771264a1ad..75e7afb4db6 100644
--- a/libjava/classpath/javax/swing/text/html/parser/DTDConstants.java
+++ b/libjava/classpath/javax/swing/text/html/parser/DTDConstants.java
@@ -40,14 +40,16 @@ package javax.swing.text.html.parser;
 
 /**
  * <p>This class defines the SGML basic types, used for describing HTML 4.01
- * at {@link http://www.w3.org/TR/html4/types.html }. Not all constants,
+ * at <a href="http://www.w3.org/TR/html4/types.html"
+ * >http://www.w3.org/TR/html4/types.html</a>. Not all constants,
  * defined here, are actually used in HTML 4.01 SGML specification. Some others
  * are defined just as part of the required implementation.
  * </p>
  * <p>
  * If you need more information about SGML DTD documents,
  * the author suggests to read SGML tutorial on
- * {@link http://www.w3.org/TR/WD-html40-970708/intro/sgmltut.html}.
+ * <a href="http://www.w3.org/TR/WD-html40-970708/intro/sgmltut.html"
+ * >http://www.w3.org/TR/WD-html40-970708/intro/sgmltut.html</a>.
  * We also recommend Goldfarb C.F (1991) <i>The SGML Handbook</i>,
  * Oxford University Press, 688 p, ISBN: 0198537379.
  * </p>
diff --git a/libjava/classpath/javax/swing/text/html/parser/DocumentParser.java b/libjava/classpath/javax/swing/text/html/parser/DocumentParser.java
index c706f4d0f0b..164297f1882 100644
--- a/libjava/classpath/javax/swing/text/html/parser/DocumentParser.java
+++ b/libjava/classpath/javax/swing/text/html/parser/DocumentParser.java
@@ -167,7 +167,7 @@ public class DocumentParser
    * to get a default DTD; you must either refer to the implementation -
    * 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() }.
+   * {@link javax.swing.text.html.HTMLEditorKit#getParser()}.
    * @param a_dtd a DTD to use.
    */
   public DocumentParser(DTD a_dtd)
@@ -180,18 +180,18 @@ public class DocumentParser
    * Parses the HTML document, calling methods of the provided
    * callback. This method must be multithread - safe.
    * @param reader The reader to read the HTML document from
-   * @param callback The callback that is notifyed about the presence
+   * @param aCallback The callback that is notifyed about the presence
    * of HTML elements in the document.
    * @param ignoreCharSet If thrue, any charset changes during parsing
    * are ignored.
    * @throws java.io.IOException
    */
-  public void parse(Reader reader, HTMLEditorKit.ParserCallback a_callback,
+  public void parse(Reader reader, HTMLEditorKit.ParserCallback aCallback,
                     boolean ignoreCharSet
                    )
              throws IOException
   {
-    callBack = a_callback;
+    callBack = aCallback;
     gnu.parse(reader);
 
     callBack.handleEndOfLineString(gnu.getEndOfLineSequence());
@@ -230,7 +230,7 @@ public class DocumentParser
    * The method is called when the HTML closing tag ((like &lt;/table&gt;)
    * is found or if the parser concludes that the one should be present
    * in the current position.
-   * @param The tag being handled
+   * @param tag The tag being handled
    */
   protected void handleEndTag(TagElement tag)
   {
@@ -245,7 +245,7 @@ public class DocumentParser
    * The method is called when the HTML opening tag ((like &lt;table&gt;)
    * is found or if the parser concludes that the one should be present
    * in the current position.
-   * @param The tag being handled
+   * @param tag The tag being handled
    */
   protected void handleStartTag(TagElement tag)
   {
diff --git a/libjava/classpath/javax/swing/text/html/parser/Element.java b/libjava/classpath/javax/swing/text/html/parser/Element.java
index f0a0f3303cb..098983c6923 100644
--- a/libjava/classpath/javax/swing/text/html/parser/Element.java
+++ b/libjava/classpath/javax/swing/text/html/parser/Element.java
@@ -225,7 +225,7 @@ public final class Element
 
   /**
    * Get all attributes of this document as an attribute list.
-   * @return
+   * @return The attribute list.
    */
   public AttributeList getAttributes()
   {
diff --git a/libjava/classpath/javax/swing/text/html/parser/Parser.java b/libjava/classpath/javax/swing/text/html/parser/Parser.java
index 5867107cd45..7ff6853da82 100644
--- a/libjava/classpath/javax/swing/text/html/parser/Parser.java
+++ b/libjava/classpath/javax/swing/text/html/parser/Parser.java
@@ -327,7 +327,7 @@ public class Parser
    * Handle the tag with no content, like &lt;br&gt;. The method is
    * called for the elements that, in accordance with the current DTD,
    * has an empty content.
-   * @param The tag being handled.
+   * @param tag The tag being handled.
    * @throws javax.swing.text.ChangedCharSetException
    */
   protected void handleEmptyTag(TagElement tag)
@@ -339,7 +339,7 @@ public class Parser
    * The method is called when the HTML closing tag ((like &lt;/table&gt;)
    * is found or if the parser concludes that the one should be present
    * in the current position.
-   * @param The tag being handled
+   * @param tag The tag being handled
    */
   protected void handleEndTag(TagElement tag)
   {
@@ -354,7 +354,7 @@ public class Parser
    * The method is called when the HTML opening tag ((like &lt;table&gt;)
    * is found or if the parser concludes that the one should be present
    * in the current position.
-   * @param The tag being handled
+   * @param tag The tag being handled
    */
   protected void handleStartTag(TagElement tag)
   {
@@ -383,7 +383,7 @@ public class Parser
    * both title starting and closing tags are already behind.
    * The passed argument contains the concatenation of all
    * title text sections.
-   * @param The title text.
+   * @param title The title text.
    */
   protected void handleTitle(char[] title)
   {
@@ -402,7 +402,7 @@ public class Parser
 
   /**
    * Constructs the tag from the given element.
-   * @param the tag base {@link javax.swing.text.html.parser.Element}
+   * @param element the tag base {@link javax.swing.text.html.parser.Element}
    * @param isSupposed true if the tag is not actually present in the
    * html input, but the parser supposes that it should to occur in
    * the current location.
@@ -427,7 +427,7 @@ public class Parser
    * is found or if the parser concludes that the one should be present
    * in the current position. The method is called immediately before
    * calling the handleStartTag.
-   * @param The tag
+   * @param tag The tag
    */
   protected void startTag(TagElement tag)
     throws ChangedCharSetException
diff --git a/libjava/classpath/javax/swing/text/html/parser/ParserDelegator.java b/libjava/classpath/javax/swing/text/html/parser/ParserDelegator.java
index 4b54e8a486c..e5d2db4df7c 100644
--- a/libjava/classpath/javax/swing/text/html/parser/ParserDelegator.java
+++ b/libjava/classpath/javax/swing/text/html/parser/ParserDelegator.java
@@ -143,7 +143,7 @@ public class ParserDelegator
    * Parses the HTML document, calling methods of the provided
    * callback. This method must be multithread - safe.
    * @param reader The reader to read the HTML document from
-   * @param callback The callback that is notifyed about the presence
+   * @param a_callback The callback that is notifyed about the presence
    * of HTML elements in the document.
    * @param ignoreCharSet If thrue, any charset changes during parsing
    * are ignored.
@@ -191,7 +191,7 @@ public class ParserDelegator
    * all subsequent calls to the parse(...) . If you need to specify
    * your DTD locally, simply {@link javax.swing.text.html.parser.Parser}
    * instead.
-   * @param dtd The DTD that will be used to parse documents by this class.
+   * @param a_dtd The DTD that will be used to parse documents by this class.
    * @param name The name of this DTD.
    * @return No standard is specified on which instance of DTD must be
    * returned by this method, and it is recommended to leave the returned