[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/basic s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic
In directory www.crosswire.org:/tmp/cvs-serv24436/java/jsword/org/crosswire/jsword/book/basic

Modified Files:
	AbstractBookMetaData.java 
Log Message:
Unify Daily Devotions and Readings into a single behavior.

Index: AbstractBookMetaData.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/AbstractBookMetaData.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** AbstractBookMetaData.java	2 Jan 2006 03:40:08 -0000	1.26
--- AbstractBookMetaData.java	3 Jan 2006 13:25:35 -0000	1.27
***************
*** 254,258 ****
          BookMetaData that = (BookMetaData) obj;
  
!         return getName().equals(that.getName());
      }
  
--- 254,258 ----
          BookMetaData that = (BookMetaData) obj;
  
!         return getBookCategory().equals(that.getBookCategory()) && getName().equals(that.getName());
      }
  
***************
*** 271,275 ****
      {
          BookMetaData that = (BookMetaData) obj;
!         return this.getInitials().compareTo(that.getInitials());
      }
  
--- 271,280 ----
      {
          BookMetaData that = (BookMetaData) obj;
!         int result = this.getBookCategory().compareTo(that.getBookCategory());
!         if (result == 0)
!         {
!             result = this.getInitials().compareTo(that.getInitials());
!         }
!         return result;
      }