, Cloneable {
/**
* A long year where both {@link #CHESHVAN} and {@link #KISLEV} are 30 days.
*
- * @see #getCheshvanKislevKviah()
+ * @see #getMarcheshvanKislevKviah()
* @see HebrewDateFormatter#getFormattedKviah(int)
*/
public static final int SHELAIMIM = 2;
@@ -689,7 +689,7 @@ private static void validateGregorianYear(int year) {
* @param year
* the Jewish year
* @return the number of days for a given Jewish year.
- * @see #isCheshvanLong()
+ * @see #isMarcheshvanLong()
* @see #isKislevShort()
*/
public static int getDaysInJewishYear(int year) {
@@ -700,7 +700,7 @@ public static int getDaysInJewishYear(int year) {
* Returns the number of days for the current year that the calendar is set to.
*
* @return the number of days for the Object's current Jewish year.
- * @see #isCheshvanLong()
+ * @see #isMarcheshvanLong()
* @see #isKislevShort()
* @see #isJewishLeapYear()
*/
@@ -709,28 +709,28 @@ public int getDaysInJewishYear() {
}
/**
- * Returns if Cheshvan is long in a given Jewish year. The method name isLong is done since in a Kesidran (ordered)
- * year Cheshvan is short. ND+ER
+ * Returns if Marcheshvan is long in a given Jewish year. The method name isLong is done since in a Kesidran (ordered)
+ * year Marcheshvan is short. ND+ER
*
* @param year
* the year
- * @return true if Cheshvan is long in Jewish year.
- * @see #isCheshvanLong()
- * @see #getCheshvanKislevKviah()
+ * @return true if Marcheshvan is long in Jewish year.
+ * @see #isMarcheshvanLong()
+ * @see #getMarcheshvanKislevKviah()
*/
- private static boolean isCheshvanLong(int year) {
+ private static boolean isMarcheshvanLong(int year) {
return getDaysInJewishYear(year) % 10 == 5;
}
/**
- * Returns if Cheshvan is long (30 days VS 29 days) for the current year that the calendar is set to. The method
- * name isLong is done since in a Kesidran (ordered) year Cheshvan is short.
+ * Returns if Marcheshvan is long (30 days VS 29 days) for the current year that the calendar is set to. The method
+ * name isLong is done since in a Kesidran (ordered) year Marcheshvan is short.
*
- * @return true if Cheshvan is long for the current year that the calendar is set to
- * @see #isCheshvanLong()
+ * @return true if Marcheshvan is long for the current year that the calendar is set to
+ * @see #isMarcheshvanLong()
*/
- public boolean isCheshvanLong() {
- return isCheshvanLong(getJewishYear());
+ public boolean isMarcheshvanLong() {
+ return isMarcheshvanLong(getJewishYear());
}
/**
@@ -741,7 +741,7 @@ public boolean isCheshvanLong() {
* the Jewish year
* @return true if Kislev is short for the given Jewish year.
* @see #isKislevShort()
- * @see #getCheshvanKislevKviah()
+ * @see #getMarcheshvanKislevKviah()
*/
private static boolean isKislevShort(int year) {
return getDaysInJewishYear(year) % 10 == 3;
@@ -758,19 +758,19 @@ public boolean isKislevShort() {
}
/**
- * Returns the Cheshvan and Kislev kviah (whether a Jewish year is short, regular or long). It will return
- * {@link #SHELAIMIM} if both cheshvan and kislev are 30 days, {@link #KESIDRAN} if Cheshvan is 29 days and Kislev
+ * Returns the Marcheshvan and Kislev kviah (whether a Jewish year is short, regular or long). It will return
+ * {@link #SHELAIMIM} if both cheshvan and kislev are 30 days, {@link #KESIDRAN} if Marcheshvan is 29 days and Kislev
* is 30 days and {@link #CHASERIM} if both are 29 days.
*
- * @return {@link #SHELAIMIM} if both cheshvan and kislev are 30 days, {@link #KESIDRAN} if Cheshvan is 29 days and
+ * @return {@link #SHELAIMIM} if both cheshvan and kislev are 30 days, {@link #KESIDRAN} if Marcheshvan is 29 days and
* Kislev is 30 days and {@link #CHASERIM} if both are 29 days.
- * @see #isCheshvanLong()
+ * @see #isMarcheshvanLong()
* @see #isKislevShort()
*/
- public int getCheshvanKislevKviah() {
- if (isCheshvanLong() && !isKislevShort()) {
+ public int getMarcheshvanKislevKviah() {
+ if (isMarcheshvanLong() && !isKislevShort()) {
return SHELAIMIM;
- } else if (!isCheshvanLong() && isKislevShort()) {
+ } else if (!isMarcheshvanLong() && isKislevShort()) {
return CHASERIM;
} else {
return KESIDRAN;
@@ -787,7 +787,7 @@ public int getCheshvanKislevKviah() {
* @return the number of days for a given Jewish month
*/
private static int getDaysInJewishMonth(int month, int year) {
- if ((month == IYAR) || (month == TAMMUZ) || (month == ELUL) || ((month == CHESHVAN) && !(isCheshvanLong(year)))
+ if ((month == IYAR) || (month == TAMMUZ) || (month == ELUL) || ((month == CHESHVAN) && !(isMarcheshvanLong(year)))
|| ((month == KISLEV) && isKislevShort(year)) || (month == TEVES)
|| ((month == ADAR) && !(isJewishLeapYear(year))) || (month == ADAR_II)) {
return 29;
diff --git a/src/main/java/com/kosherjava/zmanim/hebrewcalendar/TefilaRules.java b/src/main/java/com/kosherjava/zmanim/hebrewcalendar/TefilaRules.java
index 13556a06..01df84ed 100644
--- a/src/main/java/com/kosherjava/zmanim/hebrewcalendar/TefilaRules.java
+++ b/src/main/java/com/kosherjava/zmanim/hebrewcalendar/TefilaRules.java
@@ -242,7 +242,7 @@ public boolean isTachanunRecitedMincha(JewishCalendar jewishCalendar) {
*/
public boolean isVeseinTalUmatarStartDate(JewishCalendar jewishCalendar) {
if (jewishCalendar.getInIsrael()) {
- // The 7th Cheshvan can't occur on Shabbos, so always return true for 7 Cheshvan
+ // The 7th Marcheshvan can't occur on Shabbos, so always return true for 7 Marcheshvan
return jewishCalendar.getJewishMonth() == JewishDate.CHESHVAN && jewishCalendar.getJewishDayOfMonth() == 7;
} else {
if (jewishCalendar.getDayOfWeek() == Calendar.SATURDAY) { //Not recited on Friday night
@@ -275,7 +275,7 @@ public boolean isVeseinTalUmatarStartDate(JewishCalendar jewishCalendar) {
*/
public boolean isVeseinTalUmatarStartingTonight(JewishCalendar jewishCalendar) {
if (jewishCalendar.getInIsrael()) {
- // The 7th Cheshvan can't occur on Shabbos, so always return true for 6 Cheshvan
+ // The 7th Marcheshvan can't occur on Shabbos, so always return true for 6 Marcheshvan
return jewishCalendar.getJewishMonth() == JewishDate.CHESHVAN && jewishCalendar.getJewishDayOfMonth() == 6;
} else {
if (jewishCalendar.getDayOfWeek() == Calendar.FRIDAY) { //Not recited on Friday night
diff --git a/src/test/java/com/kosherjava/zmanim/hebrewcalendar/UT_DaysInJewishMonth.java b/src/test/java/com/kosherjava/zmanim/hebrewcalendar/UT_DaysInJewishMonth.java
index 2e549b98..19c3022e 100644
--- a/src/test/java/com/kosherjava/zmanim/hebrewcalendar/UT_DaysInJewishMonth.java
+++ b/src/test/java/com/kosherjava/zmanim/hebrewcalendar/UT_DaysInJewishMonth.java
@@ -62,7 +62,7 @@ private void assertHaser(int year) {
JewishDate jewishDate = new JewishDate();
jewishDate.setJewishYear(year);
- Assert.assertFalse(jewishDate.isCheshvanLong());
+ Assert.assertFalse(jewishDate.isMarcheshvanLong());
Assert.assertTrue(jewishDate.isKislevShort());
}
@@ -80,7 +80,7 @@ private void assertQesidrah(int year) {
JewishDate jewishDate = new JewishDate();
jewishDate.setJewishYear(year);
- Assert.assertFalse(jewishDate.isCheshvanLong( ));
+ Assert.assertFalse(jewishDate.isMarcheshvanLong( ));
Assert.assertFalse(jewishDate.isKislevShort( ));
}
@@ -98,7 +98,7 @@ private void assertShalem(int year) {
JewishDate jewishDate = new JewishDate();
jewishDate.setJewishYear(year);
- Assert.assertTrue(jewishDate.isCheshvanLong( ));
+ Assert.assertTrue(jewishDate.isMarcheshvanLong( ));
Assert.assertFalse(jewishDate.isKislevShort( ));
}
diff --git a/src/test/java/com/kosherjava/zmanim/hebrewcalendar/package.html b/src/test/java/com/kosherjava/zmanim/hebrewcalendar/package.html
index 48858225..d9014ec2 100644
--- a/src/test/java/com/kosherjava/zmanim/hebrewcalendar/package.html
+++ b/src/test/java/com/kosherjava/zmanim/hebrewcalendar/package.html
@@ -5,11 +5,11 @@
In writing these unit tests, I found http://www.printablejewishcalendar.com/ which produces a nice output
-for each month. And, given that Cheshvan, Kislev and Adar are the only variable months, it was fairly easy
+for each month. And, given that Marcheshvan, Kislev and Adar are the only variable months, it was fairly easy
to work out the following:
-Year Cheshvan Kislev LEAP? TYPE
+Year Marcheshvan Kislev LEAP? TYPE
5769 29 30 No Qesidrah
5770 30 30 No Shalem
5771 30 30 Yes Shalem Leap
@@ -50,7 +50,7 @@
Av
Elul
Tishri
- Cheshvan
+ Marcheshvan
Kislev
Tevet
Shevat