ICU-9091 Updates based on PMC discussion, also remove some inappropriate #ifndef...

X-SVN-Rev: 31486

diff --git a/icu4c/source/common/unicode/messagepattern.h b/icu4c/source/common/unicode/messagepattern.h
index 55b4c7d2b5975be213b3d618c4a510402aea21f4..84af565fb59e58311b8dde5006f97eeeb7844790 100644 (file)
--- a/icu4c/source/common/unicode/messagepattern.h
+++ b/icu4c/source/common/unicode/messagepattern.h
@@ -23,7 +23,6 @@
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_FORMATTING
-/* #ifndef U_HIDE_DRAFT_API -- cannot be hidden, as this API is used by other API public classes. */
 
 #include "unicode/parseerr.h"
 #include "unicode/unistr.h"
@@ -254,9 +253,6 @@ enum UMessagePatternArgType {
  */
 typedef enum UMessagePatternArgType UMessagePatternArgType;
 
-/**
- * @stable ICU 4.8
- */
 enum {
     /**
      * Return value from MessagePattern.validateArgumentName() for when

diff --git a/icu4c/source/common/unicode/uenum.h b/icu4c/source/common/unicode/uenum.h
index 792d68d9f4c3002dfc6576a47ee279cbf5f9fac5..21e82b2384a54c88c0a8259417db6870af09ebce 100644 (file)
--- a/icu4c/source/common/unicode/uenum.h
+++ b/icu4c/source/common/unicode/uenum.h
@@ -1,7 +1,7 @@
 /*
 *******************************************************************************
 *
-*   Copyright (C) 2002-2011, International Business Machines
+*   Copyright (C) 2002-2012, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 *
 *******************************************************************************
@@ -157,7 +157,6 @@ uenum_reset(UEnumeration* en, UErrorCode* status);
 
 #if U_SHOW_CPLUSPLUS_API
 
-#ifndef U_HIDE_DRAFT_API
 /**
  * Given a StringEnumeration, wrap it in a UEnumeration.  The
  * StringEnumeration is adopted; after this call, the caller must not
@@ -165,11 +164,10 @@ uenum_reset(UEnumeration* en, UErrorCode* status);
  * @param adopted the C++ StringEnumeration to be wrapped in a UEnumeration.
  * @param ec the error code.
  * @return a UEnumeration wrapping the adopted StringEnumeration.
- * @draft ICU 4.2
+ * @stable ICU 4.2
  */
 U_CAPI UEnumeration* U_EXPORT2
 uenum_openFromStringEnumeration(icu::StringEnumeration* adopted, UErrorCode* ec);
-#endif  /* U_HIDE_DRAFT_API */
 
 #endif
 

diff --git a/icu4c/source/i18n/unicode/dcfmtsym.h b/icu4c/source/i18n/unicode/dcfmtsym.h
index e0595250758f1e919d0f2d4ee26a519f2e183215..2d013d52d55f3a0443c7386f5660c50f255334f7 100644 (file)
--- a/icu4c/source/i18n/unicode/dcfmtsym.h
+++ b/icu4c/source/i18n/unicode/dcfmtsym.h
@@ -128,39 +128,39 @@ public:
          */
         kMonetaryGroupingSeparatorSymbol,
         /** One
-         * @draft ICU 4.6
+         * @stable ICU 4.6
          */
         kOneDigitSymbol,
         /** Two
-         * @draft ICU 4.6
+         * @stable ICU 4.6
          */
         kTwoDigitSymbol,
         /** Three
-         * @draft ICU 4.6
+         * @stable ICU 4.6
          */
         kThreeDigitSymbol,
         /** Four
-         * @draft ICU 4.6
+         * @stable ICU 4.6
          */
         kFourDigitSymbol,
         /** Five
-         * @draft ICU 4.6
+         * @stable ICU 4.6
          */
         kFiveDigitSymbol,
         /** Six
-         * @draft ICU 4.6
+         * @stable ICU 4.6
          */
         kSixDigitSymbol,
         /** Seven
-         * @draft ICU 4.6
+         * @stable ICU 4.6
          */
         kSevenDigitSymbol,
         /** Eight
-         * @draft ICU 4.6
+         * @stable ICU 4.6
          */
         kEightDigitSymbol,
         /** Nine
-         * @draft ICU 4.6
+         * @stable ICU 4.6
          */
         kNineDigitSymbol,
         /** count symbol constants */

diff --git a/icu4c/source/i18n/unicode/decimfmt.h b/icu4c/source/i18n/unicode/decimfmt.h
index afb5572121fe71307aa33a5ac7ef18dbb9c45076..04cef4290363f5b077a279a9695c9be2cc873588 100644 (file)
--- a/icu4c/source/i18n/unicode/decimfmt.h
+++ b/icu4c/source/i18n/unicode/decimfmt.h
@@ -658,13 +658,11 @@ public:
                              towards zero if equidistant */
         kRoundHalfUp,   /**< Round towards the nearest integer, or
                              away from zero if equidistant */
-#ifndef U_HIDE_DRAFT_API
         /**
           *  Return U_FORMAT_INEXACT_ERROR if number does not format exactly. 
-          *  @draft ICU 4.8 
+          *  @stable ICU 4.8 
           */
         kRoundUnnecessary
-#endif  /* U_HIDE_DRAFT_API */
     };
 
     /**
@@ -1109,7 +1107,7 @@ public:
                        Formattable& result,
                        UErrorCode& status) const;
 
-#ifndef U_HIDE_DRAFT_API
+/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
     /**
      * Parses text from the given string as a currency amount.  Unlike
      * the parse() method, this method will attempt to parse a generic
@@ -1131,7 +1129,6 @@ public:
      */
     virtual CurrencyAmount* parseCurrency(const UnicodeString& text,
                                           ParsePosition& pos) const;
-#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Returns the decimal format symbols, which is generally not changed

diff --git a/icu4c/source/i18n/unicode/gregocal.h b/icu4c/source/i18n/unicode/gregocal.h
index 6ae08edec8eed77d2665b2e118d357096a88b707..3a618397d12ffc88f102f3e054f6c543318262bf 100644 (file)
--- a/icu4c/source/i18n/unicode/gregocal.h
+++ b/icu4c/source/i18n/unicode/gregocal.h
@@ -468,6 +468,7 @@ public:
      */
     static UClassID U_EXPORT2 getStaticClassID(void);
 
+/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
     /**
      * Returns the calendar type name string for this Calendar object.
      * The returned string is the legacy ICU calendar attribute value,

diff --git a/icu4c/source/i18n/unicode/numfmt.h b/icu4c/source/i18n/unicode/numfmt.h
index bec59a4962198755b117b4c21eeb23c7bdb97a7c..240983cc1b291b22941cfe39b50dd7a25d0e04b4 100644 (file)
--- a/icu4c/source/i18n/unicode/numfmt.h
+++ b/icu4c/source/i18n/unicode/numfmt.h
@@ -570,7 +570,7 @@ public:
                         Formattable& result,
                         UErrorCode& status) const;
 
-#ifndef U_HIDE_DRAFT_API
+/* Cannot use #ifndef U_HIDE_DRAFT_API for the following draft method since it is virtual */
     /**
      * Parses text from the given string as a currency amount.  Unlike
      * the parse() method, this method will attempt to parse a generic
@@ -592,7 +592,6 @@ public:
      */
     virtual CurrencyAmount* parseCurrency(const UnicodeString& text,
                                           ParsePosition& pos) const;
-#endif  /* U_HIDE_DRAFT_API */
 
     /**
      * Return true if this format will parse numbers as integers

diff --git a/icu4c/source/layout/LEScripts.h b/icu4c/source/layout/LEScripts.h
index e5c0a3633a2239bc3727934e3cea3035ed0b0c1d..6dc68ffcfd2b714639688265d904fa3107e3faed 100644 (file)
--- a/icu4c/source/layout/LEScripts.h
+++ b/icu4c/source/layout/LEScripts.h
@@ -1,6 +1,6 @@
 /*
  *
- * (C) Copyright IBM Corp. 1998-2011. All Rights Reserved.
+ * (C) Copyright IBM Corp. 1998-2012. All Rights Reserved.
  *
  * WARNING: THIS FILE IS MACHINE GENERATED. DO NOT HAND EDIT IT UNLESS
  * YOU REALLY KNOW WHAT YOU'RE DOING.
@@ -230,7 +230,7 @@ enum ScriptCodes {
     tangScriptCode = 154,
     woleScriptCode = 155,
 /**
- * @stable ICU 49.0
+ * @stable ICU 49
  */
 
     khojScriptCode = 156,