Migrate to ICU

pom.xml

@@ -39,6 +39,11 @@
             <version>4.13.1</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.ibm.icu</groupId>
+            <artifactId>icu4j</artifactId>
+            <version>78.1</version>
+        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -111,6 +116,24 @@
                     <target>8</target>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.7.0</version>
+                <executions>
+                    <execution>
+                        <id>copy-dependencies</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/dependency</outputDirectory>
+                            <includeScope>compile</includeScope>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
     <distributionManagement>

src/main/java/com/kosherjava/zmanim/AstronomicalCalendar.java

@@ -16,9 +16,9 @@
 package com.kosherjava.zmanim;
 
 import java.math.BigDecimal;
-import java.util.Calendar;
+import com.ibm.icu.util.Calendar;
 import java.util.Date;
-import java.util.TimeZone;
+import com.ibm.icu.util.TimeZone;
 
 import com.kosherjava.zmanim.util.AstronomicalCalculator;
 import com.kosherjava.zmanim.util.GeoLocation;
@@ -49,7 +49,7 @@
  * double longitude = -74.2094; // Lakewood, NJ
  * double elevation = 20; // optional elevation correction in Meters
  * // the String parameter in getTimeZone() has to be a valid timezone listed in
- * // {@link java.util.TimeZone#getAvailableIDs()}
+ * // {@link com.ibm.icu.util.TimeZone#getAvailableIDs()}
  * TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
  * GeoLocation location = new GeoLocation(locationName, latitude, longitude, elevation, timeZone);
  * AstronomicalCalendar ac = new AstronomicalCalendar(location);
@@ -350,6 +350,7 @@ public Date getSunriseOffsetByDegrees(double offsetZenith) {
 	 */
 	public Date getSunsetOffsetByDegrees(double offsetZenith) {
 		double sunset = getUTCSunset(offsetZenith);
+		// System.out.println("Jsunset: " + sunset);
 		if (Double.isNaN(sunset)) {
 			return null;
 		} else {
@@ -626,8 +627,9 @@ protected Date getDateFromTime(double time, SolarEvent solarEvent) {
 			return null;
 		}
 		double calculatedTime = time;
-		
+
 		Calendar adjustedCalendar = getAdjustedCalendar();
+
 		Calendar cal = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
 		cal.clear();// clear all fields
 		cal.set(Calendar.YEAR, adjustedCalendar.get(Calendar.YEAR));
@@ -637,10 +639,10 @@ protected Date getDateFromTime(double time, SolarEvent solarEvent) {
 		int hours = (int) calculatedTime; // retain only the hours
 		calculatedTime -= hours;
 		int minutes = (int) (calculatedTime *= 60); // retain only the minutes
-		calculatedTime -= minutes;
+        calculatedTime -= minutes;
 		int seconds = (int) (calculatedTime *= 60); // retain only the seconds
 		calculatedTime -= seconds; // remaining milliseconds
-		
+
 		// Check if a date transition has occurred, or is about to occur - this indicates the date of the event is
 		// actually not the target date, but the day prior or after
 		int localTimeHours = (int)getGeoLocation().getLongitude() / 15;
@@ -650,6 +652,8 @@ protected Date getDateFromTime(double time, SolarEvent solarEvent) {
 			cal.add(Calendar.DAY_OF_MONTH, 1);
 		} else if (solarEvent == SolarEvent.MIDNIGHT && localTimeHours + hours < 12) {
 			cal.add(Calendar.DAY_OF_MONTH, 1);
+		} else if (solarEvent == SolarEvent.NOON && localTimeHours + hours < 0) {
+			cal.add(Calendar.DAY_OF_MONTH, 1);
 		} else if (solarEvent == SolarEvent.NOON && localTimeHours + hours > 24) {
 			cal.add(Calendar.DAY_OF_MONTH, -1);
 		}
@@ -758,8 +762,9 @@ public Date getLocalMeanTime(double hours) {
 		if (hours < 0 || hours >= 24) {
 			throw new IllegalArgumentException("Hours must between 0 and 23.9999...");
 		}
-		return getTimeOffset(getDateFromTime(hours - getGeoLocation().getTimeZone().getRawOffset()
-				/ (double) HOUR_MILLIS, SolarEvent.SUNRISE), -getGeoLocation().getLocalMeanTimeOffset());
+		long timezoneOffsetMillis = getCalendar().getTimeZone().getOffset(getCalendar().getTimeInMillis());		
+		return getTimeOffset(getDateFromTime(hours - timezoneOffsetMillis
+				/ (double) HOUR_MILLIS, SolarEvent.SUNRISE), -getGeoLocation().getLocalMeanTimeOffset(calendar));
 	}
 
 	/**
@@ -769,11 +774,11 @@ public Date getLocalMeanTime(double hours) {
 	 * @return the adjusted Calendar
 	 */
 	private Calendar getAdjustedCalendar(){
-		int offset = getGeoLocation().getAntimeridianAdjustment();
+		int offset = getGeoLocation().getAntimeridianAdjustment(getCalendar());
 		if (offset == 0) {
 			return getCalendar();
 		}
-		Calendar adjustedCalendar = (Calendar) getCalendar().clone();
+		Calendar adjustedCalendar = getCalendar().clone();
 		adjustedCalendar.add(Calendar.DAY_OF_MONTH, offset);
 		return adjustedCalendar;
 	}
@@ -900,10 +905,10 @@ public void setCalendar(Calendar calendar) {
 
 	/**
 	 * A method that creates a <a href="https://en.wikipedia.org/wiki/Object_copy#Deep_copy">deep copy</a> of the object.
-	 * <b>Note:</b> If the {@link java.util.TimeZone} in the cloned {@link com.kosherjava.zmanim.util.GeoLocation} will
+	 * <b>Note:</b> If the {@link com.ibm.icu.util.TimeZone} in the cloned {@link com.kosherjava.zmanim.util.GeoLocation} will
 	 * be changed from the original, it is critical that
 	 * {@link com.kosherjava.zmanim.AstronomicalCalendar#getCalendar()}.
-	 * {@link java.util.Calendar#setTimeZone(TimeZone) setTimeZone(TimeZone)} be called in order for the
+	 * {@link com.ibm.icu.util.Calendar#setTimeZone(TimeZone) setTimeZone(TimeZone)} be called in order for the
 	 * AstronomicalCalendar to output times in the expected offset after being cloned.
 	 * 
 	 * @see java.lang.Object#clone()

src/main/java/com/kosherjava/zmanim/ComplexZmanimCalendar.java

@@ -15,7 +15,7 @@
  */
 package com.kosherjava.zmanim;
 
-import java.util.Calendar;
+import com.ibm.icu.util.Calendar;
 import java.util.Date;
 import com.kosherjava.zmanim.util.AstronomicalCalculator;
 import com.kosherjava.zmanim.util.GeoLocation;
@@ -40,7 +40,7 @@
  * double longitude = -74.222; // Lakewood, NJ
  * double elevation = 20; // optional elevation correction in Meters
  * // the String parameter in getTimeZone() has to be a valid time zone listed in
- * // {@link java.util.TimeZone#getAvailableIDs()}
+ * // {@link com.ibm.icu.util.TimeZone#getAvailableIDs()}
  * TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
  * GeoLocation location = new GeoLocation(locationName, latitude, longitude, elevation, timeZone);
  * ComplexZmanimCalendar czc = new ComplexZmanimCalendar(location);
@@ -3486,18 +3486,22 @@ public Date getSofZmanKidushLevanaBetweenMoldos(Date alos, Date tzais) {
 	 */
 	private Date getMoladBasedTime(Date moladBasedTime, Date alos, Date tzais, boolean techila) {
 		Date lastMidnight = getMidnightLastNight();
-		Date midnightTonight = getMidnightTonight();
-		if (!(moladBasedTime.before(lastMidnight) || moladBasedTime.after(midnightTonight))){
-			if (alos != null || tzais != null) {
-				if (techila && !(moladBasedTime.before(tzais) || moladBasedTime.after(alos))){
+	    Date midnightTonight = getMidnightTonight();
+		if(moladBasedTime.before(lastMidnight) || moladBasedTime.after(midnightTonight)){ // Invalid time, bailout
+			return null;
+		} else if (alos == null || tzais == null){ // Not enough info to adjust
+		   return moladBasedTime;
+		} else { // It's the daytime, get the next/prev night
+			if (moladBasedTime.after(alos) && moladBasedTime.before(tzais)) {
+				if (techila) {
 					return tzais;
 				} else {
 					return alos;
 				}
-			}
-			return moladBasedTime;
-		}
-		return null;
+		    } else { // It's the night, the provided time is valid
+                return moladBasedTime;
+            }
+	   }
 	}
 
 	/**

src/main/java/com/kosherjava/zmanim/ZmanimCalendar.java

@@ -15,7 +15,7 @@
  */
 package com.kosherjava.zmanim;
 
-import java.util.Calendar;
+import com.ibm.icu.util.Calendar;
 import java.util.Date;
 
 import com.kosherjava.zmanim.hebrewcalendar.JewishCalendar;

src/main/java/com/kosherjava/zmanim/hebrewcalendar/JewishCalendar.java

@@ -20,9 +20,9 @@
 import com.kosherjava.zmanim.util.GeoLocation;
 
 import java.time.LocalDate;
-import java.util.Calendar;
+import com.ibm.icu.util.Calendar;
 import java.util.Date;
-import java.util.TimeZone;
+import com.ibm.icu.util.TimeZone;
 
 /**
  * The JewishCalendar extends the JewishDate class and adds calendar methods.
@@ -39,7 +39,7 @@
  * </ol>
  * 
  * @see java.util.Date
- * @see java.util.Calendar
+ * @see com.ibm.icu.util.Calendar
  * @author &copy; Y. Paritcher 2019 - 2022
  * @author &copy; Avrom Finkelstien 2002
  * @author &copy; Eliyahu Hershfeld 2011 - 2024
@@ -264,7 +264,7 @@ public JewishCalendar(Date date) {
 	}
 
 	/**
-	 * A constructor that initializes the date to the {@link java.util.Calendar Calendar} parameter.
+	 * A constructor that initializes the date to the {@link com.ibm.icu.util.Calendar Calendar} parameter.
 	 * 
 	 * @param calendar
 	 *            the <code>Calendar</code> to set the calendar to
@@ -1249,7 +1249,7 @@ public Date getMoladAsDate() {
 				molad.getMoladHours(), molad.getMoladMinutes(), (int) moladSeconds);
 		cal.set(Calendar.MILLISECOND, (int) (1000 * (moladSeconds - (int) moladSeconds)));
 		// subtract local time difference of 20.94 minutes (20 minutes and 56.496 seconds) to get to Standard time
-		cal.add(Calendar.MILLISECOND, -1 * (int) geo.getLocalMeanTimeOffset());
+		cal.add(Calendar.MILLISECOND, -1 * (int) geo.getLocalMeanTimeOffset(cal));
 		return cal.getTime();
 	}