Revision: 75
http://svn.sourceforge.net/objectlabkit/?rev=75&view=rev
Author: marchy
Date: 2006-09-02 01:56:38 -0700 (Sat, 02 Sep 2006)
Log Message:
-----------
comments and simplified if statement to a case
Modified Paths:
--------------
trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java
Modified: trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java
===================================================================
--- trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java 2006-09-01 14:44:09 UTC (rev 74)
+++ trunk/datecalc-jdk/src/main/java/net/objectlab/kit/datecalc/jdk/BaseDateCalculator.java 2006-09-02 08:56:38 UTC (rev 75)
@@ -1,4 +1,6 @@
/*
+ * $Id$
+ *
* Copyright 2006 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not
@@ -32,7 +34,9 @@
* of different HolidayHandler, if no HolidayHandler is defined, the calendar
* will NOT move a date, even if it falls on a holiday or weekend.
*
- * @author Benoit Xhenseval
+ * @author Marcin Jekot
+ * @author $LastModifiedBy$
+ * @version $Revision$ $Date$
*/
public class BaseDateCalculator extends AbstractDateCalculator<Date> {
@@ -117,6 +121,7 @@
if (isIMMMonth(cal)) {
moveToIMMDay(cal);
// TODO simplify this if condition
+// if (forward ^ cal.getTime().before(startDate) || cal.getTime().equals(startDate)) {
if ((forward && cal.getTime().after(startDate)) || (!forward && cal.getTime().before(startDate))) {
return cal.getTime();
}
@@ -133,7 +138,16 @@
private boolean isIMMMonth(final Calendar cal) {
final int month = cal.get(Calendar.MONTH);
- return (month == Calendar.MARCH || month == Calendar.JUNE || month == Calendar.SEPTEMBER || month == Calendar.DECEMBER);
+
+ switch (month) {
+ case Calendar.MARCH:
+ case Calendar.JUNE:
+ case Calendar.SEPTEMBER:
+ case Calendar.DECEMBER:
+ return true;
+ }
+
+ return false;
}
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
