[jsword-svn] r1379 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/passage biblemapper/src/main/java/org/crosswire/biblemapper/swing jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-06-02 18:03:59 -0700 (Sat, 02 Jun 2007)
New Revision: 1379

Modified:
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
   trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookVerseColor.java
   trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BookTreeNode.java
Log:
Made the short book name property work for all instances of code.

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java	2007-06-01 20:11:29 UTC (rev 1378)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java	2007-06-03 01:03:59 UTC (rev 1379)
@@ -51,7 +51,7 @@
         case LEVEL_BOOK:
             try
             {
-                selected = BibleInfo.getLongBookName(set.getVerse().getBook());
+                selected = BibleInfo.getBookName(set.getVerse().getBook());
             }
             catch (NoSuchVerseException ex)
             {
@@ -153,7 +153,7 @@
             switch (level)
             {
             case LEVEL_BOOK:
-                return BibleInfo.getLongBookName(index + 1);
+                return BibleInfo.getBookName(index + 1);
 
             default:
                 return new Integer(index + 1);

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java	2007-06-01 20:11:29 UTC (rev 1378)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java	2007-06-03 01:03:59 UTC (rev 1379)
@@ -118,7 +118,7 @@
             Verse oldverse = verse;
             verse = newverse;
             int bookval = newverse.getBook();
-            String book = BibleInfo.getLongBookName(bookval);
+            String book = BibleInfo.getBookName(bookval);
             if (oldverse.getBook() != bookval || !cboBook.getSelectedItem().equals(book))
             {
                 cboBook.setSelectedItem(book);

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java	2007-06-01 20:11:29 UTC (rev 1378)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java	2007-06-03 01:03:59 UTC (rev 1379)
@@ -158,7 +158,7 @@
                 return Msg.WHOLE.toString();
 
             case LEVEL_BOOK:
-                return BibleInfo.getLongBookName(range.getStart().getBook());
+                return BibleInfo.getBookName(range.getStart().getBook());
 
             case LEVEL_CHAPTER:
                 return Integer.toString(range.getStart().getChapter());

Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookVerseColor.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookVerseColor.java	2007-06-01 20:11:29 UTC (rev 1378)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookVerseColor.java	2007-06-03 01:03:59 UTC (rev 1379)
@@ -104,7 +104,7 @@
     {
         try
         {
-            return "Book - "+BibleInfo.getLongBookName(book);
+            return "Book - "+BibleInfo.getBookName(book);
         }
         catch (NoSuchVerseException ex)
         {

Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BookTreeNode.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BookTreeNode.java	2007-06-01 20:11:29 UTC (rev 1378)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BookTreeNode.java	2007-06-03 01:03:59 UTC (rev 1379)
@@ -145,7 +145,7 @@
     {
         try
         {
-            String bookName = BibleInfo.getLongBookName(book);
+            String bookName = BibleInfo.getBookName(book);
             if (ref == null)
             {
                 return bookName;