ICU-8803 make Calendar.getType() public and improve API docs

X-SVN-Rev: 31386

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/BuddhistCalendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/BuddhistCalendar.java
index acbae9c2afd88d6c661c0f3e6f6fae3e44dd4871..20eb3760824992884684e32a90b997e7a5afe96b 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/BuddhistCalendar.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/BuddhistCalendar.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 1996-2010, International Business Machines Corporation and    *
+ * Copyright (C) 1996-2012, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -236,8 +236,7 @@ public class BuddhistCalendar extends GregorianCalendar {
     }
     
     /**
-     * Return the current Calendar type.
-     * @return type of calendar
+     * {@inheritDoc}
      * @stable ICU 3.8
      */
     public String getType() {

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java
index c627da66970a1191c7cc9023e2e8a29ca0c2f4a9..3db705fe5450fa5883330056eacf1c1d478c8b8e 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/Calendar.java
@@ -1,5 +1,5 @@
 /*
-*   Copyright (C) 1996-2011, International Business Machines
+*   Copyright (C) 1996-2012, International Business Machines
 *   Corporation and others.  All Rights Reserved.
 */
 
@@ -5568,9 +5568,14 @@ public abstract class Calendar implements Serializable, Cloneable, Comparable<Ca
     }
 
     /**
-     * {@icu} Returns the current Calendar type.  Note, in 3.0 this function will return
-     * 'gregorian' in Calendar to emulate legacy behavior
-     * @return type of calendar (gregorian, etc)
+     * {@icu} Returns the calendar type name string for this Calendar object.
+     * The returned string is the legacy ICU calendar attribute value,
+     * for example, "gregorian" or "japanese".
+     *
+     * <p>See type="old type name" for the calendar attribute of locale IDs
+     * at http://www.unicode.org/reports/tr35/#Key_Type_Definitions
+     *
+     * @return legacy calendar type name string
      * @stable ICU 3.8
      */
     public String getType() {

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java
index c85eda39fbbbb6750e339d8e23f0e41df0d8bde8..3781a7af76c9a51bebec3db753c0fed255a8cd1e 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/ChineseCalendar.java
@@ -1016,8 +1016,7 @@ public class ChineseCalendar extends Calendar {
     }
 
     /**
-     * Return the current Calendar type.
-     * @return type of calendar
+     * {@inheritDoc}
      * @stable ICU 3.8
      */
     public String getType() {

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/EthiopicCalendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/EthiopicCalendar.java
index e33c177a69d8120d59a167c77185d7dd7639e1eb..cf5535c86c39aea7998cb1022f6d24a8d5fcd05d 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/EthiopicCalendar.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/EthiopicCalendar.java
@@ -1,7 +1,7 @@
 /*
  *******************************************************************************
- * Copyright (C) 2005-2008, International Business Machines Corporation and    *
- * others. All Rights Reserved.                                                *
+ * Copyright (C) 2005-2012, International Business Machines Corporation and
+ * others. All Rights Reserved.
  *******************************************************************************
  */
 
@@ -256,7 +256,6 @@ public final class EthiopicCalendar extends CECalendar
 
     /**
      * {@inheritDoc}
-     * @return type of calendar
      * @stable ICU 3.8
      */
     public String getType() {

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/GregorianCalendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/GregorianCalendar.java
index 19994d370a878c5048788e22108c49f5d4754def..8628adae0e5f454bb6059c2707480749a28848ec 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/GregorianCalendar.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/GregorianCalendar.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1996-2011, International Business Machines
+ * Copyright (C) 1996-2012, International Business Machines
  * Corporation and others.  All Rights Reserved.
  */
 
@@ -884,8 +884,7 @@ public class GregorianCalendar extends Calendar {
     }
 
     /**
-     * Return the current Calendar type.
-     * @return type of calendar
+     * {@inheritDoc}
      * @stable ICU 3.8
      */
     public String getType() {

diff --git a/icu4j/main/classes/core/src/com/ibm/icu/util/HebrewCalendar.java b/icu4j/main/classes/core/src/com/ibm/icu/util/HebrewCalendar.java
index 864779f0f7c96f46c473340f2565e87bcee10208..9e60724cab4650416e0f6dacc2293c100cd5d337 100644 (file)
--- a/icu4j/main/classes/core/src/com/ibm/icu/util/HebrewCalendar.java
+++ b/icu4j/main/classes/core/src/com/ibm/icu/util/HebrewCalendar.java
@@ -1,7 +1,7 @@
 /*
  *******************************************************************************
- * Copyright (C) 1996-2011, International Business Machines Corporation and    *
- * others. All Rights Reserved.                                                *
+ * Copyright (C) 1996-2012, International Business Machines Corporation and
+ * others. All Rights Reserved.
  *******************************************************************************
  */
 package com.ibm.icu.util;
@@ -855,8 +855,7 @@ public class HebrewCalendar extends Calendar {
     }
 
     /**
-     * Return the current Calendar type.
-     * @return type of calendar
+     * {@inheritDoc}
      * @stable ICU 3.8
      */
     public String getType() {