2003-06-17 Michael Koch <konqueror@gmx.de>

	* java/util/Locale.java
	(getDisplayLanguage): Made it final.
	(getDisplayCountry): Likewise.
	(getDisplayVariant): Likewise.
	(getDisplayName): Likewise.

From-SVN: r68086

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 45f035acf81b8b1ee921a4199e06fc085ff34b0c..b4173cb469b9a1048a6ea716db591d444acead9e 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-17  Michael Koch  <konqueror@gmx.de>
+
+       * java/util/Locale.java
+       (getDisplayLanguage): Made it final.
+       (getDisplayCountry): Likewise.
+       (getDisplayVariant): Likewise.
+       (getDisplayName): Likewise.
+
 2003-06-17  Michael Koch  <konqueror@gmx.de>
 
        * java/util/PropertyResourceBundle.java:

diff --git a/libjava/java/util/Locale.java b/libjava/java/util/Locale.java
index 22e19384c59c94dbcd03806c849500fdd91bad69..37dea4e69e8210e18e05e134e17a4bc75e5f40dc 100644 (file)
--- a/libjava/java/util/Locale.java
+++ b/libjava/java/util/Locale.java
@@ -520,7 +520,7 @@ public final class Locale implements Serializable, Cloneable
    * @return the language name of this locale localized to the default locale,
    *         with the ISO code as backup
    */
-  public String getDisplayLanguage()
+  public final String getDisplayLanguage()
   {
     return getDisplayLanguage(defaultLocale);
   }
@@ -558,7 +558,7 @@ public final class Locale implements Serializable, Cloneable
    * @return the country name of this locale localized to the given locale,
    *         with the ISO code as backup
    */
-  public String getDisplayCountry()
+  public final String getDisplayCountry()
   {
     return getDisplayCountry(defaultLocale);
   }
@@ -596,7 +596,7 @@ public final class Locale implements Serializable, Cloneable
    * @return the variant code of this locale localized to the given locale,
    *         with the ISO code as backup
    */
-  public String getDisplayVariant()
+  public final String getDisplayVariant()
   {
     return getDisplayVariant(defaultLocale);
   }
@@ -635,7 +635,7 @@ public final class Locale implements Serializable, Cloneable
    *
    * @return String version of this locale, suitable for display to the user
    */
-  public String getDisplayName()
+  public final String getDisplayName()
   {
     return getDisplayName(defaultLocale);
   }