[jsword-svn] r2198 - in trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop: book passage

[dmsmith at crosswire.org]

Author: dmsmith
Date: 2012-01-04 14:53:40 -0700 (Wed, 04 Jan 2012)
New Revision: 2198

Modified:
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
Log:
More work on v11n.

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java	2012-01-04 21:53:06 UTC (rev 2197)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java	2012-01-04 21:53:40 UTC (rev 2198)
@@ -137,23 +137,18 @@
      * @see javax.swing.ListModel#getSize()
      */
     public int getSize() {
-        try {
-            switch (level) {
-            case BOOK:
-                return BibleInfo.booksInBible();
+        switch (level) {
+        case BOOK:
+            return BibleInfo.booksInBible();
 
-            case CHAPTER:
-                return BibleInfo.chaptersInBook(set.getVerse().getBook());
+        case CHAPTER:
+            return BibleInfo.chaptersInBook(set.getVerse().getBook());
 
-            case VERSE:
-                return BibleInfo.versesInChapter(set.getVerse().getBook(), set.getVerse().getChapter());
+        case VERSE:
+            return BibleInfo.versesInChapter(set.getVerse().getBook(), set.getVerse().getChapter());
 
-            default:
-                assert false : level;
-                return 0;
-            }
-        } catch (NoSuchVerseException ex) {
-            assert false : ex;
+        default:
+            assert false : level;
             return 0;
         }
     }

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java	2012-01-04 21:53:06 UTC (rev 2197)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java	2012-01-04 21:53:40 UTC (rev 2198)
@@ -182,22 +182,17 @@
      * contains.
      */
     public int getChildCount() {
-        try {
-            switch (level) {
-            case BIBLE:
-                return BibleInfo.booksInBible();
+        switch (level) {
+        case BIBLE:
+            return BibleInfo.booksInBible();
 
-            case BOOK:
-                return BibleInfo.chaptersInBook(range.getStart().getBook());
+        case BOOK:
+            return BibleInfo.chaptersInBook(range.getStart().getBook());
 
-            case CHAPTER:
-                return BibleInfo.versesInChapter(range.getStart().getBook(), range.getStart().getChapter());
+        case CHAPTER:
+            return BibleInfo.versesInChapter(range.getStart().getBook(), range.getStart().getChapter());
 
-            default:
-                return 0;
-            }
-        } catch (NoSuchVerseException ex) {
-            assert false : ex;
+        default:
             return 0;
         }
     }