[iCal4j-commit] iCal4j/source/net/fortuna/ical4j/model/component VFreeBusy.java, 1.44, 1.45

[Ben F. <fo...@us...>]

Update of /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model/component
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv27761/source/net/fortuna/ical4j/model/component

Modified Files:
	VFreeBusy.java 
Log Message:
Use date range where possible to improve code re-use

Index: VFreeBusy.java
===================================================================
RCS file: /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model/component/VFreeBusy.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** VFreeBusy.java	13 Aug 2009 14:00:33 -0000	1.44
--- VFreeBusy.java	13 Aug 2009 14:05:40 -0000	1.45
***************
*** 465,469 ****
                  
                  // check if period outside bounds..
- //                if (period.getStart().after(end) || period.getEnd().before(start)) {
                  if (range.contains(period)) {
                      
--- 465,468 ----
***************
*** 473,481 ****
                          fb.getPeriods().add(new Period(lastPeriodEnd, freeDuration.getDuration()));
                      }
-                     if (period.getEnd().after(lastPeriodEnd)) {
-                         lastPeriodEnd = period.getEnd();
-                     }
                  }
!                 else if (range.intersects(period) && lastPeriodEnd.before(period.getEnd())) {
                      lastPeriodEnd = period.getEnd();
                  }
--- 472,478 ----
                          fb.getPeriods().add(new Period(lastPeriodEnd, freeDuration.getDuration()));
                      }
                  }
!                 
!                 if (period.getEnd().after(lastPeriodEnd)) {
                      lastPeriodEnd = period.getEnd();
                  }