jodastephen

diff -r 05525f23180e src/share/classes/java/time/ZoneId.java
--- a/src/share/classes/java/time/ZoneId.java  Fri Feb 08 09:11:51 2013 -0800
+++ b/src/share/classes/java/time/ZoneId.java	Mon Feb 11 20:14:51 2013 +0000
@@ -93,6 +93,8 @@
  *  the offset from UTC/Greenwich apply
  * </ul><p>
  * Most fixed offsets are represented by {@link ZoneOffset}.
+ * Calling {@link #normalized()} on any {@code ZoneId} will ensure that a
+ * fixed offset ID will be represented as a {@code ZoneOffset}.
  * <p>

jodastephen

# HG changeset patch
# User scolebourne
# Date 1361280934 0
# Node ID d89b0d612e3c4e44e31934f24b972bb0ae22edca
# Parent  8abd40f9e8efb0aa295935698b3505ffdfcb7820
Fix tests which test implementation, not spec

diff --git a/test/java/time/tck/java/time/format/TCKDateTimeFormatters.java b/test/java/time/tck/java/time/format/TCKDateTimeFormatters.java
--- a/test/java/time/tck/java/time/format/TCKDateTimeFormatters.java
+++ b/test/java/time/tck/java/time/format/TCKDateTimeFormatters.java

jodastephen

# HG changeset patch
# User scolebourne
# Date 1361400915 0
# Node ID 2af8a403982a05882590b6208ba143d1782f29dd
# Parent  d468d92a8986851ad83330bafa0f440a53216a6e
Rename EPOCH_MONTH to PROLEPTIC_MONTH

Redefine to be zero year based
Implement in non-ISO calendar systems
See #266

jodastephen

# HG changeset patch
# User scolebourne
# Date 1361982846 0
# Node ID ac8dfa77cb919d1554b78ee6fd0ae12f53ea391d
# Parent  27b30fa91ee0f519ad4dda6efad4b221aebf9fff
Move date resolution to Chronology

See #268

diff --git a/src/share/classes/java/time/chrono/Chronology.java b/src/share/classes/java/time/chrono/Chronology.java

jodastephen

# HG changeset patch
# User scolebourne
# Date 1362570460 0
# Node ID c88c08f0effb88814251de6cf980a7d62972ae36
# Parent  d35363a560573014ee988db75278887a7fb50c72
Rename instance variable

diff --git a/src/share/classes/java/time/format/DateTimeBuilder.java b/src/share/classes/java/time/format/DateTimeBuilder.java
--- a/src/share/classes/java/time/format/DateTimeBuilder.java
+++ b/src/share/classes/java/time/format/DateTimeBuilder.java

jodastephen

# HG changeset patch
# User scolebourne
# Date 1362681211 0
# Node ID 4eee025632151c4cb7c1f2c46f5125bb7bb5fc62
# Parent  8aca6a33db804462acda2c85fea8d7857be14774
Refactor, enhance and test resolving logic

Remove public resolveYearOfEra method

diff --git a/src/share/classes/java/time/chrono/Chronology.java b/src/share/classes/java/time/chrono/Chronology.java

jodastephen

# HG changeset patch
# User scolebourne
# Date 1362682148 0
# Node ID b22816993460cfefe157637cd6e47ba5e2021ccb
# Parent  4eee025632151c4cb7c1f2c46f5125bb7bb5fc62
Add ZoneId.getAvailableZoneIds()

diff --git a/src/share/classes/java/time/ZoneId.java b/src/share/classes/java/time/ZoneId.java
--- a/src/share/classes/java/time/ZoneId.java
+++ b/src/share/classes/java/time/ZoneId.java

jodastephen

# HG changeset patch
# User scolebourne
# Date 1362954526 0
# Node ID 248111f161af57d7844891b96ef0ed1f9e588146
# Parent  02b563dff2307edafa5a0b49c5b3ff55e3f8a1de
Enhance and fix eras

Fix range of Japanese and Hijrah, with tests
Unify Javadoc styles
Add Javadoc tables for year-of-era where appropriate

jodastephen

diff --git a/src/share/classes/java/time/LocalDate.java b/src/share/classes/java/time/LocalDate.java
--- a/src/share/classes/java/time/LocalDate.java
+++ b/src/share/classes/java/time/LocalDate.java
@@ -127,7 +127,7 @@
  * @since 1.8
  */
 public final class LocalDate
-        implements Temporal, TemporalAdjuster, ChronoLocalDate<LocalDate>, Serializable {
+        implements Temporal, TemporalAdjuster, ChronoLocalDate, Serializable {
 

jodastephen

diff -r 835edcf9578a src/share/classes/java/time/format/Parsed.java
--- a/src/share/classes/java/time/format/Parsed.java  Mon Apr 15 20:58:15 2013 +0100
+++ b/src/share/classes/java/time/format/Parsed.java	Tue Apr 16 00:05:20 2013 +0100
@@ -308,17 +308,24 @@
     private void resolveTimeFields() {
         // simplify fields
         if (fieldValues.containsKey(CLOCK_HOUR_OF_DAY)) {
-            long ch = fieldValues.remove(CLOCK_HOUR_OF_DAY);
+            long ch = CLOCK_HOUR_OF_DAY.checkValidValue(fieldValues.remove(CLOCK_HOUR_OF_DAY));
             updateCheckConflict(CLOCK_HOUR_OF_DAY, HOUR_OF_DAY, ch == 24 ? 0 : ch);