< prev index next >

src/java.base/share/classes/java/text/CalendarBuilder.java

Print this page
rev 57328 : Fix CalendarBuilder toString


 131             if (!isValidDayOfWeek(dayOfWeek) && cal.isLenient()) {
 132                 if (dayOfWeek >= 8) {
 133                     dayOfWeek--;
 134                     weekOfYear += dayOfWeek / 7;
 135                     dayOfWeek = (dayOfWeek % 7) + 1;
 136                 } else {
 137                     while (dayOfWeek <= 0) {
 138                         dayOfWeek += 7;
 139                         weekOfYear--;
 140                     }
 141                 }
 142                 dayOfWeek = toCalendarDayOfWeek(dayOfWeek);
 143             }
 144             cal.setWeekDate(field[MAX_FIELD + WEEK_YEAR], weekOfYear, dayOfWeek);
 145         }
 146         return cal;
 147     }
 148 
 149     public String toString() {
 150         StringJoiner sj = new StringJoiner(",", "CalendarBuilder:[", "]");
 151         for (int i = 0; i < field.length; i++) {
 152             if (isSet(i)) {
 153                 sj.add(i + "=" + field[MAX_FIELD + i]);
 154             }
 155         }
 156         return sj.toString();
 157     }
 158 
 159     static int toISODayOfWeek(int calendarDayOfWeek) {
 160         return calendarDayOfWeek == SUNDAY ? 7 : calendarDayOfWeek - 1;
 161     }
 162 
 163     static int toCalendarDayOfWeek(int isoDayOfWeek) {
 164         if (!isValidDayOfWeek(isoDayOfWeek)) {
 165             // adjust later for lenient mode
 166             return isoDayOfWeek;
 167         }
 168         return isoDayOfWeek == 7 ? SUNDAY : isoDayOfWeek + 1;
 169     }
 170 
 171     static boolean isValidDayOfWeek(int dayOfWeek) {
 172         return dayOfWeek > 0 && dayOfWeek <= 7;
 173     }


 131             if (!isValidDayOfWeek(dayOfWeek) && cal.isLenient()) {
 132                 if (dayOfWeek >= 8) {
 133                     dayOfWeek--;
 134                     weekOfYear += dayOfWeek / 7;
 135                     dayOfWeek = (dayOfWeek % 7) + 1;
 136                 } else {
 137                     while (dayOfWeek <= 0) {
 138                         dayOfWeek += 7;
 139                         weekOfYear--;
 140                     }
 141                 }
 142                 dayOfWeek = toCalendarDayOfWeek(dayOfWeek);
 143             }
 144             cal.setWeekDate(field[MAX_FIELD + WEEK_YEAR], weekOfYear, dayOfWeek);
 145         }
 146         return cal;
 147     }
 148 
 149     public String toString() {
 150         StringJoiner sj = new StringJoiner(",", "CalendarBuilder:[", "]");
 151         for (int i = 0; i < MAX_FIELD; i++) {
 152             if (isSet(i)) {
 153                 sj.add(i + "=" + field[i] + ":" + field[MAX_FIELD + i]);
 154             }
 155         }
 156         return sj.toString();
 157     }
 158 
 159     static int toISODayOfWeek(int calendarDayOfWeek) {
 160         return calendarDayOfWeek == SUNDAY ? 7 : calendarDayOfWeek - 1;
 161     }
 162 
 163     static int toCalendarDayOfWeek(int isoDayOfWeek) {
 164         if (!isValidDayOfWeek(isoDayOfWeek)) {
 165             // adjust later for lenient mode
 166             return isoDayOfWeek;
 167         }
 168         return isoDayOfWeek == 7 ? SUNDAY : isoDayOfWeek + 1;
 169     }
 170 
 171     static boolean isValidDayOfWeek(int dayOfWeek) {
 172         return dayOfWeek > 0 && dayOfWeek <= 7;
 173     }
< prev index next >