From ce97e13dedadf5635b96807626bc2d005b9022bc Mon Sep 17 00:00:00 2001
From: mkoch 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.
diff --git a/libjava/java/util/PropertyResourceBundle.java b/libjava/java/util/PropertyResourceBundle.java
index d873e134e62..9d556f2e4b6 100644
--- a/libjava/java/util/PropertyResourceBundle.java
+++ b/libjava/java/util/PropertyResourceBundle.java
@@ -54,7 +54,7 @@ import java.io.InputStream;
*
* 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()
*
diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java
index 7a4a282e773..6663bd4533e 100644
--- a/libjava/java/util/ResourceBundle.java
+++ b/libjava/java/util/ResourceBundle.java
@@ -51,7 +51,7 @@ import gnu.classpath.Configuration;
* getObject or getString on that bundle.
*
* Locale.getDefault()).
*
@@ -251,18 +251,22 @@ public abstract class ResourceBundle
*
*
+ * 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, @@ -286,10 +290,12 @@ public abstract class ResourceBundle * 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 diff --git a/libjava/java/util/StringTokenizer.java b/libjava/java/util/StringTokenizer.java index e7fc6fd00d2..472d8951e5d 100644 --- a/libjava/java/util/StringTokenizer.java +++ b/libjava/java/util/StringTokenizer.java @@ -196,7 +196,7 @@ public class StringTokenizer implements Enumeration /** * This does the same as hasMoreTokens. This is the - *EnumerationEnumeration interface method.
*
* @return true, if the next call of nextElement() will succeed
* @see #hasMoreTokens()
@@ -208,7 +208,7 @@ public class StringTokenizer implements Enumeration
/**
* This does the same as nextTokens. This is the
- * EnumerationEnumeration interface method.
*
* @return the next token with respect to the current delimiter characters
* @throws NoSuchElementException if there are no more tokens
diff --git a/libjava/java/util/jar/Attributes.java b/libjava/java/util/jar/Attributes.java
index ea203446eaa..06dc4f89fc5 100644
--- a/libjava/java/util/jar/Attributes.java
+++ b/libjava/java/util/jar/Attributes.java
@@ -85,17 +85,18 @@ public class Attributes implements Cloneable, Map
* 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 @@ import java.lang.ref.WeakReference;
* {@link #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
* {@link #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 trueif logger was added,
* false otherwise.
*
- * @throws NullPointerException if name is
+ * @throws NullPointerException if name is
* null.
*/
public synchronized boolean addLogger(Logger logger)
diff --git a/libjava/java/util/logging/MemoryHandler.java b/libjava/java/util/logging/MemoryHandler.java
index 825a6fa86d6..3c18b527d18 100644
--- a/libjava/java/util/logging/MemoryHandler.java
+++ b/libjava/java/util/logging/MemoryHandler.java
@@ -35,10 +35,7 @@ module. An independent module is a module which is not derived from
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 @@ package java.util.logging;
* 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 {@link 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 (brawer@acm.org)
diff --git a/libjava/java/util/logging/SocketHandler.java b/libjava/java/util/logging/SocketHandler.java
index d9939a0f780..d4fc6e603c1 100644
--- a/libjava/java/util/logging/SocketHandler.java
+++ b/libjava/java/util/logging/SocketHandler.java
@@ -68,7 +68,7 @@ package java.util.logging;
*
* 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.
--
cgit v1.2.3