Update ICU to 54.1 step 1

source/i18n/datefmt.cpp

 /*
  *******************************************************************************
- * Copyright (C) 1997-2013, International Business Machines Corporation and    *
+ * Copyright (C) 1997-2014, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  *
  * File DATEFMT.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.
  *   08/12/97    aliu        Fixed operator== to use Calendar::equivalentTo.
  *   07/20/98    stephen     Changed ParsePosition initialization
  ********************************************************************************
  */
 
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/ures.h"
 #include "unicode/datefmt.h"
 #include "unicode/smpdtfmt.h"
 #include "unicode/dtptngen.h"
+#include "unicode/udisplaycontext.h"
 #include "reldtfmt.h"
 
 #include "cstring.h"
 #include "windtfmt.h"
 
 #if defined( U_DEBUG_CALSVC ) || defined (U_DEBUG_CAL)
 #include <stdio.h>
 #endif
 
 // *****************************************************************************
 // class DateFormat
 // *****************************************************************************
 
 U_NAMESPACE_BEGIN
 
 DateFormat::DateFormat()
 :   fCalendar(0),
-    fNumberFormat(0)
+    fNumberFormat(0),
+    fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE)
 {
 }
 
 //----------------------------------------------------------------------
 
 DateFormat::DateFormat(const DateFormat& other)
 :   Format(other),
     fCalendar(0),
-    fNumberFormat(0)
+    fNumberFormat(0),
+    fCapitalizationContext(UDISPCTX_CAPITALIZATION_NONE)
 {
     *this = other;
 }
 
 //----------------------------------------------------------------------
 
 DateFormat& DateFormat::operator=(const DateFormat& other)
 {
     if (this != &other)
     {
         delete fCalendar;
         delete fNumberFormat;
         if(other.fCalendar) {
           fCalendar = other.fCalendar->clone();
         } else {
           fCalendar = NULL;
         }
         if(other.fNumberFormat) {
           fNumberFormat = (NumberFormat*)other.fNumberFormat->clone();
         } else {
           fNumberFormat = NULL;
         }
         fBoolFlags = other.fBoolFlags;
+        fCapitalizationContext = other.fCapitalizationContext;
     }
     return *this;
 }
 
 //----------------------------------------------------------------------
 
 DateFormat::~DateFormat()
 {
     delete fCalendar;
     delete fNumberFormat;
 }
 
 //----------------------------------------------------------------------
 
 UBool
 DateFormat::operator==(const Format& other) const
 {
     // This protected comparison operator should only be called by subclasses
     // which have confirmed that the other object being compared against is
     // an instance of a sublcass of DateFormat.  THIS IS IMPORTANT.
 
     // Format::operator== guarantees that this cast is safe
     DateFormat* fmt = (DateFormat*)&other;
 
     return (this == fmt) ||
         (Format::operator==(other) &&
          fCalendar&&(fCalendar->isEquivalentTo(*fmt->fCalendar)) &&
-         (fNumberFormat && *fNumberFormat == *fmt->fNumberFormat));
+         (fNumberFormat && *fNumberFormat == *fmt->fNumberFormat) &&
+         (fCapitalizationContext == fmt->fCapitalizationContext) );
 }
 
 //----------------------------------------------------------------------
 
 UnicodeString&
 DateFormat::format(const Formattable& obj,
                    UnicodeString& appendTo,
                    FieldPosition& fieldPosition,
                    UErrorCode& status) const
 {
@@ skipping 375 matching lines @@
 }
 
 //----------------------------------------------------------------------
 
 void
 DateFormat::setLenient(UBool lenient)
 {
     if (fCalendar != NULL) {
         fCalendar->setLenient(lenient);
     }
+    UErrorCode status = U_ZERO_ERROR;
+    setBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, lenient, status);
+    setBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, lenient, status);
 }
 
 //----------------------------------------------------------------------
 
 UBool
 DateFormat::isLenient() const
 {
+    UBool lenient = TRUE;
+    if (fCalendar != NULL) {
+        lenient = fCalendar->isLenient();
+    }
+    UErrorCode status = U_ZERO_ERROR;
+    return lenient
+        && getBooleanAttribute(UDAT_PARSE_ALLOW_WHITESPACE, status)
+        && getBooleanAttribute(UDAT_PARSE_ALLOW_NUMERIC, status);
+}
+
+void
+DateFormat::setCalendarLenient(UBool lenient)
+{
+    if (fCalendar != NULL) {
+        fCalendar->setLenient(lenient);
+    }
+}
+
+//----------------------------------------------------------------------
+
+UBool
+DateFormat::isCalendarLenient() const
+{
     if (fCalendar != NULL) {
         return fCalendar->isLenient();
     }
     // fCalendar is rarely null
     return FALSE;
 }
 
+
 //----------------------------------------------------------------------
 
+
+void DateFormat::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;
+   }
+}
+
+
+//----------------------------------------------------------------------
+
+
+UDisplayContext DateFormat::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;
+}
+
+
+//----------------------------------------------------------------------
+
+
 DateFormat& 
 DateFormat::setBooleanAttribute(UDateFormatBooleanAttribute attr,
                                                                         UBool newValue,
                                                                         UErrorCode &status) {
     if(!fBoolFlags.isValidValue(newValue)) {
         status = U_ILLEGAL_ARGUMENT_ERROR;
     } else {
         fBoolFlags.set(attr, newValue);
     }
 
     return *this;
 }
 
 //----------------------------------------------------------------------
 
 UBool 
 DateFormat::getBooleanAttribute(UDateFormatBooleanAttribute attr, UErrorCode &/*status*/) const {
 
     return fBoolFlags.get(attr);
 }
 
 U_NAMESPACE_END
 
 #endif /* #if !UCONFIG_NO_FORMATTING */
 
 //eof