Index: java/util/Collections.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/Collections.java,v
retrieving revision 1.27
diff -u -r1.27 Collections.java
--- java/util/Collections.java 20 Feb 2002 23:56:46 -0000 1.27
+++ java/util/Collections.java 17 Apr 2004 19:22:36 -0000
@@ -54,7 +54,7 @@
* are not required, to throw the address@hidden UnsupportedOperationException} that
* the underlying collection would throw during an attempt at modification.
* For example,
- * When a bundle is demanded for a specific locale, the ResourceBundle
- * is searched in following order (def. language stands for the
+ * is searched in following order (def. language stands for the
* two letter ISO language code of the default locale (see
* A sequence of candidate bundle names are generated, and tested in
* this order, where the suffix 1 means the string from the specified
- * locale, and the suffix 2 means the string from the default locale:Collections.singleton("").addAll(Collections.EMPTY_SET)
+ *
and the
* extension Collections.singleton("").addAll(Collections.EMPTY_SET)
* does not throw a exception, even though addAll is an unsupported operation
* on a singleton; the reason for this is that addAll did not attempt to
* modify the set.
Index: java/util/PropertyResourceBundle.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/PropertyResourceBundle.java,v
retrieving revision 1.13
diff -u -r1.13 PropertyResourceBundle.java
--- java/util/PropertyResourceBundle.java 16 Aug 2003 23:44:44 -0000 1.13
+++ java/util/PropertyResourceBundle.java 17 Apr 2004 19:22:36 -0000
@@ -54,7 +54,7 @@
*
* If there is also a class for this resource and the same locale, the
* class will be chosen. The properties file should have the name of the
- * resource bundle, appended with the locale (e.g. _de
_de.properties
. The file should have the same format
* as for Properties.load()
*
Index: java/util/ResourceBundle.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/ResourceBundle.java,v
retrieving revision 1.21
diff -u -r1.21 ResourceBundle.java
--- java/util/ResourceBundle.java 10 Jan 2003 22:35:17 -0000 1.21
+++ java/util/ResourceBundle.java 17 Apr 2004 19:22:37 -0000
@@ -53,7 +53,7 @@
* getObject
or getString
on that bundle.
*
* Locale.getDefault()
).
*
@@ -308,18 +308,22 @@
*
*
+ * locale, and the suffix 2 means the string from the default locale:
In the sequence, entries with an empty string are ignored. Next,
- * getBundle
tries to instantiate the resource bundle:
getBundle
tries to instantiate the resource bundle:
+ *
+ * setParent
method (unless the first bundle already
- * has a parent).
+ * has a parent).
*
* For example, suppose the following class and property files are * provided: MyResources.class, MyResources_fr_CH.properties, @@ -343,10 +347,12 @@ * all files are valid (that is, public non-abstract subclasses of * ResourceBundle with public nullary constructors for the ".class" files, * syntactically correct ".properties" files). The default locale is - * Locale("en", "UK"). + * Locale("en", "UK").
* *Calling getBundle with the shown locale argument values instantiates - * resource bundles from the following sources:
The file MyResources_fr_CH.properties is never used because it is hidden + * by MyResources_fr_CH.class.
* * @param baseName the name of the ResourceBundle * @param locale A locale Index: java/util/StringTokenizer.java =================================================================== RCS file: /cvsroot/classpath/classpath/java/util/StringTokenizer.java,v retrieving revision 1.11 diff -u -r1.11 StringTokenizer.java --- java/util/StringTokenizer.java 25 Mar 2002 07:54:38 -0000 1.11 +++ java/util/StringTokenizer.java 17 Apr 2004 19:22:37 -0000 @@ -196,7 +196,7 @@ /** * This does the same as hasMoreTokens. This is the - *Enumeration
Enumeration interface method.
*
* @return true, if the next call of nextElement() will succeed
* @see #hasMoreTokens()
@@ -208,7 +208,7 @@
/**
* This does the same as nextTokens. This is the
- * Enumeration
Enumeration interface method.
*
* @return the next token with respect to the current delimiter characters
* @throws NoSuchElementException if there are no more tokens
Index: java/util/jar/Attributes.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/jar/Attributes.java,v
retrieving revision 1.8
diff -u -r1.8 Attributes.java
--- java/util/jar/Attributes.java 5 Nov 2002 03:14:30 -0000 1.8
+++ java/util/jar/Attributes.java 17 Apr 2004 19:22:37 -0000
@@ -85,17 +85,18 @@
* attributes, applet attributes, extension identification attributes,
* package versioning and sealing attributes, file contents attributes,
* bean objects attribute and signing attributes. See the
- * - * The characters of a Name must obey the following restrictions: + * + *
The characters of a Name must obey the following restrictions:
+ * *
- * When comparing Names (with equals
) all characters are
+ *
+ *
When comparing Names (with equals
) all characters are
* converted to lowercase. But you can get the original case sensitive
- * string with the toString()
method.
+ * string with the toString()
method.
java.util.logging.ConsoleHandler.encoding
- specifies
* the name of the character encoding. Default value:
- * the default platform encoding.
+ * the default platform encoding.java.util.logging.LogManager
is initialized.
* The configuration process includes the subsequent steps:
*
- * java.util.logging.manager
* is set to the name of a subclass of
* java.util.logging.LogManager
, an instance of
* that subclass is created and becomes the global LogManager.
* Otherwise, a new instance of LogManager is created.LogManager
constructor tries to create
* a new instance of the class specified by the system
* property java.util.logging.config.class
.
@@ -91,14 +90,13 @@
* address@hidden #readConfiguration(java.io.InputStream)}.
* The name and location of this file are specified by the system
* property java.util.logging.config.file
.java.util.logging.config.file
* is not set, however, the contents of the URL
* "{gnu.classpath.home.url}/logging.properties" are passed to
* address@hidden #readConfiguration(java.io.InputStream)}.
* Here, "{gnu.classpath.home.url}" stands for the value of
* the system property gnu.classpath.home.url
.trueif logger
was added,
+ * @return true
if logger
was added,
* false
otherwise.
*
- * @throws NullPointerException if name is
+ * @throws NullPointerException if name
is
* null
.
*/
public synchronized boolean addLogger(Logger logger)
Index: java/util/logging/MemoryHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/MemoryHandler.java,v
retrieving revision 1.3
diff -u -r1.3 MemoryHandler.java
--- java/util/logging/MemoryHandler.java 30 Sep 2002 13:29:03 -0000 1.3
+++ java/util/logging/MemoryHandler.java 17 Apr 2004 19:22:37 -0000
@@ -35,10 +35,7 @@
or based on this library. If you modify this library, you may extend
this exception to your version of the library, but you are not
obligated to do so. If you do not wish to do so, delete this
-exception statement from your version.
-
-*/
-
+exception statement from your version. */
package java.util.logging;
@@ -53,28 +50,22 @@
* value, a default is taken without an exception being thrown.
*
*
- *
* java.util.MemoryHandler.level
- specifies
* the initial severity level threshold. Default value:
* Level.ALL
.
- *
* java.util.MemoryHandler.filter
- specifies
* the name of a Filter class. Default value: No Filter.
- *
* java.util.MemoryHandler.size
- specifies the
* maximum number of log records that are kept in the circular
* buffer. Default value: 1000.
- *
* java.util.MemoryHandler.push
- specifies the
* pushLevel
. Default value:
* Level.SEVERE
.
- *
* java.util.MemoryHandler.target
- specifies the
* name of a subclass of address@hidden Handler} that will be used as the
* target handler. There is no default value for this property;
* if it is not set, the no-argument MemoryHandler constructor
* will throw an exception.
- *
*
*
* @author Sascha Brawer (address@hidden)
Index: java/util/logging/SocketHandler.java
===================================================================
RCS file: /cvsroot/classpath/classpath/java/util/logging/SocketHandler.java,v
retrieving revision 1.2
diff -u -r1.2 SocketHandler.java
--- java/util/logging/SocketHandler.java 17 Sep 2002 12:25:14 -0000 1.2
+++ java/util/logging/SocketHandler.java 17 Apr 2004 19:22:37 -0000
@@ -68,7 +68,7 @@
*
* java.util.SocketHandler.encoding
- specifies
* the name of the character encoding. Default value:
- * the default platform encoding.
+ * the default platform encoding.
*
* java.util.SocketHandler.host
- specifies
* the name of the host to which records are published.