[iCal4j-commit] iCal4j/source/net/fortuna/ical4j/model/component VFreeBusy.java, 1.45, 1.46 CalendarComponent.java, 1.11, 1.12 VAlarm.java, 1.27, 1.28

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

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

Modified Files:
	VFreeBusy.java CalendarComponent.java VAlarm.java 
Log Message:
Checkstyle-based clean up

Index: VAlarm.java
===================================================================
RCS file: /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model/component/VAlarm.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** VAlarm.java	9 Aug 2009 05:39:35 -0000	1.27
--- VAlarm.java	17 Sep 2009 12:30:23 -0000	1.28
***************
*** 279,283 ****
           */
          
!         Validator actionValidator = (Validator) actionValidators.get(getAction());
          if (actionValidator != null) {
              actionValidator.validate();
--- 279,283 ----
           */
          
!         final Validator actionValidator = (Validator) actionValidators.get(getAction());
          if (actionValidator != null) {
              actionValidator.validate();

Index: VFreeBusy.java
===================================================================
RCS file: /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model/component/VFreeBusy.java,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** VFreeBusy.java	13 Aug 2009 14:05:40 -0000	1.45
--- VFreeBusy.java	17 Sep 2009 12:30:23 -0000	1.46
***************
*** 318,326 ****
          this();
          
!         DtStart start = (DtStart) request.getProperty(Property.DTSTART);
          
!         DtEnd end = (DtEnd) request.getProperty(Property.DTEND);
          
!         Duration duration = (Duration) request.getProperty(Property.DURATION);
          
          // 4.8.2.4 Date/Time Start:
--- 318,326 ----
          this();
          
!         final DtStart start = (DtStart) request.getProperty(Property.DTSTART);
          
!         final DtEnd end = (DtEnd) request.getProperty(Property.DTEND);
          
!         final Duration duration = (Duration) request.getProperty(Property.DURATION);
          
          // 4.8.2.4 Date/Time Start:
***************
*** 342,348 ****
              getProperties().add(new Duration(duration.getDuration()));
              // Initialise with all free time of at least the specified duration..
!             DateTime freeStart = new DateTime(start.getDate());
!             DateTime freeEnd = new DateTime(end.getDate());
!             FreeBusy fb = new FreeTimeBuilder().start(freeStart)
                  .end(freeEnd)
                  .duration(duration.getDuration())
--- 342,348 ----
              getProperties().add(new Duration(duration.getDuration()));
              // Initialise with all free time of at least the specified duration..
!             final DateTime freeStart = new DateTime(start.getDate());
!             final DateTime freeEnd = new DateTime(end.getDate());
!             final FreeBusy fb = new FreeTimeBuilder().start(freeStart)
                  .end(freeEnd)
                  .duration(duration.getDuration())
***************
*** 355,361 ****
          else {
              // initialise with all busy time for the specified period..
!             DateTime busyStart = new DateTime(start.getDate());
!             DateTime busyEnd = new DateTime(end.getDate());
!             FreeBusy fb = new BusyTimeBuilder().start(busyStart)
                  .end(busyEnd)
                  .components(components)
--- 355,361 ----
          else {
              // initialise with all busy time for the specified period..
!             final DateTime busyStart = new DateTime(start.getDate());
!             final DateTime busyEnd = new DateTime(end.getDate());
!             final FreeBusy fb = new BusyTimeBuilder().start(busyStart)
                  .end(busyEnd)
                  .components(components)
***************
*** 490,497 ****
              final DateTime rangeEnd) {
          
!         PeriodList periods = new PeriodList();
          // only events consume time..
!         for (Iterator i = components.getComponents(Component.VEVENT).iterator(); i.hasNext();) {
!             Component component = (Component) i.next();
              periods.addAll(((VEvent) component).getConsumedTime(rangeStart, rangeEnd, false));
          }
--- 490,497 ----
              final DateTime rangeEnd) {
          
!         final PeriodList periods = new PeriodList();
          // only events consume time..
!         for (final Iterator i = components.getComponents(Component.VEVENT).iterator(); i.hasNext();) {
!             final Component component = (Component) i.next();
              periods.addAll(((VEvent) component).getConsumedTime(rangeStart, rangeEnd, false));
          }
***************
*** 519,523 ****
          }
  
!         PropertyValidator validator = PropertyValidator.getInstance();
  
          /*
--- 519,523 ----
          }
  
!         final PropertyValidator validator = PropertyValidator.getInstance();
  
          /*
***************
*** 549,553 ****
  
          // DtEnd value must be later in time that DtStart..
!         DtStart dtStart = (DtStart) getProperty(Property.DTSTART);
          
          // 4.8.2.4 Date/Time Start:
--- 549,553 ----
  
          // DtEnd value must be later in time that DtStart..
!         final DtStart dtStart = (DtStart) getProperty(Property.DTSTART);
          
          // 4.8.2.4 Date/Time Start:
***************
*** 560,564 ****
          }
          
!         DtEnd dtEnd = (DtEnd) getProperty(Property.DTEND);
          
          // 4.8.2.2 Date/Time End
--- 560,564 ----
          }
          
!         final DtEnd dtEnd = (DtEnd) getProperty(Property.DTEND);
          
          // 4.8.2.2 Date/Time End
***************
*** 702,705 ****
--- 702,707 ----
      
      /**
+      * METHOD:REQUEST Validator.
+      * 
       * <pre>
       * Component/Property  Presence

Index: CalendarComponent.java
===================================================================
RCS file: /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model/component/CalendarComponent.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** CalendarComponent.java	2 Sep 2009 10:12:54 -0000	1.11
--- CalendarComponent.java	17 Sep 2009 12:30:23 -0000	1.12
***************
*** 79,83 ****
       */
      public final void validate(Method method) throws ValidationException {
!         Validator validator = getValidator(method);
          if (validator != null) {
              validator.validate();
--- 79,83 ----
       */
      public final void validate(Method method) throws ValidationException {
!         final Validator validator = getValidator(method);
          if (validator != null) {
              validator.validate();