Menu
▾
▴
[Objectlabkit-svn] SF.net SVN: objectlabkit: [202] trunk
|
From: <be...@us...> - 2006-10-11 12:33:17
|
Revision: 202
http://svn.sourceforge.net/objectlabkit/?rev=202&view=rev
Author: benoitx
Date: 2006-10-11 05:32:38 -0700 (Wed, 11 Oct 2006)
Log Message:
-----------
Add middle Ad.
Modified Paths:
--------------
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.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/CalendarKitCalculatorsFactory.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/DateForwardHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java
trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkWorkingWeekTest.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.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/LocalDateIMMDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.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/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java
trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java
trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java
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 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarDateCalculator.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -67,7 +67,15 @@
return !workingWeek.isWorkingDay(date);
}
- public CalendarDateCalculator moveByDays(final int days) {
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ public CalendarDateCalculator moveByDays(final int days) {
getCurrentBusinessDate().add(Calendar.DAY_OF_MONTH, days);
if (getHolidayHandler() != null) {
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarForwardHandler.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -46,6 +46,14 @@
return move(calculator, 1);
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
protected Calendar move(final DateCalculator<Calendar> calculator, final int step) {
final Calendar cal = (Calendar) calculator.getCurrentBusinessDate().clone();
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 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarIMMDateCalculator.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -106,6 +106,14 @@
return cal;
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
private boolean isIMMMonth(final Calendar cal) {
final int month = cal.get(Calendar.MONTH);
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -81,7 +81,15 @@
return cal;
}
- /**
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ /**
* Create a new PeriodCountCalculator.
*
* @return a PeriodCountCalculator
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 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarModifiedFollowingHandler.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -46,7 +46,15 @@
return move(calculator, 1);
}
- protected Calendar move(final DateCalculator<Calendar> calculator, int step) {
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ protected Calendar move(final DateCalculator<Calendar> calculator, int step) {
final Calendar cal = (Calendar) calculator.getCurrentBusinessDate().clone();
final int month = cal.get(Calendar.MONTH);
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 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarPeriodCountCalculator.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -82,7 +82,15 @@
return diff;
}
- private int dayDiff(final Calendar start, final Calendar end) {
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ 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);
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 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateDateCalculator.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -62,7 +62,15 @@
setStartDate(date);
}
- // TODO throw an exception if the type is incorrect
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ // TODO throw an exception if the type is incorrect
public void setWorkingWeek(final WorkingWeek week) {
delegate.setWorkingWeek(week);
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateForwardHandler.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -49,7 +49,15 @@
return move(calculator, 1);
}
- protected Date move(final DateCalculator<Date> calculator, final int step) {
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ protected Date move(final DateCalculator<Date> calculator, final int step) {
final Calendar cal = Utils.getCal(calculator.getCurrentBusinessDate());
while (calculator.isNonWorkingDay(cal.getTime())) {
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateIMMDateCalculator.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -45,6 +45,14 @@
return DELEGATE.getNextIMMDate(requestNextIMM, Utils.getCal(theStartDate), period).getTime();
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
public List<Date> getIMMDates(final Date start, final Date end, final IMMPeriod period) {
return buildList(DELEGATE.getIMMDates(Utils.getCal(start), Utils.getCal(end), period));
}
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -45,7 +45,15 @@
return DEFAULT;
}
- /*
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ /*
* (non-Javadoc)
*
* @see net.objectlab.kit.datecalc.jdk.JdkDateCalculatorFactory#getDateCalculator(java.lang.String,
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 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedFollowingHandler.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -49,6 +49,14 @@
return move(calculator, 1);
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
protected Date move(final DateCalculator<Date> calculator, int step) {
final Calendar cal = (Calendar) Utils.getCal(calculator.getCurrentBusinessDate()).clone();
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateModifiedPreceedingHandler.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -47,6 +47,14 @@
return move(calculator, -1);
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
/**
* Give the type name for this algorithm.
*
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/HolidayHandlerDateWrapper.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -44,7 +44,15 @@
calculator = dateCalculator;
}
- /**
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ /**
* If the current date of the give calculator is a non-working day, it will
* be moved according to the algorithm implemented.
*
Modified: trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkWorkingWeekTest.java
===================================================================
--- trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkWorkingWeekTest.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-jdk/src/test/java/net/objectlab/kit/datecalc/jdk/JdkWorkingWeekTest.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -36,6 +36,14 @@
Assert.assertFalse("Calendar.SUNDAY", ww.isWorkingDayFromCalendar(Calendar.SUNDAY));
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
public void testSetWorkingDayFromCalendar() {
final WorkingWeek ww = new WorkingWeek();
ww.withWorkingDayFromCalendar(true, Calendar.SUNDAY); // sunday
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/HolidayHandlerYearMonthDayWrapper.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -51,7 +51,15 @@
this.calculator = calculator;
}
- /*
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ /*
* (non-Javadoc)
*
* @see net.objectlab.kit.datecalc.common.HolidayHandler#getType()
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaExcelDateUtil.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -51,6 +51,14 @@
.withDayOfMonth(c.get(Calendar.DAY_OF_MONTH));
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
public static YearMonthDay getYearMonthDay(final double date, final boolean use1904windowing) {
final Calendar c = ExcelDateUtil.getJavaCalendar(date, use1904windowing);
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeek.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -47,7 +47,15 @@
this(ww.getWorkingDays());
}
- public boolean isWorkingDay(final LocalDate date) {
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ public boolean isWorkingDay(final LocalDate date) {
final int dayOfWeek = jodaToCalendarDayConstant(date.getDayOfWeek());
return isWorkingDayFromCalendar(dayOfWeek);
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateBackwardHandler.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -46,7 +46,15 @@
return move(calculator, -1);
}
- /**
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ /**
* Give the type name for this algorithm.
*
* @return algorithm name.
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 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateCalculator.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -73,6 +73,14 @@
return !workingWeek.isWorkingDay(date);
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
public DateCalculator<LocalDate> moveByDays(final int days) {
setCurrentBusinessDate(getCurrentBusinessDate().plusDays(days));
@@ -85,18 +93,8 @@
@Override
public DateCalculator<LocalDate> moveByMonths(final int months) {
- // LocalDate date = getCurrentBusinessDate();
- // int day = date.getDayOfMonth();
- // date = date.withDayOfMonth(1).plusMonths(months);
- //
- // int lastDayOfMonth = date.dayOfMonth().getMaximumValue();
- // if (day>lastDayOfMonth) {
- // day = lastDayOfMonth;
- // }
+ setCurrentBusinessDate(getCurrentBusinessDate().plusMonths(months));
- // setCurrentBusinessDate(date.withDayOfMonth(day));
- setCurrentBusinessDate(getCurrentBusinessDate().plusMonths(months));
-
if (getHolidayHandler() != null) {
setCurrentBusinessDate(getHolidayHandler().moveCurrentDate(this));
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateIMMDateCalculator.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -98,6 +98,14 @@
return imm;
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
private LocalDate calculateIMMMonth(final boolean requestNextIMM, LocalDate date, final int month) {
int monthOffset = 0;
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -45,7 +45,15 @@
return DEFAULT;
}
- /**
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ /**
* Create a new DateCalculator for a given name and type of handling.
*
* @param name
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateModifiedFollowingHandler.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -47,7 +47,15 @@
return move(calculator, 1);
}
- protected LocalDate move(final DateCalculator<LocalDate> calculator, int step) {
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ protected LocalDate move(final DateCalculator<LocalDate> calculator, int step) {
LocalDate date = calculator.getCurrentBusinessDate();
final int month = date.getMonthOfYear();
while (calculator.isNonWorkingDay(date)) {
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 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDatePeriodCountCalculator.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -83,7 +83,15 @@
return diff;
}
- public double monthDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ public double monthDiff(final LocalDate start, final LocalDate end, final PeriodCountBasis basis) {
return yearDiff(start, end, basis) * MONTHS_IN_YEAR;
}
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 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayDateCalculator.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -68,6 +68,14 @@
delegate.setWorkingWeek(week);
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
/**
* is the date a non-working day according to the WorkingWeek?
*/
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayForwardHandler.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -46,6 +46,14 @@
return move(calculator, 1);
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
protected YearMonthDay move(final DateCalculator<YearMonthDay> calculator, final int step) {
YearMonthDay date = calculator.getCurrentBusinessDate();
while (calculator.isNonWorkingDay(date)) {
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayIMMDateCalculator.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -48,7 +48,15 @@
return new YearMonthDay(DELEGATE.getNextIMMDate(requestNextIMM, theStartDate.toLocalDate(), period));
}
- public List<YearMonthDay> getIMMDates(final YearMonthDay start, final YearMonthDay end, final IMMPeriod period) {
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ public List<YearMonthDay> getIMMDates(final YearMonthDay start, final YearMonthDay end, final IMMPeriod period) {
return buildList(DELEGATE.getIMMDates(start.toLocalDate(), end.toLocalDate(), period));
}
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -47,7 +47,15 @@
return DEFAULT;
}
- /**
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
+ /**
* Create a new DateCalculator for a given name and type of handling.
*
* @param name
Modified: trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java
===================================================================
--- trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayModifiedFollowingHandler.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -56,6 +56,14 @@
return move(calculator, 1);
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
protected YearMonthDay move(final DateCalculator<YearMonthDay> calculator, int step) {
YearMonthDay date = calculator.getCurrentBusinessDate();
final int month = date.getMonthOfYear();
Modified: trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java
===================================================================
--- trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java 2006-10-11 12:17:59 UTC (rev 201)
+++ trunk/datecalc-joda/src/test/java/net/objectlab/kit/datecalc/joda/JodaWorkingWeekTest.java 2006-10-11 12:32:38 UTC (rev 202)
@@ -61,16 +61,19 @@
Assert.assertTrue("Calendar.MONDAY", ww.isWorkingDay(date));
}
+ // -----------------------------------------------------------------------
+ //
+ // ObjectLab, world leaders in the design and development of bespoke
+ // applications for the securities financing markets.
+ // www.ObjectLab.co.uk
+ //
+ // -----------------------------------------------------------------------
+
public void testSetWorkingDayFromDateTimeConstant() {
ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.SUNDAY); // sunday
- // working
- // day
+ // working day
ww = ww.withWorkingDayFromDateTimeConstant(true, DateTimeConstants.SUNDAY); // sunday
- // working
- // day
- // do
- // it
- // twice
+ // working day do it twice
Assert.assertTrue("DateTimeConstants.MONDAY", ww.isWorkingDayFromDateTimeConstant(DateTimeConstants.MONDAY));
Assert.assertTrue("DateTimeConstants.TUESDAY", ww.isWorkingDayFromDateTimeConstant(DateTimeConstants.TUESDAY));
Assert.assertTrue("DateTimeConstants.WEDNESDAY", ww.isWorkingDayFromDateTimeConstant(DateTimeConstants.WEDNESDAY));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
