X-Git-Url: https://git.saurik.com/apple/icu.git/blobdiff_plain/729e4ab9bc6618bc3d8a898e575df7f4019e29ca..51004dcb01e06fef634b61be77ed73dd61cb6db9:/icuSources/i18n/reldtfmt.h

diff --git a/icuSources/i18n/reldtfmt.h b/icuSources/i18n/reldtfmt.h
index d90ef004..1206ea3a 100644
--- a/icuSources/i18n/reldtfmt.h
+++ b/icuSources/i18n/reldtfmt.h
@@ -1,6 +1,6 @@
 /*
 *******************************************************************************
-* Copyright (C) 2007-2010, International Business Machines Corporation and    *
+* Copyright (C) 2007-2012, International Business Machines Corporation and    *
 * others. All Rights Reserved.                                                *
 *******************************************************************************
 */
@@ -18,6 +18,7 @@
 #if !UCONFIG_NO_FORMATTING
 
 #include "unicode/datefmt.h"
+#include "unicode/smpdtfmt.h"
 
 U_NAMESPACE_BEGIN
 
@@ -35,7 +36,7 @@ struct URelativeString;
  * Example:
  *     DateFormat *fullrelative = DateFormat::createDateInstance(DateFormat::kFullRelative, loc);
  *
- * @draft ICU 3.8
+ * @internal ICU 3.8
  */
 
 class RelativeDateFormat : public DateFormat {
@@ -45,19 +46,19 @@ public:
     // overrides
     /**
      * Copy constructor.
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     RelativeDateFormat(const RelativeDateFormat&);
 
     /**
      * Assignment operator.
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     RelativeDateFormat& operator=(const RelativeDateFormat&);
 
     /**
      * Destructor.
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     virtual ~RelativeDateFormat();
 
@@ -65,7 +66,7 @@ public:
      * Clone this Format object polymorphically. The caller owns the result and
      * should delete it when done.
      * @return    A copy of the object.
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     virtual Format* clone(void) const;
 
@@ -74,7 +75,7 @@ public:
      * of different subclasses are considered unequal.
      * @param other    the object to be compared with.
      * @return         true if the given Format objects are semantically equal.
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     virtual UBool operator==(const Format& other) const;
 
@@ -95,7 +96,7 @@ public:
      * @param pos       The formatting position. On input: an alignment field,
      *                  if desired. On output: the offsets of the alignment field.
      * @return          Reference to 'appendTo' parameter.
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     virtual UnicodeString& format(  Calendar& cal,
                                     UnicodeString& appendTo,
@@ -113,7 +114,7 @@ public:
      *                  On output: the offsets of the alignment field.
      * @param status    Output param filled with success/failure status.
      * @return          Reference to 'appendTo' parameter.
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     virtual UnicodeString& format(const Formattable& obj,
                                   UnicodeString& appendTo,
@@ -138,7 +139,7 @@ public:
      *              output, the position at which parsing terminated, or the
      *              start position if the parse failed.
      * @return      A valid UDate if the input could be parsed.
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     virtual void parse( const UnicodeString& text,
                         Calendar& cal,
@@ -161,7 +162,7 @@ public:
      *              output, the position at which parsing terminated, or the
      *              start position if the parse failed.
      * @return      A valid UDate if the input could be parsed.
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     UDate parse( const UnicodeString& text,
                  ParsePosition& pos) const;
@@ -180,7 +181,7 @@ public:
      * @param status Filled in with U_ZERO_ERROR if the parse was successful, and with
      *              an error value if there was a parse error.
      * @return      A valid UDate if the input could be parsed.
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     virtual UDate parse( const UnicodeString& text,
                         UErrorCode& status) const;
@@ -227,18 +228,18 @@ public:
      * names and abbreviations, time zone names, AM/PM strings, etc.)
      * @return a copy of the date-time formatting data associated
      * with this date-time formatter.
-     * @internal ICU 4.8 technology preview
+     * @internal ICU 4.8
      */
     virtual const DateFormatSymbols* getDateFormatSymbols(void) const;
 
 
 private:
-    DateFormat *fDateFormat; // the held date format
-    DateFormat *fTimeFormat; // the held time format
+    SimpleDateFormat *fDateTimeFormatter;
+    UnicodeString fDatePattern;
+    UnicodeString fTimePattern;
     MessageFormat *fCombinedFormat; //  the {0} {1} format.
 
     UDateFormatStyle fDateStyle;
-    UDateFormatStyle fTimeStyle;
     Locale  fLocale;
 
     int32_t fDayMin;    // day id of lowest #
@@ -271,7 +272,7 @@ private:
      * @param locale Locale of the calendar
      * @param status Error code
      * @return the newly constructed fCalendar
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     Calendar* initializeCalendar(TimeZone* adoptZone, const Locale& locale, UErrorCode& status);
 
@@ -285,7 +286,7 @@ public:
      * .       erived::getStaticClassID()) ...
      * </pre>
      * @return          The class ID for all objects of this class.
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     U_I18N_API static UClassID U_EXPORT2 getStaticClassID(void);
 
@@ -298,7 +299,7 @@ public:
      * @return          The class ID for this object. All objects of a
      *                  given class have the same class ID.  Objects of
      *                  other classes have different class IDs.
-     * @draft ICU 3.8
+     * @internal ICU 3.8
      */
     virtual UClassID getDynamicClassID(void) const;
 };