Update ICU to 54.1 step 1

source/i18n/smpdtfmt.cpp

 /*
 *******************************************************************************
-* Copyright (C) 1997-2013, International Business Machines Corporation and    *
+* Copyright (C) 1997-2014, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 *
 * File SMPDTFMT.CPP
 *
 * Modification History:
 *
 *   Date        Name        Description
 *   02/19/97    aliu        Converted from java.
 *   03/31/97    aliu        Modified extensively to work with 50 locales.
 *   04/01/97    aliu        Added support for centuries.
 *   07/09/97    helena      Made ParsePosition into a class.
 *   07/21/98    stephen     Added initializeDefaultCentury.
 *                             Removed getZoneIndex (added in DateFormatSymbols)
 *                             Removed subParseLong
 *                             Removed chk
 *  02/22/99     stephen     Removed character literals for EBCDIC safety
 *   10/14/99    aliu        Updated 2-digit year parsing so that only "00" thru
 *                           "99" are recognized. {j28 4182066}
 *   11/15/99    weiv        Added support for week of year/day of week format
 ********************************************************************************
 */
 
 #define ZID_KEY_MAX 128
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
-
 #include "unicode/smpdtfmt.h"
 #include "unicode/dtfmtsym.h"
 #include "unicode/ures.h"
 #include "unicode/msgfmt.h"
 #include "unicode/calendar.h"
 #include "unicode/gregocal.h"
 #include "unicode/timezone.h"
 #include "unicode/decimfmt.h"
 #include "unicode/dcfmtsym.h"
 #include "unicode/uchar.h"
 #include "unicode/uniset.h"
 #include "unicode/ustring.h"
 #include "unicode/basictz.h"
 #include "unicode/simpletz.h"
 #include "unicode/rbtz.h"
 #include "unicode/tzfmt.h"
 #include "unicode/utf16.h"
 #include "unicode/vtzone.h"
 #include "unicode/udisplaycontext.h"
+#include "unicode/brkiter.h"
 #include "olsontz.h"
 #include "patternprops.h"
 #include "fphdlimp.h"
 #include "gregoimp.h"
 #include "hebrwcal.h"
 #include "cstring.h"
 #include "uassert.h"
 #include "cmemory.h"
 #include "umutex.h"
 #include <float.h>
@@ skipping 56 matching lines @@
     UDAT_DAY_OF_WEEK_IN_MONTH_FIELD,
     UDAT_WEEK_OF_YEAR_FIELD,
     UDAT_WEEK_OF_MONTH_FIELD,
     UDAT_YEAR_WOY_FIELD,
     UDAT_EXTENDED_YEAR_FIELD,
     UDAT_JULIAN_DAY_FIELD,
     UDAT_STANDALONE_DAY_FIELD,
     UDAT_STANDALONE_MONTH_FIELD,
     UDAT_QUARTER_FIELD,
     UDAT_STANDALONE_QUARTER_FIELD,
-    UDAT_YEAR_NAME_FIELD };
-static const int8_t kDateFieldsCount = 15;
+    UDAT_YEAR_NAME_FIELD,
+    UDAT_RELATED_YEAR_FIELD };
+static const int8_t kDateFieldsCount = 16;
 
 static const UDateFormatField kTimeFields[] = {
     UDAT_HOUR_OF_DAY1_FIELD,
     UDAT_HOUR_OF_DAY0_FIELD,
     UDAT_MINUTE_FIELD,
     UDAT_SECOND_FIELD,
     UDAT_FRACTIONAL_SECOND_FIELD,
     UDAT_HOUR1_FIELD,
     UDAT_HOUR0_FIELD,
     UDAT_MILLISECONDS_IN_DAY_FIELD,
@@ skipping 55 matching lines @@
     -1,  // 'e' - UDAT_DOW_LOCAL_FIELD
     -1,  // 'u' - UDAT_EXTENDED_YEAR_FIELD
     -1,  // 'g' - UDAT_JULIAN_DAY_FIELD
     -1,  // 'A' - UDAT_MILLISECONDS_IN_DAY_FIELD
     -1,  // 'Z' - UDAT_TIMEZONE_RFC_FIELD
     -1,  // 'v' - UDAT_TIMEZONE_GENERIC_FIELD
      0,  // 'c' - UDAT_STANDALONE_DAY_FIELD
      1,  // 'L' - UDAT_STANDALONE_MONTH_FIELD
     -1,  // 'Q' - UDAT_QUARTER_FIELD (1-4?)
     -1,  // 'q' - UDAT_STANDALONE_QUARTER_FIELD
-    -1   // 'V' - UDAT_TIMEZONE_SPECIAL_FIELD
+    -1,  // 'V' - UDAT_TIMEZONE_SPECIAL_FIELD
     -1,  // 'U' - UDAT_YEAR_NAME_FIELD
     -1,  // 'O' - UDAT_TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD
     -1,  // 'X' - UDAT_TIMEZONE_ISO_FIELD
     -1,  // 'x' - UDAT_TIMEZONE_ISO_LOCAL_FIELD
+    -1,  // 'r' - UDAT_RELATED_YEAR_FIELD
 };
 
 // When calendar uses hebr numbering (i.e. he@calendar=hebrew),
 // offset the years within the current millenium down to 1-999
 static const int32_t HEBREW_CAL_CUR_MILLENIUM_START_YEAR = 5000;
 static const int32_t HEBREW_CAL_CUR_MILLENIUM_END_YEAR = 6000;
 
 static UMutex LOCK = U_MUTEX_INITIALIZER;
 
 UOBJECT_DEFINE_RTTI_IMPLEMENTATION(SimpleDateFormat)
 
 //----------------------------------------------------------------------
 
 SimpleDateFormat::~SimpleDateFormat()
 {
     delete fSymbols;
     if (fNumberFormatters) {
         uprv_free(fNumberFormatters);
     }
     if (fTimeZoneFormat) {
         delete fTimeZoneFormat;
     }
 
     while (fOverrideList) {
         NSOverride *cur = fOverrideList;
         fOverrideList = cur->next;
         delete cur->nf;
         uprv_free(cur);
     }
+
+#if !UCONFIG_NO_BREAK_ITERATION
+    delete fCapitalizationBrkIter;
+#endif
 }
 
 //----------------------------------------------------------------------
 
 SimpleDateFormat::SimpleDateFormat(UErrorCode& status)
   :   fLocale(Locale::getDefault()),
       fSymbols(NULL),
       fTimeZoneFormat(NULL),
       fNumberFormatters(NULL),
       fOverrideList(NULL),
-      fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE)
+      fCapitalizationBrkIter(NULL)
 {
-    setBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, true, status).setBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, true, status);
+    initializeBooleanAttributes();
     construct(kShort, (EStyle) (kShort + kDateOffset), fLocale, status);
     initializeDefaultCentury();
 }
 
 //----------------------------------------------------------------------
 
 SimpleDateFormat::SimpleDateFormat(const UnicodeString& pattern,
                                    UErrorCode &status)
 :   fPattern(pattern),
     fLocale(Locale::getDefault()),
     fSymbols(NULL),
     fTimeZoneFormat(NULL),
     fNumberFormatters(NULL),
     fOverrideList(NULL),
-    fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE)
+    fCapitalizationBrkIter(NULL)
 {
     fDateOverride.setToBogus();
     fTimeOverride.setToBogus();
-    setBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, true, status).setBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, true, status);
+    initializeBooleanAttributes();
     initializeSymbols(fLocale, initializeCalendar(NULL,fLocale,status), status);
     initialize(fLocale, status);
     initializeDefaultCentury();
 
 }
 //----------------------------------------------------------------------
 
 SimpleDateFormat::SimpleDateFormat(const UnicodeString& pattern,
                                    const UnicodeString& override,
                                    UErrorCode &status)
 :   fPattern(pattern),
     fLocale(Locale::getDefault()),
     fSymbols(NULL),
     fTimeZoneFormat(NULL),
     fNumberFormatters(NULL),
     fOverrideList(NULL),
-    fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE)
+    fCapitalizationBrkIter(NULL)
 {
     fDateOverride.setTo(override);
     fTimeOverride.setToBogus();
-    setBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, true, status).setBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, true, status);
+    initializeBooleanAttributes();
     initializeSymbols(fLocale, initializeCalendar(NULL,fLocale,status), status);
     initialize(fLocale, status);
     initializeDefaultCentury();
 
     processOverrideString(fLocale,override,kOvrStrBoth,status);
 
 }
 
 //----------------------------------------------------------------------
 
 SimpleDateFormat::SimpleDateFormat(const UnicodeString& pattern,
                                    const Locale& locale,
                                    UErrorCode& status)
 :   fPattern(pattern),
     fLocale(locale),
     fTimeZoneFormat(NULL),
     fNumberFormatters(NULL),
     fOverrideList(NULL),
-    fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE)
+    fCapitalizationBrkIter(NULL)
 {
 
     fDateOverride.setToBogus();
     fTimeOverride.setToBogus();
-    setBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, true, status).setBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, true, status);
+    initializeBooleanAttributes();
 
     initializeSymbols(fLocale, initializeCalendar(NULL,fLocale,status), status);
     initialize(fLocale, status);
     initializeDefaultCentury();
 }
 
 //----------------------------------------------------------------------
 
 SimpleDateFormat::SimpleDateFormat(const UnicodeString& pattern,
                                    const UnicodeString& override,
                                    const Locale& locale,
                                    UErrorCode& status)
 :   fPattern(pattern),
     fLocale(locale),
     fTimeZoneFormat(NULL),
     fNumberFormatters(NULL),
     fOverrideList(NULL),
-    fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE)
+    fCapitalizationBrkIter(NULL)
 {
 
     fDateOverride.setTo(override);
     fTimeOverride.setToBogus();
-    setBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, true, status).setBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, true, status);
+    initializeBooleanAttributes();
 
     initializeSymbols(fLocale, initializeCalendar(NULL,fLocale,status), status);
     initialize(fLocale, status);
     initializeDefaultCentury();
 
     processOverrideString(locale,override,kOvrStrBoth,status);
 
 }
 
 //----------------------------------------------------------------------
 
 SimpleDateFormat::SimpleDateFormat(const UnicodeString& pattern,
                                    DateFormatSymbols* symbolsToAdopt,
                                    UErrorCode& status)
 :   fPattern(pattern),
     fLocale(Locale::getDefault()),
     fSymbols(symbolsToAdopt),
     fTimeZoneFormat(NULL),
     fNumberFormatters(NULL),
     fOverrideList(NULL),
-    fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE)
+    fCapitalizationBrkIter(NULL)
 {
 
     fDateOverride.setToBogus();
     fTimeOverride.setToBogus();
-    setBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, true, status).setBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, true, status);
+    initializeBooleanAttributes();
 
     initializeCalendar(NULL,fLocale,status);
     initialize(fLocale, status);
     initializeDefaultCentury();
 }
 
 //----------------------------------------------------------------------
 
 SimpleDateFormat::SimpleDateFormat(const UnicodeString& pattern,
                                    const DateFormatSymbols& symbols,
                                    UErrorCode& status)
 :   fPattern(pattern),
     fLocale(Locale::getDefault()),
     fSymbols(new DateFormatSymbols(symbols)),
     fTimeZoneFormat(NULL),
     fNumberFormatters(NULL),
     fOverrideList(NULL),
-    fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE)
+    fCapitalizationBrkIter(NULL)
 {
 
     fDateOverride.setToBogus();
     fTimeOverride.setToBogus();
-    setBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, true, status).setBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, true, status);
+    initializeBooleanAttributes();
 
     initializeCalendar(NULL, fLocale, status);
     initialize(fLocale, status);
     initializeDefaultCentury();
 }
 
 //----------------------------------------------------------------------
 
 // Not for public consumption; used by DateFormat
 SimpleDateFormat::SimpleDateFormat(EStyle timeStyle,
                                    EStyle dateStyle,
                                    const Locale& locale,
                                    UErrorCode& status)
 :   fLocale(locale),
     fSymbols(NULL),
     fTimeZoneFormat(NULL),
     fNumberFormatters(NULL),
     fOverrideList(NULL),
-    fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE)
+    fCapitalizationBrkIter(NULL)
 {
-    setBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, true, status).setBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, true, status);
+    initializeBooleanAttributes();
     construct(timeStyle, dateStyle, fLocale, status);
     if(U_SUCCESS(status)) {
       initializeDefaultCentury();
     }
 }
 
 //----------------------------------------------------------------------
 
 /**
  * Not for public consumption; used by DateFormat.  This constructor
  * never fails.  If the resource data is not available, it uses the
  * the last resort symbols.
  */
 SimpleDateFormat::SimpleDateFormat(const Locale& locale,
                                    UErrorCode& status)
 :   fPattern(gDefaultPattern),
     fLocale(locale),
     fSymbols(NULL),
     fTimeZoneFormat(NULL),
     fNumberFormatters(NULL),
     fOverrideList(NULL),
-    fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE)
+    fCapitalizationBrkIter(NULL)
 {
     if (U_FAILURE(status)) return;
+    initializeBooleanAttributes();
     initializeSymbols(fLocale, initializeCalendar(NULL, fLocale, status),status);
     if (U_FAILURE(status))
     {
         status = U_ZERO_ERROR;
         delete fSymbols;
         // This constructor doesn't fail; it uses last resort data
         fSymbols = new DateFormatSymbols(status);
         /* test for NULL */
         if (fSymbols == 0) {
             status = U_MEMORY_ALLOCATION_ERROR;
             return;
         }
     }
 
     fDateOverride.setToBogus();
     fTimeOverride.setToBogus();
-    setBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, true, status).setBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, true, status);
 
     initialize(fLocale, status);
     if(U_SUCCESS(status)) {
       initializeDefaultCentury();
     }
 }
 
 //----------------------------------------------------------------------
 
 SimpleDateFormat::SimpleDateFormat(const SimpleDateFormat& other)
 :   DateFormat(other),
     fLocale(other.fLocale),
     fSymbols(NULL),
     fTimeZoneFormat(NULL),
     fNumberFormatters(NULL),
     fOverrideList(NULL),
-    fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE)
+    fCapitalizationBrkIter(NULL)
 {
-    UErrorCode status = U_ZERO_ERROR;
-    setBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, true, status).setBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, true, status);
+    initializeBooleanAttributes();
     *this = other;
 }
 
 //----------------------------------------------------------------------
 
 SimpleDateFormat& SimpleDateFormat::operator=(const SimpleDateFormat& other)
 {
     if (this == &other) {
         return *this;
     }
@@ skipping 11 matching lines @@
 
     fPattern = other.fPattern;
 
     // TimeZoneFormat in ICU4C only depends on a locale for now
     if (fLocale != other.fLocale) {
         delete fTimeZoneFormat;
         fTimeZoneFormat = NULL; // forces lazy instantiation with the other locale
         fLocale = other.fLocale;
     }
 
-    fCapitalizationContext = other.fCapitalizationContext;
+#if !UCONFIG_NO_BREAK_ITERATION
+    if (other.fCapitalizationBrkIter != NULL) {
+        fCapitalizationBrkIter = (other.fCapitalizationBrkIter)->clone();
+    }
+#endif
 
     return *this;
 }
 
 //----------------------------------------------------------------------
 
 Format*
 SimpleDateFormat::clone() const
 {
     return new SimpleDateFormat(*this);
 }
 
 //----------------------------------------------------------------------
 
 UBool
 SimpleDateFormat::operator==(const Format& other) const
 {
     if (DateFormat::operator==(other)) {
+        // The DateFormat::operator== check for fCapitalizationContext equality above
+        //   is sufficient to check equality of all derived context-related data.
         // DateFormat::operator== guarantees following cast is safe
         SimpleDateFormat* that = (SimpleDateFormat*)&other;
         return (fPattern             == that->fPattern &&
                 fSymbols             != NULL && // Check for pathological object
                 that->fSymbols       != NULL && // Check for pathological object
                 *fSymbols            == *that->fSymbols &&
                 fHaveDefaultCentury  == that->fHaveDefaultCentury &&
-                fDefaultCenturyStart == that->fDefaultCenturyStart &&
-                fCapitalizationContext == that->fCapitalizationContext);
+                fDefaultCenturyStart == that->fDefaultCenturyStart);
     }
     return FALSE;
 }
 
 //----------------------------------------------------------------------
 
 void SimpleDateFormat::construct(EStyle timeStyle,
                                  EStyle dateStyle,
                                  const Locale& locale,
                                  UErrorCode& status)
@@ skipping 258 matching lines @@
     if(fHaveDefaultCentury) {
       fDefaultCenturyStart = fCalendar->defaultCenturyStart();
       fDefaultCenturyStartYear = fCalendar->defaultCenturyStartYear();
     } else {
       fDefaultCenturyStart = DBL_MIN;
       fDefaultCenturyStartYear = -1;
     }
   }
 }
 
+/*
+ * Initialize the boolean attributes. Separate so we can call it from all constructors.
+ */
+void SimpleDateFormat::initializeBooleanAttributes()
+{
+    UErrorCode status = U_ZERO_ERROR;
+
+    setBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, true, status);
+    setBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, true, status);
+    setBooleanAttribute(UDAT_PARSE_PARTIAL_MATCH, true, status);
+    setBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, true, status);
+}
+
 /* Define one-century window into which to disambiguate dates using
  * two-digit years. Make public in JDK 1.2.
  */
 void SimpleDateFormat::parseAmbiguousDatesAsAfter(UDate startDate, UErrorCode& status)
 {
     if(U_FAILURE(status)) {
         return;
     }
     if(!fCalendar) {
       status = U_ILLEGAL_ARGUMENT_ERROR;
@@ skipping 52 matching lines @@
         } else {
             status = U_MEMORY_ALLOCATION_ERROR;
             return appendTo;
         }
     }
 
     UBool inQuote = FALSE;
     UChar prevCh = 0;
     int32_t count = 0;
     int32_t fieldNum = 0;
+    UDisplayContext capitalizationContext = getContext(UDISPCTX_TYPE_CAPITALIZATION, status);
 
     // loop through the pattern string character by character
     for (int32_t i = 0; i < fPattern.length() && U_SUCCESS(status); ++i) {
         UChar ch = fPattern[i];
 
         // Use subFormat() to format a repeated pattern character
         // when a different pattern or non-pattern character is seen
         if (ch != prevCh && count > 0) {
-            subFormat(appendTo, prevCh, count, fCapitalizationContext, fieldNum++, handler, *workCal, status);
+            subFormat(appendTo, prevCh, count, capitalizationContext, fieldNum++, handler, *workCal, status);
             count = 0;
         }
         if (ch == QUOTE) {
             // Consecutive single quotes are a single quote literal,
             // either outside of quotes or between quotes
             if ((i+1) < fPattern.length() && fPattern[i+1] == QUOTE) {
                 appendTo += (UChar)QUOTE;
                 ++i;
             } else {
                 inQuote = ! inQuote;
             }
         }
         else if ( ! inQuote && ((ch >= 0x0061 /*'a'*/ && ch <= 0x007A /*'z'*/)
                     || (ch >= 0x0041 /*'A'*/ && ch <= 0x005A /*'Z'*/))) {
             // ch is a date-time pattern character to be interpreted
             // by subFormat(); count the number of times it is repeated
             prevCh = ch;
             ++count;
         }
         else {
             // Append quoted characters and unquoted non-pattern characters
             appendTo += ch;
         }
     }
 
     // Format the last item in the pattern, if any
     if (count > 0) {
-        subFormat(appendTo, prevCh, count, fCapitalizationContext, fieldNum++, handler, *workCal, status);
+        subFormat(appendTo, prevCh, count, capitalizationContext, fieldNum++, handler, *workCal, status);
     }
 
     if (calClone != NULL) {
         delete calClone;
     }
 
     return appendTo;
 }
 
 //----------------------------------------------------------------------
 
 /* Map calendar field into calendar field level.
  * the larger the level, the smaller the field unit.
  * For example, UCAL_ERA level is 0, UCAL_YEAR level is 10,
  * UCAL_MONTH level is 20.
  * NOTE: if new fields adds in, the table needs to update.
  */
 const int32_t
 SimpleDateFormat::fgCalendarFieldToLevel[] =
 {
     /*GyM*/ 0, 10, 20,
     /*wW*/ 20, 30,
     /*dDEF*/ 30, 20, 30, 30,
     /*ahHm*/ 40, 50, 50, 60,
-    /*sS..*/ 70, 80,
+    /*sS*/ 70, 80,
     /*z?Y*/ 0, 0, 10,
     /*eug*/ 30, 10, 0,
-    /*A*/ 40
+    /*A?.*/ 40, 0, 0
 };
 
 
 /* Map calendar field LETTER into calendar field level.
  * the larger the level, the smaller the field unit.
  * NOTE: if new fields adds in, the table needs to update.
  */
 const int32_t
 SimpleDateFormat::fgPatternCharToLevel[] = {
     //       A   B   C   D   E   F   G   H   I   J   K   L   M   N   O
         -1, 40, -1, -1, 20, 30, 30,  0, 50, -1, -1, 50, 20, 20, -1,  0,
     //   P   Q   R   S   T   U   V   W   X   Y   Z
         -1, 20, -1, 80, -1, 10,  0, 30,  0, 10,  0, -1, -1, -1, -1, -1,
     //       a   b   c   d   e   f   g   h   i   j   k   l   m   n   o
         -1, 40, -1, 30, 30, 30, -1,  0, 50, -1, -1, 50, -1, 60, -1, -1,
     //   p   q   r   s   t   u   v   w   x   y   z
-        -1, 20, -1, 70, -1, 10,  0, 20,  0, 10,  0, -1, -1, -1, -1, -1
+        -1, 20, 10, 70, -1, 10,  0, 20,  0, 10,  0, -1, -1, -1, -1, -1
 };
 
 
 // Map index into pattern character string to Calendar field number.
 const UCalendarDateFields
 SimpleDateFormat::fgPatternIndexToCalendarField[] =
 {
     /*GyM*/ UCAL_ERA, UCAL_YEAR, UCAL_MONTH,
     /*dkH*/ UCAL_DATE, UCAL_HOUR_OF_DAY, UCAL_HOUR_OF_DAY,
     /*msS*/ UCAL_MINUTE, UCAL_SECOND, UCAL_MILLISECOND,
     /*EDF*/ UCAL_DAY_OF_WEEK, UCAL_DAY_OF_YEAR, UCAL_DAY_OF_WEEK_IN_MONTH,
     /*wWa*/ UCAL_WEEK_OF_YEAR, UCAL_WEEK_OF_MONTH, UCAL_AM_PM,
     /*hKz*/ UCAL_HOUR, UCAL_HOUR, UCAL_ZONE_OFFSET,
     /*Yeu*/ UCAL_YEAR_WOY, UCAL_DOW_LOCAL, UCAL_EXTENDED_YEAR,
     /*gAZ*/ UCAL_JULIAN_DAY, UCAL_MILLISECONDS_IN_DAY, UCAL_ZONE_OFFSET,
     /*v*/   UCAL_ZONE_OFFSET,
     /*c*/   UCAL_DOW_LOCAL,
     /*L*/   UCAL_MONTH,
     /*Q*/   UCAL_MONTH,
     /*q*/   UCAL_MONTH,
     /*V*/   UCAL_ZONE_OFFSET,
     /*U*/   UCAL_YEAR,
     /*O*/   UCAL_ZONE_OFFSET,
     /*Xx*/  UCAL_ZONE_OFFSET, UCAL_ZONE_OFFSET,
+    /*r*/   UCAL_EXTENDED_YEAR,
 };
 
 // Map index into pattern character string to DateFormat field number
 const UDateFormatField
 SimpleDateFormat::fgPatternIndexToDateFormatField[] = {
     /*GyM*/ UDAT_ERA_FIELD, UDAT_YEAR_FIELD, UDAT_MONTH_FIELD,
     /*dkH*/ UDAT_DATE_FIELD, UDAT_HOUR_OF_DAY1_FIELD, UDAT_HOUR_OF_DAY0_FIELD,
     /*msS*/ UDAT_MINUTE_FIELD, UDAT_SECOND_FIELD, UDAT_FRACTIONAL_SECOND_FIELD,
     /*EDF*/ UDAT_DAY_OF_WEEK_FIELD, UDAT_DAY_OF_YEAR_FIELD, UDAT_DAY_OF_WEEK_IN_MONTH_FIELD,
     /*wWa*/ UDAT_WEEK_OF_YEAR_FIELD, UDAT_WEEK_OF_MONTH_FIELD, UDAT_AM_PM_FIELD,
     /*hKz*/ UDAT_HOUR1_FIELD, UDAT_HOUR0_FIELD, UDAT_TIMEZONE_FIELD,
     /*Yeu*/ UDAT_YEAR_WOY_FIELD, UDAT_DOW_LOCAL_FIELD, UDAT_EXTENDED_YEAR_FIELD,
     /*gAZ*/ UDAT_JULIAN_DAY_FIELD, UDAT_MILLISECONDS_IN_DAY_FIELD, UDAT_TIMEZONE_RFC_FIELD,
     /*v*/   UDAT_TIMEZONE_GENERIC_FIELD,
     /*c*/   UDAT_STANDALONE_DAY_FIELD,
     /*L*/   UDAT_STANDALONE_MONTH_FIELD,
     /*Q*/   UDAT_QUARTER_FIELD,
     /*q*/   UDAT_STANDALONE_QUARTER_FIELD,
     /*V*/   UDAT_TIMEZONE_SPECIAL_FIELD,
     /*U*/   UDAT_YEAR_NAME_FIELD,
     /*O*/   UDAT_TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD,
     /*Xx*/  UDAT_TIMEZONE_ISO_FIELD, UDAT_TIMEZONE_ISO_LOCAL_FIELD,
+    /*r*/   UDAT_RELATED_YEAR_FIELD,
 };
 
 //----------------------------------------------------------------------
 
 /**
  * Append symbols[value] to dst.  Make sure the array index is not out
  * of bounds.
  */
 static inline void
 _appendSymbol(UnicodeString& dst,
@@ skipping 35 matching lines @@
         if (fNumberFormatters) {
             for (int32_t i = 0; i < UDAT_FIELD_COUNT; i++) {
                 fNumberFormatters[i] = fNumberFormat;
             }
         } else {
             status = U_MEMORY_ALLOCATION_ERROR;
         }
     }
     umtx_unlock(&LOCK);
 
+    if (U_FAILURE(status)) {
+        return;
+    }
+
     processOverrideString(locale,fDateOverride,kOvrStrDate,status);
     processOverrideString(locale,fTimeOverride,kOvrStrTime,status);
-
 }
 
 void
 SimpleDateFormat::processOverrideString(const Locale &locale, const UnicodeString &str, int8_t type, UErrorCode &status) {
-    if (str.isBogus()) {
+    if (str.isBogus() || U_FAILURE(status)) {
         return;
     }
+
+    U_ASSERT(fNumberFormatters != NULL);
+
     int32_t start = 0;
     int32_t len;
     UnicodeString nsName;
     UnicodeString ovrField;
     UBool moreToProcess = TRUE;
 
     while (moreToProcess) {
         int32_t delimiterPosition = str.indexOf((UChar)ULOC_KEYWORD_ITEM_SEPARATOR_UNICODE,start);
         if (delimiterPosition == -1) {
             moreToProcess = FALSE;
@@ skipping 61 matching lines @@
                }
 
            } else {
                status = U_MEMORY_ALLOCATION_ERROR;
                return;
            }
         }
 
         // Now that we have an appropriate number formatter, fill in the appropriate spaces in the
         // number formatters table.
-
         if (ovrField.isBogus()) {
             switch (type) {
                 case kOvrStrDate:
                 case kOvrStrBoth: {
                     for ( int8_t i=0 ; i<kDateFieldsCount; i++ ) {
                         fNumberFormatters[kDateFields[i]] = nf;
                     }
                     if (type==kOvrStrDate) {
                         break;
                     }
@@ skipping 52 matching lines @@
     // if the pattern character is unrecognized, signal an error and dump out
     if (patternCharIndex == UDAT_FIELD_COUNT)
     {
         if (ch != 0x6C) { // pattern char 'l' (SMALL LETTER L) just gets ignored
             status = U_INVALID_FORMAT_ERROR;
         }
         return;
     }
 
     UCalendarDateFields field = fgPatternIndexToCalendarField[patternCharIndex];
-    int32_t value = cal.get(field, status);
+    int32_t value = (patternCharIndex != UDAT_RELATED_YEAR_FIELD)? cal.get(field, status): cal.getRelatedYear(status);
     if (U_FAILURE(status)) {
         return;
     }
 
     currentNumberFormat = getNumberFormatByIndex(patternCharIndex);
     UnicodeString hebr("hebr", 4, US_INV);
     
     switch (patternCharIndex) {
 
     // for any "G" symbol, write out the appropriate era string
@@ skipping 348 matching lines @@
         break;
 
 
     // all of the other pattern symbols can be formatted as simple numbers with
     // appropriate zero padding
     default:
         zeroPaddingNumber(currentNumberFormat,appendTo, value, count, maxIntCount);
         break;
     }
 #if !UCONFIG_NO_BREAK_ITERATION
-    if (fieldNum == 0) {
-        // first field, check to see whether we need to titlecase it
+    // if first field, check to see whether we need to and are able to titlecase it
+    if (fieldNum == 0 && u_islower(appendTo.char32At(beginOffset)) && fCapitalizationBrkIter != NULL) {
         UBool titlecase = FALSE;
         switch (capitalizationContext) {
             case UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE:
                 titlecase = TRUE;
                 break;
             case UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU:
                 titlecase = fSymbols->fCapitalization[capContextUsageType][0];
                 break;
             case UDISPCTX_CAPITALIZATION_FOR_STANDALONE:
                 titlecase = fSymbols->fCapitalization[capContextUsageType][1];
                 break;
             default:
                 // titlecase = FALSE;
                 break;
         }
         if (titlecase) {
             UnicodeString firstField(appendTo, beginOffset);
-            firstField.toTitle(NULL, fLocale, U_TITLECASE_NO_LOWERCASE | U_TITLECASE_NO_BREAK_ADJUSTMENT);
+            firstField.toTitle(fCapitalizationBrkIter, fLocale, U_TITLECASE_NO_LOWERCASE | U_TITLECASE_NO_BREAK_ADJUSTMENT);
             appendTo.replaceBetween(beginOffset, appendTo.length(), firstField);
         }
     }
 #endif
 
     handler.addAttribute(fgPatternIndexToDateFormatField[patternCharIndex], beginOffset, appendTo.length());
 }
 
 //----------------------------------------------------------------------
 
+void SimpleDateFormat::adoptNumberFormat(NumberFormat *formatToAdopt) {
+    formatToAdopt->setParseIntegerOnly(TRUE);
+    if (fNumberFormat && fNumberFormat != formatToAdopt){
+        delete fNumberFormat;
+    }
+    fNumberFormat = formatToAdopt;
+
+    if (fNumberFormatters) {
+        for (int32_t i = 0; i < UDAT_FIELD_COUNT; i++) {
+            if (fNumberFormatters[i] == formatToAdopt) {
+                fNumberFormatters[i] = NULL;
+            }
+        }
+        uprv_free(fNumberFormatters);
+        fNumberFormatters = NULL;
+    }
+    
+    while (fOverrideList) {
+        NSOverride *cur = fOverrideList;
+        fOverrideList = cur->next;
+        if (cur->nf != formatToAdopt) { // only delete those not duplicate
+            delete cur->nf;
+            uprv_free(cur);
+        } else {
+            cur->nf = NULL;
+            uprv_free(cur);
+        }
+    }
+}
+
+void SimpleDateFormat::adoptNumberFormat(const UnicodeString& fields, NumberFormat *formatToAdopt, UErrorCode &status){
+    // if it has not been initialized yet, initialize
+    if (fNumberFormatters == NULL) {
+        fNumberFormatters = (NumberFormat**)uprv_malloc(UDAT_FIELD_COUNT * sizeof(NumberFormat*));
+        if (fNumberFormatters) {
+            for (int32_t i = 0; i < UDAT_FIELD_COUNT; i++) {
+                fNumberFormatters[i] = fNumberFormat;
+            }
+        } else {
+            status = U_MEMORY_ALLOCATION_ERROR;
+            return;
+        }
+    }
+    
+    // See if the numbering format is in the override list, if not, then add it.
+    NSOverride *cur = fOverrideList;
+    UBool found = FALSE;
+    while (cur && !found) {
+        if ( cur->nf == formatToAdopt ) {
+            found = TRUE;
+        }
+        cur = cur->next;
+    }
+
+    if (!found) {
+        cur = (NSOverride *)uprv_malloc(sizeof(NSOverride));
+        if (cur) {
+            // no matter what the locale's default number format looked like, we want
+            // to modify it so that it doesn't use thousands separators, doesn't always
+            // show the decimal point, and recognizes integers only when parsing
+            formatToAdopt->setGroupingUsed(FALSE);
+            DecimalFormat* decfmt = dynamic_cast<DecimalFormat*>(formatToAdopt);
+            if (decfmt != NULL) {
+                decfmt->setDecimalSeparatorAlwaysShown(FALSE);
+            }
+            formatToAdopt->setParseIntegerOnly(TRUE);
+            formatToAdopt->setMinimumFractionDigits(0); // To prevent "Jan 1.00, 1997.00"
+
+            cur->nf = formatToAdopt;
+            cur->hash = -1; // set duplicate here (before we set it with NumberSystem Hash, here we cannot get nor use it)
+            cur->next = fOverrideList;
+            fOverrideList = cur;
+        } else {
+            status = U_MEMORY_ALLOCATION_ERROR;
+            return;
+        }
+    }
+    
+    for (int i=0; i<fields.length(); i++) {
+        UChar field = fields.charAt(i);
+        // if the pattern character is unrecognized, signal an error and bail out
+        UDateFormatField patternCharIndex = DateFormatSymbols::getPatternCharIndex(field);
+        if (patternCharIndex == UDAT_FIELD_COUNT) {
+            status = U_INVALID_FORMAT_ERROR;
+            return;
+        }
+
+        // Set the number formatter in the table
+        fNumberFormatters[patternCharIndex] = formatToAdopt;
+    }
+}
+
+const NumberFormat *
+SimpleDateFormat::getNumberFormatForField(UChar field) const {
+    UDateFormatField index = DateFormatSymbols::getPatternCharIndex(field);
+    return getNumberFormatByIndex(index);
+}
+
 NumberFormat *
 SimpleDateFormat::getNumberFormatByIndex(UDateFormatField index) const {
     if (fNumberFormatters != NULL) {
         return fNumberFormatters[index];
     } else {
         return fNumberFormat;
     }
 }
 
 //----------------------------------------------------------------------
@@ skipping 52 matching lines @@
     int32_t i = patternOffset;
     while (pattern.charAt(--i) == ch) {}
     return !DateFormatSymbols::isNumericField(f, patternOffset - i);
 }
 
 void
 SimpleDateFormat::parse(const UnicodeString& text, Calendar& cal, ParsePosition& parsePos) const
 {
     UErrorCode status = U_ZERO_ERROR;
     int32_t pos = parsePos.getIndex();
+    if(parsePos.getIndex() < 0) {
+        parsePos.setErrorIndex(0);
+        return;
+    }
     int32_t start = pos;
 
+
     UBool ambiguousYear[] = { FALSE };
     int32_t saveHebrewMonth = -1;
     int32_t count = 0;
-
-    // hack, reset tztype, cast away const
-    ((SimpleDateFormat*)this)->tztype = UTZFMT_TIME_TYPE_UNKNOWN;
+    UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
 
     // For parsing abutting numeric fields. 'abutPat' is the
     // offset into 'pattern' of the first of 2 or more abutting
     // numeric fields.  'abutStart' is the offset into 'text'
     // where parsing the fields begins. 'abutPass' starts off as 0
     // and increments each time we try to parse the fields.
     int32_t abutPat = -1; // If >=0, we are in a run of abutting numeric fields
     int32_t abutStart = 0;
     int32_t abutPass = 0;
     UBool inQuote = FALSE;
@@ skipping 73 matching lines @@
                 // abutting numeric fields has failed.
                 if (fieldPat == abutPat) {
                     count -= abutPass++;
                     if (count == 0) {
                         status = U_PARSE_ERROR;
                         goto ExitParse;
                     }
                 }
 
                 pos = subParse(text, pos, ch, count,
-                               TRUE, FALSE, ambiguousYear, saveHebrewMonth, *workCal, i, numericLeapMonthFormatter);
+                               TRUE, FALSE, ambiguousYear, saveHebrewMonth, *workCal, i, numericLeapMonthFormatter, &tzTimeType);
 
                 // If the parse fails anywhere in the run, back up to the
                 // start of the run and retry.
                 if (pos < 0) {
                     i = abutPat - 1;
                     pos = abutStart;
                     continue;
                 }
             }
 
             // Handle non-numeric fields and non-abutting numeric
             // fields.
             else if (ch != 0x6C) { // pattern char 'l' (SMALL LETTER L) just gets ignored
                 int32_t s = subParse(text, pos, ch, count,
-                               FALSE, TRUE, ambiguousYear, saveHebrewMonth, *workCal, i, numericLeapMonthFormatter);
+                               FALSE, TRUE, ambiguousYear, saveHebrewMonth, *workCal, i, numericLeapMonthFormatter, &tzTimeType);
 
                 if (s == -pos-1) {
                     // era not present, in special cases allow this to continue
                     // from the position where the era was expected
                     s = pos;
 
                     if (i+1 < fPattern.length()) {
                         // move to next pattern character
                         UChar ch = fPattern.charAt(i+1);
 
@@ skipping 16 matching lines @@
             }
         }
 
         // Handle literal pattern characters.  These are any
         // quoted characters and non-alphabetic unquoted
         // characters.
         else {
 
             abutPat = -1; // End of any abutting fields
             
-            if (! matchLiterals(fPattern, i, text, pos, getBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, status))) {
+            if (! matchLiterals(fPattern, i, text, pos, getBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, status), getBooleanAttribute(UDAT_PARSE_PARTIAL_MATCH, status), isLenient())) {
                 status = U_PARSE_ERROR;
                 goto ExitParse;
             }
         }
     }
 
     // Special hack for trailing "." after non-numeric field.
     if (text.charAt(pos) == 0x2e && getBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, status)) {
         // only do if the last field is not numeric
         if (isAfterNonNumericField(fPattern, fPattern.length())) {
@@ skipping 22 matching lines @@
             parsedDate = calendar.getTime();
         }
     */
     // Because of the above condition, save off the fields in case we need to readjust.
     // The procedure we use here is not particularly efficient, but there is no other
     // way to do this given the API restrictions present in Calendar.  We minimize
     // inefficiency by only performing this computation when it might apply, that is,
     // when the two-digit year is equal to the start year, and thus might fall at the
     // front or the back of the default century.  This only works because we adjust
     // the year correctly to start with in other cases -- see subParse().
-    if (ambiguousYear[0] || tztype != UTZFMT_TIME_TYPE_UNKNOWN) // If this is true then the two-digit year == the default start year
+    if (ambiguousYear[0] || tzTimeType != UTZFMT_TIME_TYPE_UNKNOWN) // If this is true then the two-digit year == the default start year
     {
         // We need a copy of the fields, and we need to avoid triggering a call to
         // complete(), which will recalculate the fields.  Since we can't access
         // the fields[] array in Calendar, we clone the entire object.  This will
         // stop working if Calendar.clone() is ever rewritten to call complete().
         Calendar *copy;
         if (ambiguousYear[0]) {
             copy = cal.clone();
             // Check for failed cloning.
             if (copy == NULL) {
                 status = U_MEMORY_ALLOCATION_ERROR;
                 goto ExitParse;
             }
             UDate parsedDate = copy->getTime(status);
             // {sfb} check internalGetDefaultCenturyStart
             if (fHaveDefaultCentury && (parsedDate < fDefaultCenturyStart)) {
                 // We can't use add here because that does a complete() first.
                 cal.set(UCAL_YEAR, fDefaultCenturyStartYear + 100);
             }
             delete copy;
         }
 
-        if (tztype != UTZFMT_TIME_TYPE_UNKNOWN) {
+        if (tzTimeType != UTZFMT_TIME_TYPE_UNKNOWN) {
             copy = cal.clone();
             // Check for failed cloning.
             if (copy == NULL) {
                 status = U_MEMORY_ALLOCATION_ERROR;
                 goto ExitParse;
             }
             const TimeZone & tz = cal.getTimeZone();
             BasicTimeZone *btz = NULL;
 
             if (dynamic_cast<const OlsonTimeZone *>(&tz) != NULL
                 || dynamic_cast<const SimpleTimeZone *>(&tz) != NULL
                 || dynamic_cast<const RuleBasedTimeZone *>(&tz) != NULL
                 || dynamic_cast<const VTimeZone *>(&tz) != NULL) {
                 btz = (BasicTimeZone*)&tz;
             }
 
             // Get local millis
             copy->set(UCAL_ZONE_OFFSET, 0);
             copy->set(UCAL_DST_OFFSET, 0);
             UDate localMillis = copy->getTime(status);
 
             // Make sure parsed time zone type (Standard or Daylight)
             // matches the rule used by the parsed time zone.
             int32_t raw, dst;
             if (btz != NULL) {
-                if (tztype == UTZFMT_TIME_TYPE_STANDARD) {
+                if (tzTimeType == UTZFMT_TIME_TYPE_STANDARD) {
                     btz->getOffsetFromLocal(localMillis,
                         BasicTimeZone::kStandard, BasicTimeZone::kStandard, raw, dst, status);
                 } else {
                     btz->getOffsetFromLocal(localMillis,
                         BasicTimeZone::kDaylight, BasicTimeZone::kDaylight, raw, dst, status);
                 }
             } else {
                 // No good way to resolve ambiguous time at transition,
                 // but following code work in most case.
                 tz.getOffset(localMillis, TRUE, raw, dst, status);
             }
 
             // Now, compare the results with parsed type, either standard or daylight saving time
             int32_t resolvedSavings = dst;
-            if (tztype == UTZFMT_TIME_TYPE_STANDARD) {
+            if (tzTimeType == UTZFMT_TIME_TYPE_STANDARD) {
                 if (dst != 0) {
                     // Override DST_OFFSET = 0 in the result calendar
                     resolvedSavings = 0;
                 }
             } else { // tztype == TZTYPE_DST
                 if (dst == 0) {
                     if (btz != NULL) {
                         UDate time = localMillis + raw;
                         // We use the nearest daylight saving time rule.
                         TimeZoneTransition beforeTrs, afterTrs;
@@ skipping 154 matching lines @@
     }
 
     return -start;
 }
 
 //----------------------------------------------------------------------
 UBool SimpleDateFormat::matchLiterals(const UnicodeString &pattern,
                                       int32_t &patternOffset,
                                       const UnicodeString &text,
                                       int32_t &textOffset,
-                                      UBool lenient)
+                                      UBool whitespaceLenient,
+                                      UBool partialMatchLenient,
+                                      UBool oldLeniency)
 {
     UBool inQuote = FALSE;
-    UnicodeString literal;
+    UnicodeString literal;    
     int32_t i = patternOffset;
-    
+        
     // scan pattern looking for contiguous literal characters
     for ( ; i < pattern.length(); i += 1) {
         UChar ch = pattern.charAt(i);
         
         if (!inQuote && ((ch >= 0x41 && ch <= 0x5A) || (ch >= 0x61 && ch <= 0x7A))) { // unquoted [A-Za-z]
             break;
         }
         
         if (ch == QUOTE) {
             // Match a quote literal ('') inside OR outside of quotes
             if ((i + 1) < pattern.length() && pattern.charAt(i + 1) == QUOTE) {
                 i += 1;
             } else {
                 inQuote = !inQuote;
                 continue;
             }
         }
         
         literal += ch;
     }
     
     // at this point, literal contains the literal text
     // and i is the index of the next non-literal pattern character.
     int32_t p;
     int32_t t = textOffset;
     
-    if (lenient) {
+    if (whitespaceLenient) {
         // trim leading, trailing whitespace from
         // the literal text
         literal.trim();
         
         // ignore any leading whitespace in the text
         while (t < text.length() && u_isWhitespace(text.charAt(t))) {
             t += 1;
         }
     }
         
@@ skipping 14 matching lines @@
                 if (!u_isUWhiteSpace(tch) && !PatternProps::isWhiteSpace(tch)) {
                     break;
                 }
                 
                 t += 1;
             }
             
             // TODO: should we require internal spaces
             // in lenient mode? (There won't be any
             // leading or trailing spaces)
-            if (!lenient && t == tStart) {
+            if (!whitespaceLenient && t == tStart) {
                 // didn't find matching whitespace:
                 // an error in strict mode
                 return FALSE;
             }
             
             // In strict mode, this run of whitespace
             // may have been at the end.
             if (p >= literal.length()) {
                 break;
             }
         }
-        
         if (t >= text.length() || literal.charAt(p) != text.charAt(t)) {
             // Ran out of text, or found a non-matching character:
             // OK in lenient mode, an error in strict mode.
-            if (lenient) {
+            if (whitespaceLenient) {
                 if (t == textOffset && text.charAt(t) == 0x2e &&
                         isAfterNonNumericField(pattern, patternOffset)) {
                     // Lenient mode and the literal input text begins with a "." and
                     // we are after a non-numeric field: We skip the "."
                     ++t;
                     continue;  // Do not update p.
                 }
+                // if it is actual whitespace and we're whitespace lenient it's OK                
+                
+                UChar wsc = text.charAt(t);
+                if(PatternProps::isWhiteSpace(wsc)) {
+                    // Lenient mode and it's just whitespace we skip it
+                    ++t;
+                    continue;  // Do not update p.
+                }
+            } 
+            // hack around oldleniency being a bit of a catch-all bucket and we're just adding support specifically for paritial matches
+            if(partialMatchLenient && oldLeniency) {                             
                 break;
             }
             
             return FALSE;
         }
         ++p;
         ++t;
     }
     
     // At this point if we're in strict mode we have a complete match.
@@ skipping 161 matching lines @@
 
 void
 SimpleDateFormat::set2DigitYearStart(UDate d, UErrorCode& status)
 {
     parseAmbiguousDatesAsAfter(d, status);
 }
 
 /**
  * Private member function that converts the parsed date strings into
  * timeFields. Returns -start (for ParsePosition) if failed.
- * @param text the time text to be parsed.
- * @param start where to start parsing.
- * @param ch the pattern character for the date field text to be parsed.
- * @param count the count of a pattern character.
- * @return the new start position if matching succeeded; a negative number
- * indicating matching failure, otherwise.
  */
 int32_t SimpleDateFormat::subParse(const UnicodeString& text, int32_t& start, UChar ch, int32_t count,
                            UBool obeyCount, UBool allowNegative, UBool ambiguousYear[], int32_t& saveHebrewMonth, Calendar& cal,
-                           int32_t patLoc, MessageFormat * numericLeapMonthFormatter) const
+                           int32_t patLoc, MessageFormat * numericLeapMonthFormatter, UTimeZoneFormatTimeType *tzTimeType) const
 {
     Formattable number;
     int32_t value = 0;
     int32_t i;
     int32_t ps = 0;
     UErrorCode status = U_ZERO_ERROR;
     ParsePosition pos(0);
     UDateFormatField patternCharIndex = DateFormatSymbols::getPatternCharIndex(ch);
     NumberFormat *currentNumberFormat;
     UnicodeString temp;
@@ skipping 175 matching lines @@
         // two-digit year adjustments (e.g., from "01" to 2001).  Otherwise
         // we made adjustments to place the 2-digit year in the proper
         // century, for parsed strings from "00" to "99".  Any other string
         // is treated literally:  "2250", "-1", "1", "002".
         if (fDateOverride.compare(hebr)==0 && value < 1000) {
             value += HEBREW_CAL_CUR_MILLENIUM_START_YEAR;
         } else if ((pos.getIndex() - start) == 2 && !isChineseCalendar
             && u_isdigit(text.charAt(start))
             && u_isdigit(text.charAt(start+1)))
         {
-                // only adjust year for patterns less than 3.
-                if(count < 3) {
-                        // Assume for example that the defaultCenturyStart is 6/18/1903.
-                        // This means that two-digit years will be forced into the range
-                        // 6/18/1903 to 6/17/2003.  As a result, years 00, 01, and 02
-                        // correspond to 2000, 2001, and 2002.  Years 04, 05, etc. correspond
-                        // to 1904, 1905, etc.  If the year is 03, then it is 2003 if the
-                        // other fields specify a date before 6/18, or 1903 if they specify a
-                        // date afterwards.  As a result, 03 is an ambiguous year.  All other
-                        // two-digit years are unambiguous.
-                        if(fHaveDefaultCentury) { // check if this formatter even has a pivot year
-                                int32_t ambiguousTwoDigitYear = fDefaultCenturyStartYear % 100;
-                                ambiguousYear[0] = (value == ambiguousTwoDigitYear);
-                                value += (fDefaultCenturyStartYear/100)*100 +
-                                                (value < ambiguousTwoDigitYear ? 100 : 0);
-                        }
+            // only adjust year for patterns less than 3.
+            if(count < 3) {
+                // Assume for example that the defaultCenturyStart is 6/18/1903.
+                // This means that two-digit years will be forced into the range
+                // 6/18/1903 to 6/17/2003.  As a result, years 00, 01, and 02
+                // correspond to 2000, 2001, and 2002.  Years 04, 05, etc. correspond
+                // to 1904, 1905, etc.  If the year is 03, then it is 2003 if the
+                // other fields specify a date before 6/18, or 1903 if they specify a
+                // date afterwards.  As a result, 03 is an ambiguous year.  All other
+                // two-digit years are unambiguous.
+                if(fHaveDefaultCentury) { // check if this formatter even has a pivot year
+                    int32_t ambiguousTwoDigitYear = fDefaultCenturyStartYear % 100;
+                    ambiguousYear[0] = (value == ambiguousTwoDigitYear);
+                    value += (fDefaultCenturyStartYear/100)*100 +
+                            (value < ambiguousTwoDigitYear ? 100 : 0);
+                }
             }
         }
         cal.set(UCAL_YEAR, value);
 
         // Delayed checking for adjustment of Hebrew month numbers in non-leap years.
         if (saveHebrewMonth >= 0) {
             HebrewCalendar *hc = (HebrewCalendar*)&cal;
             if (!hc->isLeapYear(value) && saveHebrewMonth >= 6) {
                cal.set(UCAL_MONTH,saveHebrewMonth);
             } else {
@@ skipping 69 matching lines @@
                 if (patternCharIndex==UDAT_MONTH_FIELD) {
                     wideMonthPat = &fSymbols->fLeapMonthPatterns[DateFormatSymbols::kLeapMonthPatternFormatWide];
                     shortMonthPat = &fSymbols->fLeapMonthPatterns[DateFormatSymbols::kLeapMonthPatternFormatAbbrev];
                 } else {
                     wideMonthPat = &fSymbols->fLeapMonthPatterns[DateFormatSymbols::kLeapMonthPatternStandaloneWide];
                     shortMonthPat = &fSymbols->fLeapMonthPatterns[DateFormatSymbols::kLeapMonthPatternStandaloneAbbrev];
                 }
             }
             int32_t newStart = 0;
             if (patternCharIndex==UDAT_MONTH_FIELD) {
-                newStart = matchString(text, start, UCAL_MONTH, fSymbols->fMonths, fSymbols->fMonthsCount, wideMonthPat, cal); // try MMMM
-                if (newStart > 0) {
-                    return newStart;
+                if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 4) {
+                    newStart = matchString(text, start, UCAL_MONTH, fSymbols->fMonths, fSymbols->fMonthsCount, wideMonthPat, cal); // try MMMM
+                    if (newStart > 0) {
+                        return newStart;
+                    }
                 }
-                newStart = matchString(text, start, UCAL_MONTH, fSymbols->fShortMonths, fSymbols->fShortMonthsCount, shortMonthPat, cal); // try MMM
+                if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 3) {
+                    newStart = matchString(text, start, UCAL_MONTH, fSymbols->fShortMonths, fSymbols->fShortMonthsCount, shortMonthPat, cal); // try MMM
+                }
             } else {
-                newStart = matchString(text, start, UCAL_MONTH, fSymbols->fStandaloneMonths, fSymbols->fStandaloneMonthsCount, wideMonthPat, cal); // try LLLL
-                if (newStart > 0) {
-                    return newStart;
+                if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 4) {
+                    newStart = matchString(text, start, UCAL_MONTH, fSymbols->fStandaloneMonths, fSymbols->fStandaloneMonthsCount, wideMonthPat, cal); // try LLLL
+                    if (newStart > 0) {
+                        return newStart;
+                    }
                 }
-                newStart = matchString(text, start, UCAL_MONTH, fSymbols->fStandaloneShortMonths, fSymbols->fStandaloneShortMonthsCount, shortMonthPat, cal); // try LLL
+                if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 3) {
+                    newStart = matchString(text, start, UCAL_MONTH, fSymbols->fStandaloneShortMonths, fSymbols->fStandaloneShortMonthsCount, shortMonthPat, cal); // try LLL
+                }
             }
             if (newStart > 0 || !getBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, status))  // currently we do not try to parse MMMMM/LLLLL: #8860
                 return newStart;
             // else we allowing parsing as number, below
         }
         break;
 
     case UDAT_HOUR_OF_DAY1_FIELD:
         // [We computed 'value' above.]
         if (value == cal.getMaximum(UCAL_HOUR_OF_DAY) + 1)
@@ skipping 31 matching lines @@
             cal.set(UCAL_DOW_LOCAL, value);
             return pos.getIndex();
         }
         // else for eee-eeeee fall through to handling of EEE-EEEEE
         // fall through, do not break here
     case UDAT_DAY_OF_WEEK_FIELD:
         {
             // Want to be able to parse both short and long forms.
             // Try count == 4 (EEEE) wide first:
             int32_t newStart = 0;
-            if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
-                                      fSymbols->fWeekdays, fSymbols->fWeekdaysCount, NULL, cal)) > 0)
-                return newStart;
+            if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 4) {
+                if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
+                                          fSymbols->fWeekdays, fSymbols->fWeekdaysCount, NULL, cal)) > 0)
+                    return newStart;
+            }
             // EEEE wide failed, now try EEE abbreviated
-            else if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
-                                   fSymbols->fShortWeekdays, fSymbols->fShortWeekdaysCount, NULL, cal)) > 0)
-                return newStart;
+            if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 3) {
+                if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
+                                       fSymbols->fShortWeekdays, fSymbols->fShortWeekdaysCount, NULL, cal)) > 0)
+                    return newStart;
+            }
             // EEE abbreviated failed, now try EEEEEE short
-            else if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
-                                   fSymbols->fShorterWeekdays, fSymbols->fShorterWeekdaysCount, NULL, cal)) > 0)
-                return newStart;
+            if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 6) {
+                if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
+                                       fSymbols->fShorterWeekdays, fSymbols->fShorterWeekdaysCount, NULL, cal)) > 0)
+                    return newStart;
+            }
             // EEEEEE short failed, now try EEEEE narrow
-            else if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
-                                   fSymbols->fNarrowWeekdays, fSymbols->fNarrowWeekdaysCount, NULL, cal)) > 0)
-                return newStart;
-            else if (!getBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, status) || patternCharIndex == UDAT_DAY_OF_WEEK_FIELD)
+            if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 5) {
+                if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
+                                       fSymbols->fNarrowWeekdays, fSymbols->fNarrowWeekdaysCount, NULL, cal)) > 0)
+                    return newStart;
+            }
+            if (!getBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, status) || patternCharIndex == UDAT_DAY_OF_WEEK_FIELD)
                 return newStart;
             // else we allowing parsing as number, below
         }
         break;
 
     case UDAT_STANDALONE_DAY_FIELD:
         {
             if (gotNumber) // c or cc
             {
                 // [We computed 'value' above.]
                 cal.set(UCAL_DOW_LOCAL, value);
                 return pos.getIndex();
             }
             // Want to be able to parse both short and long forms.
             // Try count == 4 (cccc) first:
             int32_t newStart = 0;
-            if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
+            if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 4) {
+                if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
                                       fSymbols->fStandaloneWeekdays, fSymbols->fStandaloneWeekdaysCount, NULL, cal)) > 0)
-                return newStart;
-            else if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
+                    return newStart;
+            }
+            if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 3) {
+                if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
                                           fSymbols->fStandaloneShortWeekdays, fSymbols->fStandaloneShortWeekdaysCount, NULL, cal)) > 0)
-                return newStart;
-            else if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
+                    return newStart;
+            }
+            if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 6) {
+                if ((newStart = matchString(text, start, UCAL_DAY_OF_WEEK,
                                           fSymbols->fStandaloneShorterWeekdays, fSymbols->fStandaloneShorterWeekdaysCount, NULL, cal)) > 0)
-                return newStart;
-            else if (!getBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, status))
+                    return newStart;
+            }
+            if (!getBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, status))
                 return newStart;
             // else we allowing parsing as number, below
         }
         break;
 
     case UDAT_AM_PM_FIELD:
         return matchString(text, start, UCAL_AM_PM, fSymbols->fAmPms, fSymbols->fAmPmsCount, NULL, cal);
 
     case UDAT_HOUR1_FIELD:
         // [We computed 'value' above.]
@@ skipping 13 matching lines @@
             // while pattern uses numeric style: Q or QQ.
             // [We computed 'value' above.]
             cal.set(UCAL_MONTH, (value - 1) * 3);
             return pos.getIndex();
         } else {
             // count >= 3 // i.e., QQQ or QQQQ
             // Want to be able to parse both short and long forms.
             // Try count == 4 first:
             int32_t newStart = 0;
 
-            if ((newStart = matchQuarterString(text, start, UCAL_MONTH,
+            if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 4) {
+                if ((newStart = matchQuarterString(text, start, UCAL_MONTH,
                                       fSymbols->fQuarters, fSymbols->fQuartersCount, cal)) > 0)
-                return newStart;
-            else if ((newStart = matchQuarterString(text, start, UCAL_MONTH,
+                    return newStart;
+            }
+            if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 3) {
+                if ((newStart = matchQuarterString(text, start, UCAL_MONTH,
                                           fSymbols->fShortQuarters, fSymbols->fShortQuartersCount, cal)) > 0)
-                return newStart;
-            else if (!getBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, status))
+                    return newStart;
+            }
+            if (!getBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, status))
                 return newStart;
             // else we allowing parsing as number, below
+            if(!getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status))
+                return -start;
         }
         break;
 
     case UDAT_STANDALONE_QUARTER_FIELD:
         if (gotNumber) // i.e., q or qq.
         {
             // Don't want to parse the month if it is a string
             // while pattern uses numeric style: q or q.
             // [We computed 'value' above.]
             cal.set(UCAL_MONTH, (value - 1) * 3);
             return pos.getIndex();
         } else {
             // count >= 3 // i.e., qqq or qqqq
             // Want to be able to parse both short and long forms.
             // Try count == 4 first:
             int32_t newStart = 0;
 
-            if ((newStart = matchQuarterString(text, start, UCAL_MONTH,
+            if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 4) {
+                if ((newStart = matchQuarterString(text, start, UCAL_MONTH,
                                       fSymbols->fStandaloneQuarters, fSymbols->fStandaloneQuartersCount, cal)) > 0)
-                return newStart;
-            else if ((newStart = matchQuarterString(text, start, UCAL_MONTH,
+                    return newStart;
+            }
+            if(getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status) || count == 3) {
+                if ((newStart = matchQuarterString(text, start, UCAL_MONTH,
                                           fSymbols->fStandaloneShortQuarters, fSymbols->fStandaloneShortQuartersCount, cal)) > 0)
-                return newStart;
-            else if (!getBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, status))
+                    return newStart;
+            }
+            if (!getBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, status))
                 return newStart;
             // else we allowing parsing as number, below
+            if(!getBooleanAttribute(UDAT_PARSE_MULTIPLE_PATTERNS_FOR_MATCH, status))
+                return -start;
         }
         break;
 
     case UDAT_TIMEZONE_FIELD: // 'z'
         {
-            UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
             UTimeZoneFormatStyle style = (count < 4) ? UTZFMT_STYLE_SPECIFIC_SHORT : UTZFMT_STYLE_SPECIFIC_LONG;
-            TimeZone *tz  = tzFormat()->parse(style, text, pos, &tzTimeType);
+            TimeZone *tz  = tzFormat()->parse(style, text, pos, tzTimeType);
             if (tz != NULL) {
-                ((SimpleDateFormat*)this)->tztype = tzTimeType;
                 cal.adoptTimeZone(tz);
                 return pos.getIndex();
             }
         }
         break;
     case UDAT_TIMEZONE_RFC_FIELD: // 'Z'
         {
-            UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
             UTimeZoneFormatStyle style = (count < 4) ?
                 UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL : ((count == 5) ? UTZFMT_STYLE_ISO_EXTENDED_FULL: UTZFMT_STYLE_LOCALIZED_GMT);
-            TimeZone *tz  = tzFormat()->parse(style, text, pos, &tzTimeType);
+            TimeZone *tz  = tzFormat()->parse(style, text, pos, tzTimeType);
             if (tz != NULL) {
-                ((SimpleDateFormat*)this)->tztype = tzTimeType;
                 cal.adoptTimeZone(tz);
                 return pos.getIndex();
             }
             return -start;
         }
     case UDAT_TIMEZONE_GENERIC_FIELD: // 'v'
         {
-            UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
             UTimeZoneFormatStyle style = (count < 4) ? UTZFMT_STYLE_GENERIC_SHORT : UTZFMT_STYLE_GENERIC_LONG;
-            TimeZone *tz  = tzFormat()->parse(style, text, pos, &tzTimeType);
+            TimeZone *tz  = tzFormat()->parse(style, text, pos, tzTimeType);
             if (tz != NULL) {
-                ((SimpleDateFormat*)this)->tztype = tzTimeType;
                 cal.adoptTimeZone(tz);
                 return pos.getIndex();
             }
             return -start;
         }
     case UDAT_TIMEZONE_SPECIAL_FIELD: // 'V'
         {
-            UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
             UTimeZoneFormatStyle style;
             switch (count) {
             case 1:
                 style = UTZFMT_STYLE_ZONE_ID_SHORT;
                 break;
             case 2:
                 style = UTZFMT_STYLE_ZONE_ID;
                 break;
             case 3:
                 style = UTZFMT_STYLE_EXEMPLAR_LOCATION;
                 break;
             default:
                 style = UTZFMT_STYLE_GENERIC_LOCATION;
                 break;
             }
-            TimeZone *tz  = tzFormat()->parse(style, text, pos, &tzTimeType);
+            TimeZone *tz  = tzFormat()->parse(style, text, pos, tzTimeType);
             if (tz != NULL) {
-                ((SimpleDateFormat*)this)->tztype = tzTimeType;
                 cal.adoptTimeZone(tz);
                 return pos.getIndex();
             }
             return -start;
         }
     case UDAT_TIMEZONE_LOCALIZED_GMT_OFFSET_FIELD: // 'O'
         {
-            UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
             UTimeZoneFormatStyle style = (count < 4) ? UTZFMT_STYLE_LOCALIZED_GMT_SHORT : UTZFMT_STYLE_LOCALIZED_GMT;
-            TimeZone *tz  = tzFormat()->parse(style, text, pos, &tzTimeType);
+            TimeZone *tz  = tzFormat()->parse(style, text, pos, tzTimeType);
             if (tz != NULL) {
-                ((SimpleDateFormat*)this)->tztype = tzTimeType;
                 cal.adoptTimeZone(tz);
                 return pos.getIndex();
             }
             return -start;
         }
     case UDAT_TIMEZONE_ISO_FIELD: // 'X'
         {
-            UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
             UTimeZoneFormatStyle style;
             switch (count) {
             case 1:
                 style = UTZFMT_STYLE_ISO_BASIC_SHORT;
                 break;
             case 2:
                 style = UTZFMT_STYLE_ISO_BASIC_FIXED;
                 break;
             case 3:
                 style = UTZFMT_STYLE_ISO_EXTENDED_FIXED;
                 break;
             case 4:
                 style = UTZFMT_STYLE_ISO_BASIC_FULL;
                 break;
             default:
                 style = UTZFMT_STYLE_ISO_EXTENDED_FULL;
                 break;
             }
-            TimeZone *tz  = tzFormat()->parse(style, text, pos, &tzTimeType);
+            TimeZone *tz  = tzFormat()->parse(style, text, pos, tzTimeType);
             if (tz != NULL) {
-                ((SimpleDateFormat*)this)->tztype = tzTimeType;
                 cal.adoptTimeZone(tz);
                 return pos.getIndex();
             }
             return -start;
         }
     case UDAT_TIMEZONE_ISO_LOCAL_FIELD: // 'x'
         {
-            UTimeZoneFormatTimeType tzTimeType = UTZFMT_TIME_TYPE_UNKNOWN;
             UTimeZoneFormatStyle style;
             switch (count) {
             case 1:
                 style = UTZFMT_STYLE_ISO_BASIC_LOCAL_SHORT;
                 break;
             case 2:
                 style = UTZFMT_STYLE_ISO_BASIC_LOCAL_FIXED;
                 break;
             case 3:
                 style = UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FIXED;
                 break;
             case 4:
                 style = UTZFMT_STYLE_ISO_BASIC_LOCAL_FULL;
                 break;
             default:
                 style = UTZFMT_STYLE_ISO_EXTENDED_LOCAL_FULL;
                 break;
             }
-            TimeZone *tz  = tzFormat()->parse(style, text, pos, &tzTimeType);
+            TimeZone *tz  = tzFormat()->parse(style, text, pos, tzTimeType);
             if (tz != NULL) {
-                ((SimpleDateFormat*)this)->tztype = tzTimeType;
                 cal.adoptTimeZone(tz);
                 return pos.getIndex();
             }
             return -start;
         }
 
     default:
         // Handle "generic" fields
         // this is now handled below, outside the switch block
         break;
@@ skipping 54 matching lines @@
             cal.set(UCAL_MONTH, value - 1);
             break;
         case UDAT_DOW_LOCAL_FIELD:
         case UDAT_STANDALONE_DAY_FIELD:
             cal.set(UCAL_DOW_LOCAL, value);
             break;
         case UDAT_QUARTER_FIELD:
         case UDAT_STANDALONE_QUARTER_FIELD:
              cal.set(UCAL_MONTH, (value - 1) * 3);
              break;
+        case UDAT_RELATED_YEAR_FIELD:
+            cal.setRelatedYear(value);
+            break;
         default:
             cal.set(field, value);
             break;
         }
         return pos.getIndex();
     }
     return -start;
 }
 
 /**
@@ skipping 189 matching lines @@
   delete fSymbols;
   fSymbols=NULL;
   initializeSymbols(fLocale, fCalendar, status);  // we need new symbols
   initializeDefaultCentury();  // we need a new century (possibly)
 }
 
 
 //----------------------------------------------------------------------
 
 
-void SimpleDateFormat::setContext(UDisplayContext value, UErrorCode& status)
+// override the DateFormat implementation in order to
+// lazily initialize fCapitalizationBrkIter
+void
+SimpleDateFormat::setContext(UDisplayContext value, UErrorCode& status)
 {
-    if (U_FAILURE(status))
-        return;
-    if ( (UDisplayContextType)((uint32_t)value >> 8) == UDISPCTX_TYPE_CAPITALIZATION ) {
-        fCapitalizationContext = value;
-    } else {
-        status = U_ILLEGAL_ARGUMENT_ERROR;
-   }
+    DateFormat::setContext(value, status);
+#if !UCONFIG_NO_BREAK_ITERATION
+    if (U_SUCCESS(status)) {
+        if ( fCapitalizationBrkIter == NULL && (value==UDISPCTX_CAPITALIZATION_FOR_BEGINNING_OF_SENTENCE ||
+                value==UDISPCTX_CAPITALIZATION_FOR_UI_LIST_OR_MENU || value==UDISPCTX_CAPITALIZATION_FOR_STANDALONE) ) {
+            UErrorCode status = U_ZERO_ERROR;
+            fCapitalizationBrkIter = BreakIterator::createSentenceInstance(fLocale, status);
+            if (U_FAILURE(status)) {
+                delete fCapitalizationBrkIter;
+                fCapitalizationBrkIter = NULL;
+            }
+        }
+    }
+#endif
 }
 
 
-//----------------------------------------------------------------------
-
-
-UDisplayContext SimpleDateFormat::getContext(UDisplayContextType type, UErrorCode& status) const
-{
-    if (U_FAILURE(status))
-        return (UDisplayContext)0;
-    if (type != UDISPCTX_TYPE_CAPITALIZATION) {
-        status = U_ILLEGAL_ARGUMENT_ERROR;
-        return (UDisplayContext)0;
-    }
-    return fCapitalizationContext;
-}
-
-
 //----------------------------------------------------------------------
 
 
 UBool
 SimpleDateFormat::isFieldUnitIgnored(UCalendarDateFields field) const {
     return isFieldUnitIgnored(fPattern, field);
 }
 
 
 UBool
@@ skipping 208 matching lines @@
         umtx_unlock(&LOCK);
     }
     return fTimeZoneFormat;
 }
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 //eof