[iCal4j-commit] iCal4j/source/net/fortuna/ical4j/model WeekDay.java, 1.13, 1.14 Property.java, 1.34, 1.35

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

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

Modified Files:
	WeekDay.java Property.java 
Log Message:
Checkstyle-based clean up

Index: Property.java
===================================================================
RCS file: /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model/Property.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Property.java	11 Jun 2009 11:31:36 -0000	1.34
--- Property.java	15 Aug 2009 15:28:36 -0000	1.35
***************
*** 221,225 ****
       * maintained.
       * @param property a property to copy
!      * @throws URISyntaxException
       */
      protected Property(final Property property) throws IOException,
--- 221,225 ----
       * maintained.
       * @param property a property to copy
!      * @throws URISyntaxException where the specified property contains an invalid URI value
       */
      protected Property(final Property property) throws IOException,
***************
*** 231,235 ****
  
      /**
!      * @see java.lang.Object#toString()
       */
      public final String toString() {
--- 231,235 ----
  
      /**
!      * {@inheritDoc}
       */
      public final String toString() {
***************
*** 312,318 ****
  
      /**
!      * Uses {@link EqualsBuilder} to test equality. Two properties are equal if and only if their name, value and
!      * parameter list are equal.
!      * @see java.lang.Object#equals(java.lang.Object)
       */
      public final boolean equals(final Object arg0) {
--- 312,316 ----
  
      /**
!      * {@inheritDoc}
       */
      public final boolean equals(final Object arg0) {
***************
*** 330,334 ****
  
      /**
!      * Uses {@link HashCodeBuilder} to build hashcode.
       */
      public final int hashCode() {
--- 328,332 ----
  
      /**
!      * {@inheritDoc}
       */
      public final int hashCode() {
***************
*** 341,344 ****
--- 339,345 ----
       * Create a (deep) copy of this property.
       * @return the copy of the property
+      * @throws IOException where an error occurs reading property data
+      * @throws URISyntaxException where the property contains an invalid URI value
+      * @throws ParseException where the property contains an invalid date value
       */
      public Property copy() throws IOException, URISyntaxException, ParseException {

Index: WeekDay.java
===================================================================
RCS file: /cvsroot/ical4j/iCal4j/source/net/fortuna/ical4j/model/WeekDay.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** WeekDay.java	1 Aug 2009 04:06:14 -0000	1.13
--- WeekDay.java	15 Aug 2009 15:28:36 -0000	1.14
***************
*** 73,77 ****
      
      /**
!      * @param value
       */
      public WeekDay(final String value) {
--- 73,77 ----
      
      /**
!      * @param value a string representation of a week day
       */
      public WeekDay(final String value) {
***************
*** 87,93 ****
--- 87,98 ----
      
      /**
+ <<<<<<< WeekDay.java
+      * @param day a string representation of a week day
+      * @param offset a month offset value
+ =======
       * Constructor used to construct constant instances.
       * @param day
       * @param offset
+ >>>>>>> 1.13
       */
      private WeekDay(final String day, final int offset) {
***************
*** 99,104 ****
       * Constructs a new weekday instance based on the specified
       * instance and offset.
!      * @param weekDay
!      * @param offset
       */
      public WeekDay(final WeekDay weekDay, final int offset) {
--- 104,109 ----
       * Constructs a new weekday instance based on the specified
       * instance and offset.
!      * @param weekDay a week day template for the instance
!      * @param offset a month offset value
       */
      public WeekDay(final WeekDay weekDay, final int offset) {
***************
*** 132,137 ****
      }
          
!     /* (non-Javadoc)
!      * @see java.lang.Object#toString()
       */
      public final String toString() {
--- 137,142 ----
      }
          
!     /**
!      * {@inheritDoc}
       */
      public final String toString() {
***************
*** 194,199 ****
       * Returns the corresponding <code>java.util.Calendar.DAY_OF_WEEK</code>
       * constant for the specified <code>WeekDay</code>.
!      * @param weekday
!      * @return
       */
      public static int getCalendarDay(final WeekDay weekday) {
--- 199,204 ----
       * Returns the corresponding <code>java.util.Calendar.DAY_OF_WEEK</code>
       * constant for the specified <code>WeekDay</code>.
!      * @param weekday a week day instance
!      * @return the corresponding <code>java.util.Calendar</code> day
       */
      public static int getCalendarDay(final WeekDay weekday) {
***************
*** 223,227 ****
      
      /**
!      * Uses {@link ObjectUtils} to test equality.
       */
      public final boolean equals(final Object arg0) {
--- 228,232 ----
      
      /**
!      * {@inheritDoc}
       */
      public final boolean equals(final Object arg0) {
***************
*** 238,242 ****
      
      /**
!      * Uses {@link HashCodeBuilder} to build hashcode.
       */
      public final int hashCode() {
--- 243,247 ----
      
      /**
!      * {@inheritDoc}
       */
      public final int hashCode() {