Upgrade ICU4J.

[Dictionary.git] / jars / icu4j-52_1 / main / classes / core / src / com / ibm / icu / util / JapaneseCalendar.java

diff --git a/jars/icu4j-4_8_1_1/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java b/jars/icu4j-52_1/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java
similarity index 99%
rename from jars/icu4j-4_8_1_1/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java
rename to jars/icu4j-52_1/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java
index 8bfacd2af47d49139653d535c5b623b5ca7fc8d0..9e71a79a272365ad1b37a78aa2fedf870188f219 100644 (file)
--- a/jars/icu4j-4_8_1_1/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java
+++ b/jars/icu4j-52_1/main/classes/core/src/com/ibm/icu/util/JapaneseCalendar.java
@@ -1,6 +1,6 @@
 /*
  *******************************************************************************
- * Copyright (C) 1996-2010, International Business Machines Corporation and    *
+ * Copyright (C) 1996-2010,2012, International Business Machines Corporation and    *
  * others. All Rights Reserved.                                                *
  *******************************************************************************
  */
@@ -607,7 +607,7 @@ public class JapaneseCalendar extends GregorianCalendar {
         switch (field) {
         case ERA:
             if (limitType == MINIMUM || limitType == GREATEST_MINIMUM) {
-                return 1;
+                return 0;
             }
             return CURRENT_ERA;
         case YEAR: