ICU-9857 Adjust for CLDR calendar <fields> move to top of <dates> element (J)

X-SVN-Rev: 33073

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/impl/RelativeDateFormat.java b/icu4j/main/classes/core/src/com/ibm/icu/impl/RelativeDateFormat.java
index 9ba672ea0ecefbe911dd30b723963d0d6ab0ee02..e420987a330faa55ecc14a095f975b3719303986 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/impl/RelativeDateFormat.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/impl/RelativeDateFormat.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 2007-2012, International Business Machines Corporation and    *
+ * Copyright (C) 2007-2013, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -14,6 +14,7 @@ import java.util.MissingResourceException;
 import java.util.Set;
 import java.util.TreeSet;
 
+import com.ibm.icu.impl.ICUResourceBundle;
 import com.ibm.icu.text.DateFormat;
 import com.ibm.icu.text.MessageFormat;
 import com.ibm.icu.text.SimpleDateFormat;
@@ -191,8 +192,8 @@ public class RelativeDateFormat extends DateFormat {
      * Load the Date string array
      */
     private synchronized void loadDates() {
-        CalendarData calData = new CalendarData(fLocale, calendar.getType());
-        UResourceBundle rb = calData.get("fields", "day", "relative");
+        ICUResourceBundle rb = (ICUResourceBundle) UResourceBundle.getBundleInstance(ICUResourceBundle.ICU_BASE_NAME, fLocale);
+        ICUResourceBundle rdb = rb.getWithFallback("fields/day/relative");
         
         Set<URelativeString> datesSet = new TreeSet<URelativeString>(new Comparator<URelativeString>() { 
             public int compare(URelativeString r1, URelativeString r2) {
@@ -207,7 +208,7 @@ public class RelativeDateFormat extends DateFormat {
             }
         }) ;
         
-        for(UResourceBundleIterator i = rb.getIterator();i.hasNext();) {
+        for(UResourceBundleIterator i = rdb.getIterator();i.hasNext();) {
             UResourceBundle line = i.next();
             
             String k = line.getKey();

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java b/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java
index 1d13c91885f209228e808239646990f1873487f3..4b3594939617cfced582679effeaf8496bc3e1b7 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/text/DateTimePatternGenerator.java
@@ -1,6 +1,6 @@
 /*
  ********************************************************************************
- * Copyright (C) 2006-2012, Google, International Business Machines Corporation *
+ * Copyright (C) 2006-2013, Google, International Business Machines Corporation *
  * and others. All Rights Reserved.                                             *
  ********************************************************************************
  */
@@ -203,9 +203,9 @@ public class DateTimePatternGenerator implements Freezable<DateTimePatternGenera
         }catch(MissingResourceException e) {
         }
 
-        // CLDR item names (hmm, do we need aliases in root for all non-gregorian calendars?)
+        // CLDR item names
         try {
-            ICUResourceBundle itemBundle = calTypeBundle.getWithFallback("fields");
+            ICUResourceBundle itemBundle = rb.getWithFallback("fields");
             ICUResourceBundle fieldBundle, dnBundle;
             for (int i=0; i<TYPE_LIMIT; ++i) {
                 if ( isCLDRFieldName(i) ) {