Add missing brace and simplify isYomTov logic

KosherJava · web-flow · commit e34fc879313b · 2024-08-04T11:09:24.000-04:00
diff --git a/src/main/java/com/kosherjava/zmanim/hebrewcalendar/JewishCalendar.java b/src/main/java/com/kosherjava/zmanim/hebrewcalendar/JewishCalendar.java
@@ -798,7 +798,7 @@ public int getYomTovIndex() {
 	 */
 	public boolean isYomTov() {
 		int holidayIndex = getYomTovIndex();
-		if ((isErevYomTov() && (holidayIndex != HOSHANA_RABBA && holidayIndex != CHOL_HAMOED_PESACH))
+		if ((isErevYomTov() && ! ( holidayIndex == HOSHANA_RABBA || holidayIndex == CHOL_HAMOED_PESACH))
 				|| (isTaanis() && holidayIndex != YOM_KIPPUR) || holidayIndex == ISRU_CHAG) {
 			return false;
 		}

Original file line number	Diff line number	Diff line change
`@@ -798,7 +798,7 @@ public int getYomTovIndex() {`
`798`	`798`	`*/`
`799`	`799`	`public boolean isYomTov() {`
`800`	`800`	`int holidayIndex = getYomTovIndex();`
`801`		`- if ((isErevYomTov() && (holidayIndex != HOSHANA_RABBA && holidayIndex != CHOL_HAMOED_PESACH))`
	`801`	`+ if ((isErevYomTov() && ! ( holidayIndex == HOSHANA_RABBA \|\| holidayIndex == CHOL_HAMOED_PESACH))`
`802`	`802`	`\|\| (isTaanis() && holidayIndex != YOM_KIPPUR) \|\| holidayIndex == ISRU_CHAG) {`
`803`	`803`	`return false;`
`804`	`804`	`}`