[multiple changes]

2004-09-09  Michael Koch  <konqueror@gmx.de>

	* java/security/ProtectionDomain.java,
	* java/util/PropertyPermissionCollection.java:
	Fixed javadocs all over.

2004-09-09  Sven de Marothy  <sven@physto.se>

	Patch from David Gilbert <david.gilbert@object-refinery.com>
	* java/lang/Comparable.java: Fixed documentation errors.
	* java/util/Arrays.java: Likewise.

2004-09-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>

	* java/net/Inet4Address.java
	(Inet4Address): Added comment to serialization UID.
	* java/text/Format.java
	(Format): Added comment to serialization UID.

From-SVN: r87248

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index c9e72fe91a6b5b8aba4d0766a0fed94cde600a23..38c1ac28dad75d70821badb0d5b437b5187041d0 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,22 @@
+2004-09-09  Michael Koch  <konqueror@gmx.de>
+
+       * java/security/ProtectionDomain.java,
+       * java/util/PropertyPermissionCollection.java:
+       Fixed javadocs all over.
+
+2004-09-09  Sven de Marothy  <sven@physto.se>
+
+       Patch from David Gilbert <david.gilbert@object-refinery.com>
+       * java/lang/Comparable.java: Fixed documentation errors.
+       * java/util/Arrays.java: Likewise.
+
+2004-09-09  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+       * java/net/Inet4Address.java
+       (Inet4Address): Added comment to serialization UID.
+       * java/text/Format.java
+       (Format): Added comment to serialization UID.
+
 2004-09-09  Michael Koch  <konqueror@gmx.de>
 
        * java/lang/System.java

diff --git a/libjava/java/lang/Comparable.java b/libjava/java/lang/Comparable.java
index 96d4d6ac57a264c0cf02e386d881167b4b312d60..bfe72dbcb11f28b9e4d00fd2585d25f47cc995da 100644 (file)
--- a/libjava/java/lang/Comparable.java
+++ b/libjava/java/lang/Comparable.java
@@ -52,18 +52,19 @@ package java.lang;
  *
  * <p>Lists, arrays, and sets of objects that implement this interface can
  * be sorted automatically, without the need for an explicit
- * {@link Comparator}. Note that <code>e1.compareTo(null)</code> should
- * throw an Exception; as should comparison between incompatible classes.
+ * {@link java.util.Comparator}. Note that <code>e1.compareTo(null)</code> 
+ * should throw an Exception; as should comparison between incompatible 
+ * classes.
  *
  * @author Geoff Berry
  * @author Warren Levy <warrenl@cygnus.com>
- * @see Comparator
- * @see Collections#sort(List)
- * @see Arrays#sort(Object[])
- * @see SortedSet
- * @see SortedMap
- * @see TreeSet
- * @see TreeMap
+ * @see java.util.Comparator
+ * @see java.util.Collections#sort(java.util.List)
+ * @see java.util.Arrays#sort(Object[])
+ * @see java.util.SortedSet
+ * @see java.util.SortedMap
+ * @see java.util.TreeSet
+ * @see java.util.TreeMap
  * @since 1.2
  * @status updated to 1.4
  */

diff --git a/libjava/java/net/Inet4Address.java b/libjava/java/net/Inet4Address.java
index 0a583efc9c6de0bd8fe52308f5194a59c7d1f7d0..25629c85555169312c2ff74f18b8ff1011609305 100644 (file)
--- a/libjava/java/net/Inet4Address.java
+++ b/libjava/java/net/Inet4Address.java
@@ -55,6 +55,9 @@ import java.util.Arrays;
  */
 public final class Inet4Address extends InetAddress
 {
+  /**
+   * For compatability with Sun's JDK 1.4.2 rev. 5
+   */
   static final long serialVersionUID = 3286316764910316507L;
 
   /**

diff --git a/libjava/java/security/ProtectionDomain.java b/libjava/java/security/ProtectionDomain.java
index 21d9b6d09b4689d5ba68f9c57f30b0e63e1ab979..a6db9cd8eac4531e506e6c6ad69e93d60681458d 100644 (file)
--- a/libjava/java/security/ProtectionDomain.java
+++ b/libjava/java/security/ProtectionDomain.java
@@ -1,5 +1,5 @@
 /* ProtectionDomain.java -- A security domain
-   Copyright (C) 1998, 2003, Free Software Foundation, Inc.
+   Copyright (C) 1998, 2003, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 

diff --git a/libjava/java/text/Format.java b/libjava/java/text/Format.java
index 7bc389eb71e936b96501c06213e99d4402d76043..6f15dc04441fe86607594e4e5d97a8d531f70ef3 100644 (file)
--- a/libjava/java/text/Format.java
+++ b/libjava/java/text/Format.java
@@ -60,6 +60,9 @@ import java.io.Serializable;
  */
 public abstract class Format implements Serializable, Cloneable
 {
+  /**
+   * For compatability with Sun's JDK 1.4.2 rev. 5
+   */
   static final long serialVersionUID = -299282585814624189L;
 
   public static class Field extends AttributedCharacterIterator.Attribute

diff --git a/libjava/java/util/Arrays.java b/libjava/java/util/Arrays.java
index e34901a23f1567af64b5fd81578fa8d26ad4a5cf..f2337aee6dcf4c720cda551d5458f385e21f2cfa 100644 (file)
--- a/libjava/java/util/Arrays.java
+++ b/libjava/java/util/Arrays.java
@@ -1021,7 +1021,7 @@ public class Arrays
   /**
    * Performs a recursive modified quicksort.
    *
-   * @param a the array to sort
+   * @param array the array to sort
    * @param from the start index (inclusive)
    * @param count the number of elements to sort
    */
@@ -1185,7 +1185,7 @@ public class Arrays
   /**
    * Performs a recursive modified quicksort.
    *
-   * @param a the array to sort
+   * @param array the array to sort
    * @param from the start index (inclusive)
    * @param count the number of elements to sort
    */
@@ -1349,7 +1349,7 @@ public class Arrays
   /**
    * Performs a recursive modified quicksort.
    *
-   * @param a the array to sort
+   * @param array the array to sort
    * @param from the start index (inclusive)
    * @param count the number of elements to sort
    */
@@ -1525,7 +1525,7 @@ public class Arrays
   /**
    * Performs a recursive modified quicksort.
    *
-   * @param a the array to sort
+   * @param array the array to sort
    * @param from the start index (inclusive)
    * @param count the number of elements to sort
    */
@@ -1701,7 +1701,7 @@ public class Arrays
   /**
    * Performs a recursive modified quicksort.
    *
-   * @param a the array to sort
+   * @param array the array to sort
    * @param from the start index (inclusive)
    * @param count the number of elements to sort
    */
@@ -1867,7 +1867,7 @@ public class Arrays
   /**
    * Performs a recursive modified quicksort.
    *
-   * @param a the array to sort
+   * @param array the array to sort
    * @param from the start index (inclusive)
    * @param count the number of elements to sort
    */
@@ -2037,7 +2037,7 @@ public class Arrays
   /**
    * Performs a recursive modified quicksort.
    *
-   * @param a the array to sort
+   * @param array the array to sort
    * @param from the start index (inclusive)
    * @param count the number of elements to sort
    */
@@ -2418,6 +2418,7 @@ public class Arrays
      * with the supplied element.
      *
      * @param index The index at which to place the new object.
+     * @param element The new object.
      * @return The object replaced by this operation.
      */
     public Object set(int index, Object element)
@@ -2489,7 +2490,7 @@ public class Arrays
      * is shrunk or enlarged to the size of the
      * internal array, and filled with its objects.
      *
-     * @param The array to fill with the objects in this list.
+     * @param array The array to fill with the objects in this list.
      * @return The array containing the objects in this list,
      *         which may or may not be == to array.
      */

diff --git a/libjava/java/util/PropertyPermissionCollection.java b/libjava/java/util/PropertyPermissionCollection.java
index 8f9c71d3e590c8265d63feb42e01f8c7fed9166d..761103495838fc18c0ca9257a0103e18e9fe2ef7 100644 (file)
--- a/libjava/java/util/PropertyPermissionCollection.java
+++ b/libjava/java/util/PropertyPermissionCollection.java
@@ -1,5 +1,5 @@
 /* PropertyPermissionCollection.java -- a collection of PropertyPermissions
-   Copyright (C) 2002 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2004  Free Software Foundation, Inc.
 
 This file is part of GNU Classpath.
 
@@ -103,10 +103,12 @@ class PropertyPermissionCollection extends PermissionCollection
   /**
    * Returns true if this collection implies the given permission. This even
    * returns true for this case:
-   * <p>
-<pre>collection.add(new PropertyPermission("a.*", "read"));
-collection.add(new PropertyPermission("a.b.*", "write"));
-collection.implies(new PropertyPermission("a.b.c", "read,write"));</pre>
+   *
+   * <pre>
+   * collection.add(new PropertyPermission("a.*", "read"));
+   * collection.add(new PropertyPermission("a.b.*", "write"));
+   * collection.implies(new PropertyPermission("a.b.c", "read,write"));
+   * </pre>
    *
    * @param permission the permission to check
    * @return true if it is implied by this