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

[jswordcvs at crosswire.org]

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

Modified Files:
	ReadingsBookDriver.java ot1nt2.properties ReadingsBook.java 
Log Message:
Made full book names a configurable default and used it.
Fixed the name of Readings.

Index: ot1nt2.properties
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/readings/ot1nt2.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ot1nt2.properties	25 Jun 2004 15:02:02 -0000	1.1
--- ot1nt2.properties	12 Jun 2005 02:39:28 -0000	1.2
***************
*** 1,3 ****
! title=OT Once and NT Twice per Year in 3 portions
  # The following do not need to be internationalized as they are
  # standard OSIS internal names. These will be translated into the appropriate
--- 1,3 ----
! title=Read OT Once and NT Twice per Year in 3 portions
  # The following do not need to be internationalized as they are
  # standard OSIS internal names. These will be translated into the appropriate

Index: ReadingsBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/readings/ReadingsBook.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ReadingsBook.java	11 Jun 2005 20:41:05 -0000	1.29
--- ReadingsBook.java	12 Jun 2005 02:39:28 -0000	1.30
***************
*** 37,41 ****
  import org.crosswire.jsword.book.BookData;
  import org.crosswire.jsword.book.BookException;
- import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.book.FeatureType;
  import org.crosswire.jsword.book.OSISUtil;
--- 37,40 ----
***************
*** 67,75 ****
       * Constructor for ReadingsBook.
       */
!     public ReadingsBook(ReadingsBookDriver driver, String name, BookCategory type)
      {
-         BookMetaData bmd = new DefaultBookMetaData(driver, name, type);
-         setBookMetaData(bmd);
- 
          String setname = ReadingsBookDriver.getReadingsSet();
  
--- 66,71 ----
       * Constructor for ReadingsBook.
       */
!     public ReadingsBook(ReadingsBookDriver driver, BookCategory type)
      {
          String setname = ReadingsBookDriver.getReadingsSet();
  
***************
*** 77,80 ****
--- 73,90 ----
          ResourceBundle prop = ResourceBundle.getBundle(setname, defaultLocale, new CWClassLoader(ReadingsBookDriver.class));
  
+         String name = Msg.TITLE.toString();
+         try
+         {
+             name = prop.getString("title"); //$NON-NLS-1$
+         }
+         catch (MissingResourceException e)
+         {
+             log.warn("Missing resource: 'title' while parsing: " + setname); //$NON-NLS-1$
+         }
+ 
+         DefaultBookMetaData bmd = new DefaultBookMetaData(driver, name, type);
+         bmd.setInitials(setname);
+         setBookMetaData(bmd);
+ 
          // We use 1972 because it is a leap year.
          GregorianCalendar greg = new GregorianCalendar(1972, Calendar.JANUARY, 1);

Index: ReadingsBookDriver.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/readings/ReadingsBookDriver.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ReadingsBookDriver.java	11 Jun 2005 20:41:05 -0000	1.18
--- ReadingsBookDriver.java	12 Jun 2005 02:39:28 -0000	1.19
***************
*** 49,53 ****
          books = new Book[]
          {
!             new ReadingsBook(this, Msg.TITLE.toString(), BookCategory.DICTIONARY),
          };
      }
--- 49,53 ----
          books = new Book[]
          {
!             new ReadingsBook(this, BookCategory.DICTIONARY),
          };
      }