From a17c9f2ea1ecec71169eff40c591ca3bf8307a32 Mon Sep 17 00:00:00 2001
From: Michael Koch
Date: Tue, 20 Apr 2004 14:45:10 +0000
Subject: MarshalledObject.java, [...]: Fixed javadoc, coding style and
argument names all over.
2004-04-20 Michael Koch
* java/rmi/MarshalledObject.java,
java/rmi/Naming.java,
java/rmi/RemoteException.java,
java/rmi/activation/ActivationException.java,
java/rmi/server/ServerCloneException.java,
java/security/AccessController.java,
java/security/AlgorithmParameterGenerator.java,
java/security/AlgorithmParameters.java,
java/security/CodeSource.java,
java/security/Identity.java,
java/security/IdentityScope.java,
java/security/KeyPairGenerator.java,
java/security/KeyStore.java,
java/security/Security.java,
java/security/Signature.java,
java/security/SignatureSpi.java,
java/security/SignedObject.java,
java/security/spec/DSAParameterSpec.java,
java/security/spec/DSAPrivateKeySpec.java,
java/security/spec/DSAPublicKeySpec.java,
java/sql/Array.java,
java/sql/DatabaseMetaData.java,
java/sql/ResultSet.java,
java/text/ChoiceFormat.java,
java/text/CollationElementIterator.java,
java/text/CollationKey.java,
java/text/Collator.java,
java/text/DateFormat.java,
java/text/DateFormatSymbols.java,
java/text/DecimalFormatSymbols.java,
java/text/Format.java,
java/text/ParsePosition.java,
java/text/RuleBasedCollator.java,
java/text/SimpleDateFormat.java,
java/text/StringCharacterIterator.java,
java/util/Collections.java,
java/util/PropertyResourceBundle.java,
java/util/ResourceBundle.java,
java/util/StringTokenizer.java,
java/util/jar/Attributes.java,
java/util/logging/ConsoleHandler.java,
java/util/logging/LogManager.java,
java/util/logging/MemoryHandler.java,
java/util/logging/SocketHandler.java,
javax/naming/NamingException.java:
Fixed javadoc, coding style and argument names all over.
From-SVN: r80906
---
libjava/java/util/ResourceBundle.java | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
(limited to 'libjava/java/util/ResourceBundle.java')
diff --git a/libjava/java/util/ResourceBundle.java b/libjava/java/util/ResourceBundle.java
index 7a4a282..6663bd4 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.
*
* 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
* Locale.getDefault()
).
*
@@ -251,18 +251,22 @@ public abstract class ResourceBundle
*
*
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:
+ * locale, and the suffix 2 means the string from the default locale:
+ *
+ *
* - baseName + "_" + language1 + "_" + country1 + "_" + variant1
* - baseName + "_" + language1 + "_" + country1
* - baseName + "_" + language1
* - baseName + "_" + language2 + "_" + country2 + "_" + variant2
* - baseName + "_" + language2 + "_" + country2
- * - baseName + "_" + language2
-
+ *
- baseName + "_" + language2
* - baseName
*
*
* 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:
+ *
+ *
* - First, an attempt is made to load a class in the specified classloader
* which is a subclass of ResourceBundle, and which has a public constructor
* with no arguments, via reflection.
@@ -277,7 +281,7 @@ public abstract class ResourceBundle
* in the above sequence are tested in a similar manner, and if any results
* in a resource bundle, it is assigned as the parent of the first bundle
* using the 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:
+ * resource bundles from the following sources:
+ *
+ *
* - Locale("fr", "CH"): result MyResources_fr_CH.class, parent
* MyResources_fr.properties, parent MyResources.class
* - Locale("fr", "FR"): result MyResources_fr.properties, parent
@@ -301,8 +307,9 @@ public abstract class ResourceBundle
*
- Locale("es", "ES"): result MyResources_es_ES.class, parent
* MyResources.class
*
- * The file MyResources_fr_CH.properties is never used because it is hidden
- * by MyResources_fr_CH.class.
+ *
+ * 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
--
cgit v1.1