libjava/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        Import GNU Classpath (classpath-0_97_2-release).

        * Regenerate class and header files.
        * Regenerate auto* files.
        * gcj/javaprims.h: Define jobjectRefType.
        * jni.cc (_Jv_JNI_GetObjectRefType): New (stub only).
        (_Jv_JNIFunctions): Initialize GetObjectRefType.
        * gnu/classpath/jdwp/VMVirtualMachine.java,
        java/security/VMSecureRandom.java: Merge from classpath.
        * HACKING: Fix typo.
        * ChangeLog-2007: New file.
        * configure.ac: Set JAVAC, pass --disable-regen-headers to classpath.

libjava/classpath/

2008-06-28  Matthias Klose  <doko@ubuntu.com>

        * m4/ac_prog_javac.m4: Disable check for JAVAC, when
        not configured with --enable-java-maintainer-mode.
        * aclocal.m4, configure: Regenerate.
        * native/jni/gstreamer-peer/Makefile.am: Do not link with
        libclasspathnative.
        * native/jni/gstreamer-peer/Makefile.in: Regenerate.
        * tools/Makefile.am, lib/Makefile.am: Use JAVAC for setting
        JCOMPILER, drop flags not understood by gcj.


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

7 files changed, 22 insertions, 27 deletions

diff --git a/libjava/classpath/gnu/javax/swing/text/html/css/FontSize.java b/libjava/classpath/gnu/javax/swing/text/html/css/FontSize.java
index 2795b678401..203eadc4073 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/css/FontSize.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/css/FontSize.java
@@ -143,7 +143,7 @@ public class FontSize
   {
     int end = value.indexOf("pt");
     String number = value.substring(0, end);
-    int intVal = Integer.parseInt(number);
+    int intVal = (int) Double.parseDouble(number);
     return intVal;
   }
 
@@ -160,7 +160,7 @@ public class FontSize
     String number = value.substring(0, end);
     try
       {
-        int intVal = Integer.parseInt(number);
+        int intVal = (int) Double.parseDouble(number);
         return intVal;
       }
     catch (NumberFormatException ex)
@@ -177,7 +177,7 @@ public class FontSize
     String number = value.substring(0, end);
     try
       {
-        int intVal = Integer.parseInt(number);
+        int intVal = (int) Double.parseDouble(number);
         return intVal * par / 100;
       }
     catch (NumberFormatException ex)
diff --git a/libjava/classpath/gnu/javax/swing/text/html/css/Selector.java b/libjava/classpath/gnu/javax/swing/text/html/css/Selector.java
index 210df3a7b65..6e182a53623 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/css/Selector.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/css/Selector.java
@@ -93,8 +93,6 @@ public class Selector
    * instance, the html tag).
    *
    * @param tags
-   * @param classes
-   * @param ids
    *
    * @return <code>true</code> when this selector matches the element path,
    *         <code>false</code> otherwise
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/models/node.java b/libjava/classpath/gnu/javax/swing/text/html/parser/models/node.java
index c615ddff350..54469b34995 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/models/node.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/models/node.java
@@ -177,7 +177,7 @@ public class node
   /**
    * Do the match operation with the given token. This sets various
    * flags.
-   * @param token The token to match.
+   * @param a_token The token to match.
    * @return true if the the token matches node, false if it does not match
    * or if the node is closed.
    */
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/support/Parser.java b/libjava/classpath/gnu/javax/swing/text/html/parser/support/Parser.java
index c0d1e636e92..e99be3238e9 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/support/Parser.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/support/Parser.java
@@ -216,7 +216,7 @@ public class Parser
            * The tag validator closes all unclosed elements that are required
            * to have the end (closing) tag.
            *
-           * @param element The tag being fictionally (forcibly) closed.
+           * @param tElement The tag being fictionally (forcibly) closed.
            */
           protected void handleSupposedEndTag(Element tElement)
           {
@@ -234,7 +234,7 @@ public class Parser
            * assigned to the empty one, the previous value is
            * restored before return.
            *
-           * @param element The tag being fictionally (forcibly) closed.
+           * @param tElement The tag being fictionally (forcibly) closed.
            */
           protected void handleSupposedStartTag(Element tElement)
           {
@@ -523,8 +523,7 @@ public class Parser
     restOfTag(false, name, start);
 
     buffer.setLength(0);
-
-    script: 
+ 
     while (!SCRIPT_CLOSE.matches(this))
       {
         append(getNextToken());
@@ -606,8 +605,7 @@ public class Parser
     restOfTag(false, name, start);
 
     buffer.setLength(0);
-
-    style: 
+ 
     while (!STYLE_CLOSE.matches(this))
       {
         append(getNextToken());
@@ -742,7 +740,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)
@@ -754,7 +752,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
+   * @param tag The tag
    */
   protected void handleEndTag(TagElement tag)
   {
@@ -769,7 +767,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
+   * @param tag The tag
    */
   protected void handleStartTag(TagElement tag)
   {
@@ -798,7 +796,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)
   {
@@ -868,7 +866,7 @@ public class Parser
   {
     Object value = HTML.NULL_ATTRIBUTE_VALUE;
 
-    Element e = (Element) dtd.elementHash.get(element.toLowerCase());
+    Element e = dtd.elementHash.get(element.toLowerCase());
     if (e != null)
       {
         AttributeList attr = e.getAttribute(attribute);
@@ -1146,7 +1144,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
@@ -1182,7 +1180,7 @@ public class Parser
    * A hooks for operations, preceeding call to handleEmptyTag().
    * Handle the tag with no content, like &lt;br&gt;. As no any
    * nested tags are expected, the tag validator is not involved.
-   * @param The tag being handled.
+   * @param tag The tag being handled.
    */
   private void _handleEmptyTag(TagElement tag)
   {
@@ -1208,7 +1206,7 @@ public class Parser
    * A hooks for operations, preceeding call to handleEndTag().
    * The method is called when the HTML closing tag
    * is found. Calls handleTitle after closing the 'title' tag.
-   * @param The tag
+   * @param tag The tag
    */
   private void _handleEndTag(TagElement tag)
   {
@@ -1254,7 +1252,7 @@ public class Parser
    * The method is called when the HTML opening tag ((like &lt;table&gt;)
    * is found.
    * Package-private to avoid an accessor method.
-   * @param The tag
+   * @param tag The tag
    */
   void _handleStartTag(TagElement tag)
   {
@@ -1328,7 +1326,7 @@ public class Parser
 
   private TagElement makeTagElement(String name, boolean isSupposed)
   {
-    Element e = (Element) dtd.elementHash.get(name.toLowerCase());
+    Element e = dtd.elementHash.get(name.toLowerCase());
     if (e == null)
       {
         error("Unknown tag <" + name + ">");
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.java b/libjava/classpath/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.java
index 0ffc6c8b754..80bb333a528 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/support/low/ReaderTokenizer.java
@@ -240,15 +240,14 @@ public class ReaderTokenizer
   /**
    * Read the given number of the tokens. Add the needed number of EOF
    * tokens if there are no more data in the stream.
-   * @param amount The number of additional tokens to read.
+   * @param numberOfTokens The number of additional tokens to read.
    */
   void read(int numberOfTokens)
      throws IOException
   {
     if (numberOfTokens <= 0)
       return;
-
-    reading: 
+ 
     for (int i = 0; i < numberOfTokens; i++)
       readToken();
   }
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/support/parameterDefaulter.java b/libjava/classpath/gnu/javax/swing/text/html/parser/support/parameterDefaulter.java
index 654acbbb58c..43c07572a14 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/support/parameterDefaulter.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/support/parameterDefaulter.java
@@ -80,7 +80,7 @@ public class parameterDefaulter
     if (atts == null)
       {
         htmlAttributeSet set = new htmlAttributeSet();
-        Element e = (Element) dtd.elementHash.get(element.toLowerCase());
+        Element e = dtd.elementHash.get(element.toLowerCase());
 
         if (e != null)
           {
diff --git a/libjava/classpath/gnu/javax/swing/text/html/parser/support/textPreProcessor.java b/libjava/classpath/gnu/javax/swing/text/html/parser/support/textPreProcessor.java
index 6fd79e2589e..0cb6d7a59f3 100644
--- a/libjava/classpath/gnu/javax/swing/text/html/parser/support/textPreProcessor.java
+++ b/libjava/classpath/gnu/javax/swing/text/html/parser/support/textPreProcessor.java
@@ -109,7 +109,7 @@ public class textPreProcessor
    * \r or \r\n mutate into \n. Tabs are
    * preserved.
    * The content of the passed buffer is destroyed.
-   * @param text
+   * @param a_text
    * @return
    */
   public char[] preprocessPreformatted(StringBuffer a_text)