diff --git a/src/main/java/ua/net/uid/utils/time/DailyEquation.java b/src/main/java/ua/net/uid/utils/time/DailyEquation.java index 23f8154..5bbcd95 100644 --- a/src/main/java/ua/net/uid/utils/time/DailyEquation.java +++ b/src/main/java/ua/net/uid/utils/time/DailyEquation.java @@ -84,7 +84,8 @@ // UT = T - lngHour return localMeanTime - baseLongitudeHour; } - + + private static final int DAYMSEC = 24 * 60 * 60 * 1000; protected static long convertDate(Calendar calendar, double utcTime) { // localT = UT + localOffset int time = (int)(utcTime * 3600000) + calendar.get(Calendar.ZONE_OFFSET) + calendar.get(Calendar.DST_OFFSET); @@ -99,5 +100,5 @@ return calendar.getTimeInMillis(); } - private static final int DAYMSEC = 24 * 60 * 60 * 1000; + private DailyEquation() {} } diff --git a/src/main/java/ua/net/uid/utils/time/DailyEvents.java b/src/main/java/ua/net/uid/utils/time/DailyEvents.java index a88e146..e75ba4e 100644 --- a/src/main/java/ua/net/uid/utils/time/DailyEvents.java +++ b/src/main/java/ua/net/uid/utils/time/DailyEvents.java @@ -1,5 +1,7 @@ package ua.net.uid.utils.time; +import java.util.Objects; + public class DailyEvents { private final Long sunrise; private final Long sunset; @@ -22,4 +24,21 @@ public DailyEventType getType() { return type; } + + public boolean equals(DailyEvents other) { + return other == this || (other != null + && Objects.equals(sunrise, other.sunrise) + && Objects.equals(sunset, other.sunset) + && Objects.equals(type, other.type)); + } + + @Override + public int hashCode() { + return Objects.hash(sunrise, sunset, type) ^ getClass().hashCode(); + } + + @Override + public boolean equals(Object other) { + return other instanceof DailyEvents && equals((DailyEvents) other); + } }