[iCal4j-commit] iCal4j/source/net/fortuna/ical4j/model/component VToDo.java, 1.43, 1.44 VEvent.java, 1.60, 1.61 VJournal.java, 1.29, 1.30

[Arnaud Q. <qui...@us...>]

Update of /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model/component
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv11338

Modified Files:
	VToDo.java VEvent.java VJournal.java 
Log Message:
When checking per component valid status, compare property value only (and not params)

Index: VEvent.java
===================================================================
RCS file: /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model/component/VEvent.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** VEvent.java	6 Mar 2010 12:57:25 -0000	1.60
--- VEvent.java	11 Mar 2010 12:50:23 -0000	1.61
***************
*** 405,411 ****
  
          final Status status = (Status) getProperty(Property.STATUS);
!         if (status != null && !Status.VEVENT_TENTATIVE.equals(status)
!                 && !Status.VEVENT_CONFIRMED.equals(status)
!                 && !Status.VEVENT_CANCELLED.equals(status)) {
              throw new ValidationException("Status property ["
                      + status.toString() + "] is not applicable for VEVENT");
--- 405,411 ----
  
          final Status status = (Status) getProperty(Property.STATUS);
!         if (status != null && !Status.VEVENT_TENTATIVE.getValue().equals(status.getValue())
!                 && !Status.VEVENT_CONFIRMED.getValue().equals(status.getValue())
!                 && !Status.VEVENT_CANCELLED.getValue().equals(status.getValue())) {
              throw new ValidationException("Status property ["
                      + status.toString() + "] is not applicable for VEVENT");

Index: VJournal.java
===================================================================
RCS file: /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model/component/VJournal.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** VJournal.java	6 Mar 2010 12:57:25 -0000	1.29
--- VJournal.java	11 Mar 2010 12:50:23 -0000	1.30
***************
*** 208,214 ****
  
          final Status status = (Status) getProperty(Property.STATUS);
!         if (status != null && !Status.VJOURNAL_DRAFT.equals(status)
!                 && !Status.VJOURNAL_FINAL.equals(status)
!                 && !Status.VJOURNAL_CANCELLED.equals(status)) {
              throw new ValidationException("Status property ["
                      + status.toString() + "] may not occur in VJOURNAL");
--- 208,214 ----
  
          final Status status = (Status) getProperty(Property.STATUS);
!         if (status != null && !Status.VJOURNAL_DRAFT.getValue().equals(status.getValue())
!                 && !Status.VJOURNAL_FINAL.getValue().equals(status.getValue())
!                 && !Status.VJOURNAL_CANCELLED.getValue().equals(status.getValue())) {
              throw new ValidationException("Status property ["
                      + status.toString() + "] may not occur in VJOURNAL");

Index: VToDo.java
===================================================================
RCS file: /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model/component/VToDo.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** VToDo.java	6 Mar 2010 12:57:25 -0000	1.43
--- VToDo.java	11 Mar 2010 12:50:21 -0000	1.44
***************
*** 317,324 ****
  
          final Status status = (Status) getProperty(Property.STATUS);
!         if (status != null && !Status.VTODO_NEEDS_ACTION.equals(status)
!                 && !Status.VTODO_COMPLETED.equals(status)
!                 && !Status.VTODO_IN_PROCESS.equals(status)
!                 && !Status.VTODO_CANCELLED.equals(status)) {
              throw new ValidationException("Status property ["
                      + status.toString() + "] may not occur in VTODO");
--- 317,324 ----
  
          final Status status = (Status) getProperty(Property.STATUS);
!         if (status != null && !Status.VTODO_NEEDS_ACTION.getValue().equals(status.getValue())
!                 && !Status.VTODO_COMPLETED.getValue().equals(status.getValue())
!                 && !Status.VTODO_IN_PROCESS.getValue().equals(status.getValue())
!                 && !Status.VTODO_CANCELLED.getValue().equals(status.getValue())) {
              throw new ValidationException("Status property ["
                      + status.toString() + "] may not occur in VTODO");