From: Yoshito Umaoka <y.umaoka@gmail.com>
Date: Mon, 26 Sep 2016 14:21:59 +0000 (+0000)
Subject: ICU-12748 Removed @Override from a couple of methods added after Java 6.
X-Git-Tag: milestone-59-0-1~132
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bea0b2961d0484e9fe7eb13110f41aae4513d59e;p=icu

ICU-12748 Removed @Override from a couple of methods added after Java 6.

X-SVN-Rev: 39347
---

diff --git a/icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/util/CurrencyNameProviderICU.java b/icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/util/CurrencyNameProviderICU.java
index d684968f111..b359dbc84ee 100644
--- a/icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/util/CurrencyNameProviderICU.java
+++ b/icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/util/CurrencyNameProviderICU.java
@@ -26,7 +26,8 @@ public class CurrencyNameProviderICU extends CurrencyNameProvider {
         return sym;
     }
 
-    @Override
+    // Not available in Java 6
+    // @Override
     public String getDisplayName(String currencyCode, Locale locale) {
         CurrencyDisplayNames curDispNames = CurrencyDisplayNames.getInstance(ICULocaleServiceProvider.toULocaleNoSpecialVariant(locale));
         String name = curDispNames.getName(currencyCode);
@@ -36,6 +37,7 @@ public class CurrencyNameProviderICU extends CurrencyNameProvider {
         return name;
     }
 
+    @Override
     public Locale[] getAvailableLocales() {
         return ICULocaleServiceProvider.getAvailableLocales();
     }
diff --git a/icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/util/LocaleNameProviderICU.java b/icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/util/LocaleNameProviderICU.java
index ffa44788704..d25854eae0a 100644
--- a/icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/util/LocaleNameProviderICU.java
+++ b/icu4j/main/classes/localespi/src/com/ibm/icu/impl/javaspi/util/LocaleNameProviderICU.java
@@ -39,7 +39,8 @@ public class LocaleNameProviderICU extends LocaleNameProvider {
         return disp;
     }
 
-    @Override
+    // Not available in Java 6
+    // @Override
     public String getDisplayScript(String scriptCode, Locale locale) {
         scriptCode = AsciiUtil.toTitleString(scriptCode);
         String disp = LocaleDisplayNames.getInstance(ICULocaleServiceProvider.toULocaleNoSpecialVariant(locale))