Menu
▾
▴
[Objectlabkit-svn] SF.net SVN: objectlabkit:[300] trunk
|
From: <be...@us...> - 2010-03-18 20:09:25
|
Revision: 300
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=300&view=rev
Author: benoitx
Date: 2010-03-18 20:09:14 +0000 (Thu, 18 Mar 2010)
Log Message:
-----------
Fixing a few Sonar issues as well as physically removing the deprecated methods and constructors...
next release is going to be clean!
Modified Paths:
--------------
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java
trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java
trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculatorTest.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
trunk/src/changes/changes.xml
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -126,27 +126,6 @@
}
/**
- * @deprecated should use getHolidayCalendar
- */
- @Deprecated
- public Set<E> getNonWorkingDays() {
- return Collections.unmodifiableSet(holidayCalendar.getHolidays());
- }
-
- /**
- * @deprecated use the HolidayCalendar
- */
- @Deprecated
- public void setNonWorkingDays(final Set<E> holidays) {
- if (holidays == null) {
- final Set<E> col = Collections.emptySet();
- holidayCalendar = new DefaultHolidayCalendar<E>(col);
- } else {
- holidayCalendar = new DefaultHolidayCalendar<E>(holidays);
- }
- }
-
- /**
* move the current date by a given tenor, this means that if a date is
* either a 'weekend' or holiday, it will be skipped acording to the holiday
* handler and not count towards the number of days to move.
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/DateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -118,17 +118,6 @@
/**
* This is typically used at the construction of a DateCalculator to give a
- * reference to a set of holidays.
- *
- * @param holidays
- * the holiday (if null, an empty set will be put in place)
- * @deprecated should use setHolidayCalendar
- */
- @Deprecated
- void setNonWorkingDays(final Set<E> holidays);
-
- /**
- * This is typically used at the construction of a DateCalculator to give a
* reference to a Holiday Calendar, if not the case, the calculator will
* make an immutable copy of the HolidayCalendar.
*
@@ -147,15 +136,6 @@
// -----------------------------------------------------------------------
/**
- * Gives a immutable copy of the set of registered holidays.
- *
- * @return an immutable copy of the holiday set.
- * @deprecated use getHolidayCalendar, likely to be REMOVED next release.
- */
- @Deprecated
- Set<E> getNonWorkingDays();
-
- /**
* Returns an immutable version of the HolidayCalendar.
* @return a copy of the holiday calendar
* @since 1.1.0
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/PeriodCountBasis.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -96,19 +96,7 @@
* the day count fraction is equal to the number of days between the last
* payment date and the next date divided by 365.
*/
- ACT_365,
-
- /**
- * @deprecated this is not a common convention, and won't be included in future releases
- */
- @Deprecated
- ACT_UST,
-
- /**
- * @deprecated this is not a common convention, and won't be included in future releases
- */
- @Deprecated
- END_365
+ ACT_365
}
/*
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractDateCalculatorFactoryTest.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -161,18 +161,6 @@
}
}
- public void testSetHol() {
- final DateCalculator<E> cal1 = getDateCalculatorFactory().getDateCalculator("bla", null);
-
- Assert.assertNotNull("No algo", cal1);
- Assert.assertNotNull("No hol", cal1.getHolidayCalendar().getHolidays());
- Assert.assertTrue("empty hol", cal1.getHolidayCalendar().getHolidays().isEmpty());
-
- cal1.setNonWorkingDays(null);
- Assert.assertNotNull("empty", cal1.getHolidayCalendar().getHolidays());
- Assert.assertTrue("empty hol", cal1.getHolidayCalendar().getHolidays().isEmpty());
- }
-
public void testSetHolCal() {
final DateCalculator<E> cal1 = getDateCalculatorFactory().getDateCalculator("bla", null);
Modified: trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculatorTest.java
===================================================================
--- trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculatorTest.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-common/src/test/java/net/objectlab/kit/datecalc/common/AbstractPeriodCountCalculatorTest.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -435,28 +435,6 @@
runtests(ACT_ACT);
}
- public void testUnsupportedType() {
- Assert.assertNotNull(cal);
-
- final PeriodCountBasis pcount = PeriodCountBasis.ACT_UST;
- final E start = getDate();
- final E end = getDate();
-
- try {
- cal.yearDiff(start, end, pcount);
- Assert.fail("Should have refused the algo...");
- } catch (final UnsupportedOperationException e) {
- // ok
- }
-
- try {
- cal.monthDiff(start, end, pcount);
- Assert.fail("Should have refused the algo...");
- } catch (final UnsupportedOperationException e) {
- // ok
- }
- }
-
private void runtests(final String[][] tests) {
for (final String[] test : tests) {
runtest(cal, test);
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -62,19 +62,6 @@
this(null, null, new DefaultHolidayCalendar<Calendar>(Collections.EMPTY_SET), null);
}
- /**
- * @deprecated should use the constructor with HolidayCalendar.
- * @param name
- * @param startDate
- * @param nonWorkingDays
- * @param holidayHandler
- */
- @Deprecated
- public CalendarDateCalculator(final String name, final Calendar startDate, final Set<Calendar> nonWorkingDays,
- final HolidayHandler<Calendar> holidayHandler) {
- this(name, startDate, new DefaultHolidayCalendar<Calendar>(nonWorkingDays), holidayHandler);
- }
-
public CalendarDateCalculator(final String name, final Calendar startDate, final HolidayCalendar<Calendar> holidayCalendar,
final HolidayHandler<Calendar> holidayHandler) {
super(name, holidayCalendar, holidayHandler);
@@ -138,7 +125,7 @@
}
@Override
- protected Calendar getToday() {
+ protected final Calendar getToday() {
return Utils.blastTime(Calendar.getInstance());
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -111,8 +111,14 @@
moveToIMMDay(cal);
+ cal = handlePeriod(requestNextIMM, period, cal);
+
+ return cal;
+ }
+
+ private Calendar handlePeriod(final boolean requestNextIMM, final IMMPeriod period, final Calendar givenCal) {
+ Calendar cal = givenCal;
final int month = cal.get(MONTH);
-
switch (period) {
case BI_ANNUALY_JUN_DEC:
if (month == MARCH || month == SEPTEMBER) {
@@ -139,7 +145,6 @@
cal = getNextIMMDate(requestNextIMM, cal, QUARTERLY);
break;
}
-
return cal;
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -69,9 +69,9 @@
//
// -----------------------------------------------------------------------
- protected Calendar move(final DateCalculator<Calendar> calculator, int step) {
+ protected Calendar move(final DateCalculator<Calendar> calculator, final int givenStep) {
final Calendar cal = (Calendar) calculator.getCurrentBusinessDate().clone();
-
+ int step = givenStep;
final int month = cal.get(Calendar.MONTH);
while (calculator.isNonWorkingDay(cal)) {
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -53,58 +53,74 @@
public int dayDiff(final Calendar start, final Calendar end, final PeriodCountBasis basis) {
int diff = 0;
- int dayStart;
- int dayEnd;
-
+
switch (basis) {
case CONV_30_360:
- dayStart = start.get(Calendar.DAY_OF_MONTH);
- dayEnd = end.get(Calendar.DAY_OF_MONTH);
- if (dayEnd == MONTH_31_DAYS && dayStart >= MONTH_30_DAYS) {
- dayEnd = MONTH_30_DAYS;
- }
- if (dayStart == MONTH_31_DAYS) {
- dayStart = MONTH_30_DAYS;
- }
- diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360
- + (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd - dayStart;
+ diff = calculateConv30360(start, end);
break;
case CONV_360E_ISDA:
- dayStart = start.get(Calendar.DAY_OF_MONTH);
- dayEnd = end.get(Calendar.DAY_OF_MONTH);
- final int monthStart = start.get(Calendar.MONTH);
- if ((monthStart == 2 && start.getActualMaximum(Calendar.DAY_OF_MONTH) == dayStart) || dayEnd == MONTH_31_DAYS) {
- dayEnd = MONTH_30_DAYS;
- }
- if (dayStart == MONTH_31_DAYS) {
- dayStart = MONTH_30_DAYS;
- }
-
- diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360
- + (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd - dayStart;
+ diff = calculateConv360EIsda(start, end);
break;
case CONV_360E_ISMA:
- dayStart = start.get(Calendar.DAY_OF_MONTH);
- dayEnd = end.get(Calendar.DAY_OF_MONTH);
- if (dayEnd == MONTH_31_DAYS) {
- dayEnd = MONTH_30_DAYS;
- }
- if (dayStart == MONTH_31_DAYS) {
- dayStart = MONTH_30_DAYS;
- }
- diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360
- + (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd - dayStart;
+ diff = calculateConv360EIsma(start, end);
break;
-
+
default:
diff = dayDiff(start, end);
}
-
+
return diff;
}
+ private int calculateConv360EIsma(final Calendar start, final Calendar end) {
+ int diff;
+ int dayStart = start.get(Calendar.DAY_OF_MONTH);
+ int dayEnd = end.get(Calendar.DAY_OF_MONTH);
+ if (dayEnd == MONTH_31_DAYS) {
+ dayEnd = MONTH_30_DAYS;
+ }
+ if (dayStart == MONTH_31_DAYS) {
+ dayStart = MONTH_30_DAYS;
+ }
+ diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360 + (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd
+ - dayStart;
+ return diff;
+ }
+
+ private int calculateConv360EIsda(final Calendar start, final Calendar end) {
+ int diff;
+ int dayStart = start.get(Calendar.DAY_OF_MONTH);
+ int dayEnd = end.get(Calendar.DAY_OF_MONTH);
+ final int monthStart = start.get(Calendar.MONTH);
+ if ((monthStart == 2 && start.getActualMaximum(Calendar.DAY_OF_MONTH) == dayStart) || dayEnd == MONTH_31_DAYS) {
+ dayEnd = MONTH_30_DAYS;
+ }
+ if (dayStart == MONTH_31_DAYS) {
+ dayStart = MONTH_30_DAYS;
+ }
+
+ diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360 + (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd
+ - dayStart;
+ return diff;
+ }
+
+ private int calculateConv30360(final Calendar start, final Calendar end) {
+ int diff;
+ int dayStart = start.get(Calendar.DAY_OF_MONTH);
+ int dayEnd = end.get(Calendar.DAY_OF_MONTH);
+ if (dayEnd == MONTH_31_DAYS && dayStart >= MONTH_30_DAYS) {
+ dayEnd = MONTH_30_DAYS;
+ }
+ if (dayStart == MONTH_31_DAYS) {
+ dayStart = MONTH_30_DAYS;
+ }
+ diff = (end.get(Calendar.YEAR) - start.get(Calendar.YEAR)) * YEAR_360 + (end.get(Calendar.MONTH) - start.get(Calendar.MONTH)) * MONTH_30_DAYS + dayEnd
+ - dayStart;
+ return diff;
+ }
+
// -----------------------------------------------------------------------
//
// ObjectLab, world leaders in the design and development of bespoke
@@ -113,7 +129,7 @@
//
// -----------------------------------------------------------------------
- private int dayDiff(final Calendar start, final Calendar end) {
+ private int dayDiff(final Calendar start, final Calendar end) {
final long diff = Math.abs(start.getTimeInMillis() - end.getTimeInMillis());
final double dayDiff = ((double) diff) / MILLIS_IN_DAY;
return (int) Math.round(dayDiff);
@@ -125,7 +141,7 @@
public double yearDiff(final Calendar start, final Calendar end, final PeriodCountBasis basis) {
double diff = 0.0;
-
+
switch (basis) {
case ACT_ACT:
final int startYear = start.get(Calendar.YEAR);
@@ -152,14 +168,13 @@
break;
case ACT_365:
- case END_365:
diff = (dayDiff(start, end, basis)) / YEAR_365_0;
break;
-
+
default:
throw new UnsupportedOperationException("Sorry no ACT_UST yet");
}
-
+
return diff;
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -63,19 +63,6 @@
this(null, null, new DefaultHolidayCalendar<Date>(Collections.EMPTY_SET), null);
}
- /**
- * @deprecated should use the constructor with HolidayCalendar.
- * @param name
- * @param startDate
- * @param nonWorkingDays
- * @param holidayHandler
- */
- @Deprecated
- public DateDateCalculator(final String name, final Date startDate, final Set<Date> nonWorkingDays,
- final HolidayHandler<Date> holidayHandler) {
- this(name, startDate, new DefaultHolidayCalendar<Date>(nonWorkingDays), holidayHandler);
- }
-
public DateDateCalculator(final String name, final Date startDate, final HolidayCalendar<Date> holidayCalendar,
final HolidayHandler<Date> holidayHandler) {
super(name, holidayCalendar, holidayHandler);
@@ -130,7 +117,7 @@
}
@Override
- public void setStartDate(final Date startDate) {
+ public final void setStartDate(final Date startDate) {
if (delegate != null) {
delegate.setStartDate(startDate != null ? Utils.getCal(startDate) : null);
}
@@ -138,7 +125,7 @@
}
@Override
- protected Date getToday() {
+ protected final Date getToday() {
return Utils.blastTime(Calendar.getInstance()).getTime();
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -72,9 +72,9 @@
//
// -----------------------------------------------------------------------
- protected Date move(final DateCalculator<Date> calculator, int step) {
+ protected Date move(final DateCalculator<Date> calculator, final int givenStep) {
final Calendar cal = (Calendar) Utils.getCal(calculator.getCurrentBusinessDate()).clone();
-
+ int step = givenStep;
final int month = cal.get(Calendar.MONTH);
while (calculator.isNonWorkingDay(cal.getTime())) {
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -63,19 +63,6 @@
this(null, null, new DefaultHolidayCalendar<LocalDate>(Collections.EMPTY_SET), null);
}
- /**
- * @deprecated should use the constructor with HolidayCalendar.
- * @param name
- * @param startDate
- * @param nonWorkingDays
- * @param holidayHandler
- */
- @Deprecated
- public LocalDateCalculator(final String name, final LocalDate startDate, final Set<LocalDate> nonWorkingDays,
- final HolidayHandler<LocalDate> holidayHandler) {
- this(name, startDate, new DefaultHolidayCalendar<LocalDate>(nonWorkingDays), holidayHandler);
- }
-
public LocalDateCalculator(final String name, final LocalDate startDate, final HolidayCalendar<LocalDate> holidayCalendar,
final HolidayHandler<LocalDate> holidayHandler) {
super(name, holidayCalendar, holidayHandler);
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -151,7 +151,6 @@
break;
case ACT_365:
- case END_365:
diff = (dayDiff(start, end, basis)) / YEAR_365_0;
break;
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java 2010-03-18 20:09:14 UTC (rev 300)
@@ -65,21 +65,8 @@
this(null, null, new DefaultHolidayCalendar<YearMonthDay>(Collections.EMPTY_SET), null);
}
- /**
- * @deprecated should use the constructor with HolidayCalendar.
- * @param name
- * @param startDate
- * @param nonWorkingDays
- * @param holidayHandler
- */
- @Deprecated
- public YearMonthDayDateCalculator(final String name, final YearMonthDay startDate, final Set<YearMonthDay> nonWorkingDays,
+ public YearMonthDayDateCalculator(final String name, final YearMonthDay startDate, final HolidayCalendar<YearMonthDay> nonWorkingDays,
final HolidayHandler<YearMonthDay> holidayHandler) {
- this(name, startDate, new DefaultHolidayCalendar<YearMonthDay>(nonWorkingDays), holidayHandler);
- }
-
- public YearMonthDayDateCalculator(final String name, final YearMonthDay startDate,
- final HolidayCalendar<YearMonthDay> nonWorkingDays, final HolidayHandler<YearMonthDay> holidayHandler) {
super(name, nonWorkingDays, holidayHandler);
final Set<LocalDate> dates = new HashSet<LocalDate>();
@@ -89,8 +76,8 @@
final YearMonthDay early = nonWorkingDays.getEarlyBoundary();
final YearMonthDay late = nonWorkingDays.getLateBoundary();
- final DefaultHolidayCalendar<LocalDate> cal = new DefaultHolidayCalendar<LocalDate>(dates, early != null ? new LocalDate(
- early) : null, late != null ? new LocalDate(late) : null);
+ final DefaultHolidayCalendar<LocalDate> cal = new DefaultHolidayCalendar<LocalDate>(dates, early != null ? new LocalDate(early) : null,
+ late != null ? new LocalDate(late) : null);
final HolidayHandler<LocalDate> locDate = new HolidayHandlerYearMonthDayWrapper(holidayHandler, this);
@@ -130,8 +117,8 @@
}
@Override
- protected DateCalculator<YearMonthDay> createNewCalculator(final String name, final YearMonthDay startDate,
- final HolidayCalendar<YearMonthDay> holidays, final HolidayHandler<YearMonthDay> handler) {
+ protected DateCalculator<YearMonthDay> createNewCalculator(final String name, final YearMonthDay startDate, final HolidayCalendar<YearMonthDay> holidays,
+ final HolidayHandler<YearMonthDay> handler) {
return new YearMonthDayDateCalculator(name, startDate, holidays, handler);
}
Modified: trunk/src/changes/changes.xml
===================================================================
--- trunk/src/changes/changes.xml 2010-03-13 10:14:05 UTC (rev 299)
+++ trunk/src/changes/changes.xml 2010-03-18 20:09:14 UTC (rev 300)
@@ -7,6 +7,8 @@
</properties>
<body>
<release version="1.2.0" date="in SVN" description="Maintenance">
+ <action dev="benoitx" type="fix">Removed the deprecated constructors that used to take Set of "Date", use the HolidayCalendar.</action>
+ <action dev="benoitx" type="fix">Removed the deprecated method DateCalculator.setNonWorkingDays and getNonWorkingDays.</action>
<action dev="benoitx" type="add" due-to="Neil Bartlett">The ObjectLab Kit is now an OSGi Bundle!</action>
<action dev="benoitx" type="fix" issue="atid=872033&aid=1929838" due-to="Anthony Whitford">Spelling for "PRECEEDING" corrected to PRECEDING, deprecated the mispelt name.</action>
<action dev="benoitx" type="add">Enhanced the KitCalculatorsFactory to be able to get the holidayCalendar names and unregister calendars.</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
