Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -548,7 +548,7 @@ private static void validateJewishDate(int year, int month, int dayOfMonth, int
throw new IllegalArgumentException("The Jewish month has to be between 1 and 12 (or 13 on a leap year). "
+ month + " is invalid for the year " + year + ".");
}
int monthLength = getDaysInJewishMonth(month, year);
int monthLength = getDaysInJewishMonth(year, month);
if (dayOfMonth < 1 || dayOfMonth > monthLength) {
throw new IllegalArgumentException(
"The Jewish day of month can't be < 1 or > " + monthLength +
Expand Down Expand Up @@ -988,7 +988,7 @@ public void setJewishDayOfMonth(int dayOfMonth){
*/
public void setJewishMonth(int month){
int year = getJewishYear();
int day = Math.min(getDaysInJewishMonth(month,year),getJewishDayOfMonth());
int day = Math.min(getDaysInJewishMonth(year,month),getJewishDayOfMonth());
setJewishDate(year, month, day);
}

Expand All @@ -1005,7 +1005,7 @@ public void setJewishMonth(int month){
*/
public void setJewishYear(int year){
int month = Math.min(getJewishMonth(),getLastMonthOfJewishYear(year));
int day = Math.min(getJewishDayOfMonth(), getDaysInJewishMonth(month,year));
int day = Math.min(getJewishDayOfMonth(), getDaysInJewishMonth(year,month));
setJewishDate(year, month, day);
}

Expand Down Expand Up @@ -1076,7 +1076,7 @@ public void plusMonths(int months){
month++;
}
}
int day = Math.min(getJewishDayOfMonth(), getDaysInJewishMonth(month,year));
int day = Math.min(getJewishDayOfMonth(), getDaysInJewishMonth(year,month));
setJewishDate(year, month, day);
}

Expand Down Expand Up @@ -1104,7 +1104,7 @@ public void minusMonths(int months){
month--;
}
}
int day = Math.min(getJewishDayOfMonth(), getDaysInJewishMonth(month,year));
int day = Math.min(getJewishDayOfMonth(), getDaysInJewishMonth(year,month));
setJewishDate(year, month, day);
}

Expand Down Expand Up @@ -1143,7 +1143,7 @@ public void plusYears(int years, boolean useAdarAlephForLeapYear){
month = Math.min(getJewishMonth(),getLastMonthOfJewishYear(targetYear));
}
// Clamp to final day of the month
int day = Math.min(getJewishDayOfMonth(), getDaysInJewishMonth(month,targetYear));
int day = Math.min(getJewishDayOfMonth(), getDaysInJewishMonth(targetYear,month));
setJewishDate(targetYear, month, day);
}

Expand Down Expand Up @@ -1180,7 +1180,7 @@ public void minusYears(int years, boolean useAdarAlephForLeapYear){
month = Math.min(getJewishMonth(),getLastMonthOfJewishYear(targetYear));
}
// Clamp to final day of the month
int day = Math.min(getJewishDayOfMonth(), getDaysInJewishMonth(month,targetYear));
int day = Math.min(getJewishDayOfMonth(), getDaysInJewishMonth(targetYear,month));
setJewishDate(targetYear, month, day);
}

Expand Down
Loading