Menu
▾
▴
[Objectlabkit-svn] SF.net SVN: objectlabkit:[271] trunk
|
From: <ma...@us...> - 2009-03-17 17:51:09
|
Revision: 271
http://objectlabkit.svn.sourceforge.net/objectlabkit/?rev=271&view=rev
Author: marchy
Date: 2009-03-17 17:50:59 +0000 (Tue, 17 Mar 2009)
Log Message:
-----------
removed deprecated MODIFIED_PRECEEDING, and releated classes
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/HolidayHandlerType.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/DateKitCalculatorsFactory.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/YearMonthDayKitCalculatorsFactory.java
trunk/src/site/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 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/AbstractDateCalculator.java 2009-03-17 17:50:59 UTC (rev 271)
@@ -35,7 +35,6 @@
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.BACKWARD;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
-import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEDING;
import java.util.ArrayList;
@@ -309,8 +308,7 @@
public DateCalculator<E> moveByBusinessDays(final int businessDays) {
if (businessDays > 0
&& holidayHandler != null
- && (holidayHandler.getType().equals(BACKWARD) || holidayHandler.getType().equals(MODIFIED_PRECEEDING) || holidayHandler.getType().equals(
- MODIFIED_PRECEDING))) {
+ && (holidayHandler.getType().equals(BACKWARD) || holidayHandler.getType().equals(MODIFIED_PRECEDING))) {
throw new IllegalArgumentException("A " + MODIFIED_PRECEDING + " or " + BACKWARD + " does not allow positive steps for moveByBusinessDays");
} else if (businessDays < 0 && holidayHandler != null
&& (holidayHandler.getType().equals(FORWARD) || holidayHandler.getType().equals(MODIFIED_FOLLOWING))) {
Modified: trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandlerType.java
===================================================================
--- trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandlerType.java 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/datecalc-common/src/main/java/net/objectlab/kit/datecalc/common/HolidayHandlerType.java 2009-03-17 17:50:59 UTC (rev 271)
@@ -70,15 +70,6 @@
public static final String MODIFIED_FOLLOWING = "modifiedFollowing";
/**
- * A modified preceeding handler will move the date backward if it falls on
- * a non working day BUT, if the new date falls into another month, it will
- * revert to moving forward until it finds a working day.
- * @deprecated uses MODIFIED_PRECEDING (spelling...)
- */
- @Deprecated
- public static final String MODIFIED_PRECEEDING = "modifiedPreceeding";
-
- /**
* A modified preceding handler will move the date backward if it falls on
* a non working day BUT, if the new date falls into another month, it will
* revert to moving forward until it finds a working day.
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 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/CalendarKitCalculatorsFactory.java 2009-03-17 17:50:59 UTC (rev 271)
@@ -36,7 +36,6 @@
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
-import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEDING;
import java.util.Calendar;
@@ -94,8 +93,6 @@
cal.setHolidayHandler(new CalendarBackwardHandler());
} else if (MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new CalendarModifiedFollowingHandler());
- } else if (MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
- cal.setHolidayHandler(new CalendarModifiedPreceedingHandler());
} else if (MODIFIED_PRECEDING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new CalendarModifiedPrecedingHandler());
} else if (FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
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 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/DateKitCalculatorsFactory.java 2009-03-17 17:50:59 UTC (rev 271)
@@ -36,7 +36,6 @@
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
-import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEDING;
import java.util.Date;
@@ -93,8 +92,6 @@
cal.setHolidayHandler(new DateBackwardHandler());
} else if (MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new DateModifiedFollowingHandler());
- } else if (MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
- cal.setHolidayHandler(new DateModifiedPreceedingHandler());
} else if (MODIFIED_PRECEDING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new DateModifiedPrecedingHandler());
} else if (FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
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 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/LocalDateKitCalculatorsFactory.java 2009-03-17 17:50:59 UTC (rev 271)
@@ -35,7 +35,6 @@
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.BACKWARD;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
-import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEDING;
import net.objectlab.kit.datecalc.common.AbstractKitCalculatorsFactory;
import net.objectlab.kit.datecalc.common.HolidayHandlerType;
@@ -95,8 +94,6 @@
cal.setHolidayHandler(new LocalDateBackwardHandler());
} else if (MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new LocalDateModifiedFollowingHandler());
- } else if (MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
- cal.setHolidayHandler(new LocalDateModifiedPreceedingHandler());
} else if (MODIFIED_PRECEDING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new LocalDateModifiedPrecedingHandler());
} else if (FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
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 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/datecalc-joda/src/main/java/net/objectlab/kit/datecalc/joda/YearMonthDayKitCalculatorsFactory.java 2009-03-17 17:50:59 UTC (rev 271)
@@ -36,7 +36,6 @@
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.FORWARD_UNLESS_MOVING_BACK;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_FOLLOWING;
-import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEEDING;
import static net.objectlab.kit.datecalc.common.HolidayHandlerType.MODIFIED_PRECEDING;
import net.objectlab.kit.datecalc.common.AbstractKitCalculatorsFactory;
import net.objectlab.kit.datecalc.common.DateCalculator;
@@ -101,8 +100,6 @@
cal.setHolidayHandler(new YearMonthDayBackwardHandler());
} else if (MODIFIED_FOLLOWING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new YearMonthDayModifiedFollowingHandler());
- } else if (MODIFIED_PRECEEDING.equals(holidayHandlerType)) {
- cal.setHolidayHandler(new YearMonthDayModifiedPreceedingHandler());
} else if (MODIFIED_PRECEDING.equals(holidayHandlerType)) {
cal.setHolidayHandler(new YearMonthDayModifiedPrecedingHandler());
} else if (FORWARD_UNLESS_MOVING_BACK.equals(holidayHandlerType)) {
Modified: trunk/src/site/changes.xml
===================================================================
--- trunk/src/site/changes.xml 2009-03-17 17:29:39 UTC (rev 270)
+++ trunk/src/site/changes.xml 2009-03-17 17:50:59 UTC (rev 271)
@@ -11,8 +11,9 @@
<release version="1.2.0" date="in SVN" description="Maintenance">
<action dev="benoitx" type="fix" issue="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>
- <action dev="benoitx" type="fix">The deprecated method KitCalculatorsFactory.registerHolidays(Set holidays) has been removed!</action>
- <action dev="marchy" type="fix" issue="2389053" due-to="Didier L.">Fixed negative moves with Forward Unless Moving Back Handler</action>
+ <action dev="benoitx" type="fix">Removed the deprecated method KitCalculatorsFactory.registerHolidays(Set holidays).</action>
+ <action dev="marchy" type="fix" issue="2389053" due-to="Didier L.">Fixed negative moves with Forward Unless Moving Back Handler.</action>
+ <action dev="marchy" type="fix">Removed the deprecated constant MODIFIED_PRECEEDING, and related classes.</action>
</release>
<release version="1.1.0" date="2008-03-25" description="Maintenance">
<action dev="benoitx" type="add">Changed JODA dependency to 1.5</action>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
