This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[patch] doc merge from classpath
- From: Andreas Tobler <toa at pop dot agri dot ch>
- To: Java Patches <java-patches at gcc dot gnu dot org>
- Date: Thu, 09 Sep 2004 21:29:56 +0200
- Subject: [patch] doc merge from classpath
Hi all,
I commit the attached patch to main soon.
Contains only doc updates.
Andreas
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.
Index: java/lang/Comparable.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/lang/Comparable.java,v
retrieving revision 1.6
diff -u -r1.6 Comparable.java
--- java/lang/Comparable.java 15 Jun 2002 19:45:31 -0000 1.6
+++ java/lang/Comparable.java 9 Sep 2004 19:26:03 -0000
@@ -52,18 +52,19 @@
*
* <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
*/
Index: java/net/Inet4Address.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/net/Inet4Address.java,v
retrieving revision 1.8
diff -u -r1.8 Inet4Address.java
--- java/net/Inet4Address.java 20 Apr 2004 13:05:09 -0000 1.8
+++ java/net/Inet4Address.java 9 Sep 2004 19:26:03 -0000
@@ -55,6 +55,9 @@
*/
public final class Inet4Address extends InetAddress
{
+ /**
+ * For compatability with Sun's JDK 1.4.2 rev. 5
+ */
static final long serialVersionUID = 3286316764910316507L;
/**
Index: java/security/ProtectionDomain.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/security/ProtectionDomain.java,v
retrieving revision 1.5
diff -u -r1.5 ProtectionDomain.java
--- java/security/ProtectionDomain.java 19 Apr 2003 20:54:55 -0000 1.5
+++ java/security/ProtectionDomain.java 9 Sep 2004 19:26:04 -0000
@@ -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.
Index: java/text/Format.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/text/Format.java,v
retrieving revision 1.13
diff -u -r1.13 Format.java
--- java/text/Format.java 5 May 2004 06:52:56 -0000 1.13
+++ java/text/Format.java 9 Sep 2004 19:26:04 -0000
@@ -60,6 +60,9 @@
*/
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
Index: java/util/Arrays.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/Arrays.java,v
retrieving revision 1.12
diff -u -r1.12 Arrays.java
--- java/util/Arrays.java 29 Aug 2004 20:16:22 -0000 1.12
+++ java/util/Arrays.java 9 Sep 2004 19:26:07 -0000
@@ -1021,7 +1021,7 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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 @@
/**
* 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 @@
* 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 @@
* 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.
*/
Index: java/util/PropertyPermissionCollection.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/util/PropertyPermissionCollection.java,v
retrieving revision 1.1
diff -u -r1.1 PropertyPermissionCollection.java
--- java/util/PropertyPermissionCollection.java 18 Jun 2002 15:39:59 -0000 1.1
+++ java/util/PropertyPermissionCollection.java 9 Sep 2004 19:26:07 -0000
@@ -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 @@
/**
* 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