diff -r c588664d547e -r 55b829ca2334 jdk/src/share/classes/java/time/temporal/ChronoZonedDateTime.java --- a/jdk/src/share/classes/java/time/temporal/ChronoZonedDateTime.java Tue Feb 12 16:02:14 2013 +0400 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,564 +0,0 @@ -/* - * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 only, as - * published by the Free Software Foundation. Oracle designates this - * particular file as subject to the "Classpath" exception as provided - * by Oracle in the LICENSE file that accompanied this code. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* - * This file is available under and governed by the GNU General Public - * License version 2 only, as published by the Free Software Foundation. - * However, the following notice accompanied the original version of this - * file: - * - * Copyright (c) 2007-2012, Stephen Colebourne & Michael Nascimento Santos - * - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * * Neither the name of JSR-310 nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package java.time.temporal; - -import static java.time.temporal.ChronoField.INSTANT_SECONDS; -import static java.time.temporal.ChronoField.OFFSET_SECONDS; -import static java.time.temporal.ChronoUnit.NANOS; - -import java.time.DateTimeException; -import java.time.Instant; -import java.time.LocalTime; -import java.time.ZoneId; -import java.time.ZoneOffset; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Comparator; -import java.util.Objects; - -/** - * A date-time with a time-zone in an arbitrary chronology, - * intended for advanced globalization use cases. - *
- * Most applications should declare method signatures, fields and variables - * as {@link ZonedDateTime}, not this interface. - *
- * A {@code ChronoZonedDateTime} is the abstract representation of an offset date-time - * where the {@code Chrono chronology}, or calendar system, is pluggable. - * The date-time is defined in terms of fields expressed by {@link TemporalField}, - * where most common implementations are defined in {@link ChronoField}. - * The chronology defines how the calendar system operates and the meaning of - * the standard fields. - * - *
- * Ensure that the discussion in {@code ChronoLocalDate} has been read and understood - * before using this interface. - * - *
- * This method differs from the comparison in {@link #compareTo} in that it
- * only compares the underlying date and not the chronology.
- * This allows dates in different calendar systems to be compared based
- * on the time-line position.
- *
- * @see #isAfter
- * @see #isBefore
- * @see #isEqual
- */
- Comparator
- * This returns a local date with the same year, month and day
- * as this date-time.
- *
- * @return the date part of this date-time, not null
- */
- public default ChronoLocalDate
- * This returns a local time with the same hour, minute, second and
- * nanosecond as this date-time.
- *
- * @return the time part of this date-time, not null
- */
- public default LocalTime getTime() {
- return getDateTime().getTime();
- }
-
- /**
- * Gets the local date-time part of this date-time.
- *
- * This returns a local date with the same year, month and day
- * as this date-time.
- *
- * @return the local date-time part of this date-time, not null
- */
- ChronoLocalDateTime
- * This is the offset of the local date-time from UTC/Greenwich.
- *
- * @return the zone offset, not null
- */
- ZoneOffset getOffset();
-
- /**
- * Gets the zone ID, such as 'Europe/Paris'.
- *
- * This returns the stored time-zone id used to determine the time-zone rules.
- *
- * @return the zone ID, not null
- */
- ZoneId getZone();
-
- //-----------------------------------------------------------------------
- /**
- * Returns a copy of this date-time changing the zone offset to the
- * earlier of the two valid offsets at a local time-line overlap.
- *
- * This method only has any effect when the local time-line overlaps, such as
- * at an autumn daylight savings cutover. In this scenario, there are two
- * valid offsets for the local date-time. Calling this method will return
- * a zoned date-time with the earlier of the two selected.
- *
- * If this method is called when it is not an overlap, {@code this}
- * is returned.
- *
- * This instance is immutable and unaffected by this method call.
- *
- * @return a {@code ZoneChronoDateTime} based on this date-time with the earlier offset, not null
- * @throws DateTimeException if no rules can be found for the zone
- * @throws DateTimeException if no rules are valid for this date-time
- */
- ChronoZonedDateTime
- * This method only has any effect when the local time-line overlaps, such as
- * at an autumn daylight savings cutover. In this scenario, there are two
- * valid offsets for the local date-time. Calling this method will return
- * a zoned date-time with the later of the two selected.
- *
- * If this method is called when it is not an overlap, {@code this}
- * is returned.
- *
- * This instance is immutable and unaffected by this method call.
- *
- * @return a {@code ChronoZonedDateTime} based on this date-time with the later offset, not null
- * @throws DateTimeException if no rules can be found for the zone
- * @throws DateTimeException if no rules are valid for this date-time
- */
- ChronoZonedDateTime
- * This method changes the time-zone and retains the local date-time.
- * The local date-time is only changed if it is invalid for the new zone.
- *
- * To change the zone and adjust the local date-time,
- * use {@link #withZoneSameInstant(ZoneId)}.
- *
- * This instance is immutable and unaffected by this method call.
- *
- * @param zone the time-zone to change to, not null
- * @return a {@code ChronoZonedDateTime} based on this date-time with the requested zone, not null
- */
- ChronoZonedDateTime
- * This method changes the time-zone and retains the instant.
- * This normally results in a change to the local date-time.
- *
- * This method is based on retaining the same instant, thus gaps and overlaps
- * in the local time-line have no effect on the result.
- *
- * To change the offset while keeping the local time,
- * use {@link #withZoneSameLocal(ZoneId)}.
- *
- * @param zone the time-zone to change to, not null
- * @return a {@code ChronoZonedDateTime} based on this date-time with the requested zone, not null
- * @throws DateTimeException if the result exceeds the supported date range
- */
- ChronoZonedDateTime
- * This queries this date-time using the specified query strategy object.
- * The {@code TemporalQuery} object defines the logic to be used to
- * obtain the result. Read the documentation of the query to understand
- * what the result of this method will be.
- *
- * The result of this method is obtained by invoking the
- * {@link java.time.temporal.TemporalQuery#queryFrom(TemporalAccessor)} method on the
- * specified query passing {@code this} as the argument.
- *
- * @param
- * This combines the {@linkplain #getDateTime() local date-time} and
- * {@linkplain #getOffset() offset} to form an {@code Instant}.
- *
- * @return an {@code Instant} representing the same instant, not null
- */
- public default Instant toInstant() {
- return Instant.ofEpochSecond(toEpochSecond(), getTime().getNano());
- }
-
- /**
- * Converts this date-time to the number of seconds from the epoch
- * of 1970-01-01T00:00:00Z.
- *
- * This uses the {@linkplain #getDateTime() local date-time} and
- * {@linkplain #getOffset() offset} to calculate the epoch-second value,
- * which is the number of elapsed seconds from 1970-01-01T00:00:00Z.
- * Instants on the time-line after the epoch are positive, earlier are negative.
- *
- * @return the number of seconds from the epoch of 1970-01-01T00:00:00Z
- */
- public default long toEpochSecond() {
- long epochDay = getDate().toEpochDay();
- long secs = epochDay * 86400 + getTime().toSecondOfDay();
- secs -= getOffset().getTotalSeconds();
- return secs;
- }
-
- //-----------------------------------------------------------------------
- /**
- * Compares this date-time to another date-time, including the chronology.
- *
- * The comparison is based first on the instant, then on the local date-time,
- * then on the zone ID, then on the chronology.
- * It is "consistent with equals", as defined by {@link Comparable}.
- *
- * If all the date-time objects being compared are in the same chronology, then the
- * additional chronology stage is not required.
- *
- * This default implementation performs the comparison defined above.
- *
- * @param other the other date-time to compare to, not null
- * @return the comparator value, negative if less, positive if greater
- */
- @Override
- public default int compareTo(ChronoZonedDateTime> other) {
- int cmp = Long.compare(toEpochSecond(), other.toEpochSecond());
- if (cmp == 0) {
- cmp = getTime().getNano() - other.getTime().getNano();
- if (cmp == 0) {
- cmp = getDateTime().compareTo(other.getDateTime());
- if (cmp == 0) {
- cmp = getZone().getId().compareTo(other.getZone().getId());
- if (cmp == 0) {
- cmp = getDate().getChrono().compareTo(other.getDate().getChrono());
- }
- }
- }
- }
- return cmp;
- }
-
- /**
- * Checks if the instant of this date-time is before that of the specified date-time.
- *
- * This method differs from the comparison in {@link #compareTo} in that it
- * only compares the instant of the date-time. This is equivalent to using
- * {@code dateTime1.toInstant().isBefore(dateTime2.toInstant());}.
- *
- * This default implementation performs the comparison based on the epoch-second
- * and nano-of-second.
- *
- * @param other the other date-time to compare to, not null
- * @return true if this point is before the specified date-time
- */
- public default boolean isBefore(ChronoZonedDateTime> other) {
- long thisEpochSec = toEpochSecond();
- long otherEpochSec = other.toEpochSecond();
- return thisEpochSec < otherEpochSec ||
- (thisEpochSec == otherEpochSec && getTime().getNano() < other.getTime().getNano());
- }
-
- /**
- * Checks if the instant of this date-time is after that of the specified date-time.
- *
- * This method differs from the comparison in {@link #compareTo} in that it
- * only compares the instant of the date-time. This is equivalent to using
- * {@code dateTime1.toInstant().isAfter(dateTime2.toInstant());}.
- *
- * This default implementation performs the comparison based on the epoch-second
- * and nano-of-second.
- *
- * @param other the other date-time to compare to, not null
- * @return true if this is after the specified date-time
- */
- public default boolean isAfter(ChronoZonedDateTime> other) {
- long thisEpochSec = toEpochSecond();
- long otherEpochSec = other.toEpochSecond();
- return thisEpochSec > otherEpochSec ||
- (thisEpochSec == otherEpochSec && getTime().getNano() > other.getTime().getNano());
- }
-
- /**
- * Checks if the instant of this date-time is equal to that of the specified date-time.
- *
- * This method differs from the comparison in {@link #compareTo} and {@link #equals}
- * in that it only compares the instant of the date-time. This is equivalent to using
- * {@code dateTime1.toInstant().equals(dateTime2.toInstant());}.
- *
- * This default implementation performs the comparison based on the epoch-second
- * and nano-of-second.
- *
- * @param other the other date-time to compare to, not null
- * @return true if the instant equals the instant of the specified date-time
- */
- public default boolean isEqual(ChronoZonedDateTime> other) {
- return toEpochSecond() == other.toEpochSecond() &&
- getTime().getNano() == other.getTime().getNano();
- }
-
- //-----------------------------------------------------------------------
- /**
- * Checks if this date-time is equal to another date-time.
- *
- * The comparison is based on the offset date-time and the zone.
- * To compare for the same instant on the time-line, use {@link #compareTo}.
- * Only objects of type {@code ChronoZonedDateTime} are compared, other types return false.
- *
- * @param obj the object to check, null returns false
- * @return true if this is equal to the other date-time
- */
- @Override
- boolean equals(Object obj);
-
- /**
- * A hash code for this date-time.
- *
- * @return a suitable hash code
- */
- @Override
- int hashCode();
-
- //-----------------------------------------------------------------------
- /**
- * Outputs this date-time as a {@code String}.
- *
- * The output will include the full zoned date-time and the chronology ID.
- *
- * @return a string representation of this date-time, not null
- */
- @Override
- String toString();
-
- /**
- * Outputs this date-time as a {@code String} using the formatter.
- *
- * The default implementation must behave as follows:
- *
- * return formatter.print(this);
- *
- *
- * @param formatter the formatter to use, not null
- * @return the formatted date-time string, not null
- * @throws DateTimeException if an error occurs during printing
- */
- public default String toString(DateTimeFormatter formatter) {
- Objects.requireNonNull(formatter, "formatter");
- return formatter.print(this);
- }
-
-}