mirror of
https://github.com/openjdk/jdk.git
synced 2025-08-27 06:45:07 +02:00
8263668: Update java.time to use instanceof pattern variable
Reviewed-by: lancea, ryadav, naoto, rriggs, dfuchs, scolebourne, chegar
This commit is contained in:
parent
a93d911954
commit
28af31db34
34 changed files with 129 additions and 176 deletions
|
@ -496,8 +496,8 @@ public final class Year
|
|||
*/
|
||||
@Override
|
||||
public long getLong(TemporalField field) {
|
||||
if (field instanceof ChronoField) {
|
||||
switch ((ChronoField) field) {
|
||||
if (field instanceof ChronoField chronoField) {
|
||||
switch (chronoField) {
|
||||
case YEAR_OF_ERA: return (year < 1 ? 1 - year : year);
|
||||
case YEAR: return year;
|
||||
case ERA: return (year < 1 ? 0 : 1);
|
||||
|
@ -708,8 +708,8 @@ public final class Year
|
|||
*/
|
||||
@Override
|
||||
public Year plus(long amountToAdd, TemporalUnit unit) {
|
||||
if (unit instanceof ChronoUnit) {
|
||||
switch ((ChronoUnit) unit) {
|
||||
if (unit instanceof ChronoUnit chronoUnit) {
|
||||
switch (chronoUnit) {
|
||||
case YEARS: return plusYears(amountToAdd);
|
||||
case DECADES: return plusYears(Math.multiplyExact(amountToAdd, 10));
|
||||
case CENTURIES: return plusYears(Math.multiplyExact(amountToAdd, 100));
|
||||
|
@ -914,9 +914,9 @@ public final class Year
|
|||
@Override
|
||||
public long until(Temporal endExclusive, TemporalUnit unit) {
|
||||
Year end = Year.from(endExclusive);
|
||||
if (unit instanceof ChronoUnit) {
|
||||
if (unit instanceof ChronoUnit chronoUnit) {
|
||||
long yearsUntil = ((long) end.year) - year; // no overflow
|
||||
switch ((ChronoUnit) unit) {
|
||||
switch (chronoUnit) {
|
||||
case YEARS: return yearsUntil;
|
||||
case DECADES: return yearsUntil / 10;
|
||||
case CENTURIES: return yearsUntil / 100;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue