jodastephen

diff --git a/src/share/classes/java/time/Duration.java b/src/share/classes/java/time/Duration.java
--- a/src/share/classes/java/time/Duration.java
+++ b/src/share/classes/java/time/Duration.java
@@ -62,9 +62,13 @@
 package java.time;
 
 import static java.time.LocalTime.SECONDS_PER_DAY;
+import static java.time.LocalTime.SECONDS_PER_HOUR;
+import static java.time.LocalTime.SECONDS_PER_MINUTE;
 import static java.time.temporal.ChronoField.INSTANT_SECONDS;

jodastephen

diff --git a/src/share/classes/java/time/ZoneRegion.java b/src/share/classes/java/time/ZoneRegion.java
--- a/src/share/classes/java/time/ZoneRegion.java
+++ b/src/share/classes/java/time/ZoneRegion.java
@@ -146,7 +146,7 @@
         ZoneRules rules = null;
         try {
             // always attempt load for better behavior after deserialization
-            rules = ZoneRulesProvider.getRules(zoneId);
+            rules = ZoneRulesProvider.getRules(zoneId, true);
         } catch (ZoneRulesException ex) {

jodastephen

diff --git a/src/share/classes/java/time/format/DateTimeFormatterBuilder.java b/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
--- a/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
+++ b/src/share/classes/java/time/format/DateTimeFormatterBuilder.java
@@ -110,6 +110,7 @@
 import java.util.Set;
 import java.util.TimeZone;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 
 import sun.util.locale.provider.TimeZoneNameUtility;

jodastephen

diff --git a/src/share/classes/java/time/chrono/ChronoLocalDate.java b/src/share/classes/java/time/chrono/ChronoLocalDate.java
--- a/src/share/classes/java/time/chrono/ChronoLocalDate.java
+++ b/src/share/classes/java/time/chrono/ChronoLocalDate.java
@@ -270,6 +270,39 @@
 
     //-----------------------------------------------------------------------
     /**
+     * Obtains an instance of {@code ChronoLocalDate} from a temporal object.
+     * <p>
+     * This creates a local date based on the specified temporal.

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