[jsword-svn] jsword/java/jsword/org/crosswire/jsword/passage s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage
In directory www.crosswire.org:/tmp/cvs-serv3657/java/jsword/org/crosswire/jsword/passage

Modified Files:
	AccuracyType.java AbstractKeyList.java AbstractPassage.java 
	Verse.java PassageTally.java 
Log Message:
Cleanup: remove unused libraries. Piddly software changes for consistency. Move unused code to limbo.

Index: Verse.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/Verse.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** Verse.java	1 Apr 2005 17:09:46 -0000	1.34
--- Verse.java	5 Apr 2005 00:33:40 -0000	1.35
***************
*** 168,179 ****
                      + verse;
              }
!             else
!             {
!                 return BibleInfo.getShortBookName(book)
!                     + Verse.VERSE_PREF_DELIM1
!                     + chapter
!                     + Verse.VERSE_PREF_DELIM2
!                     + verse;
!             }
          }
          catch (Exception ex)
--- 168,176 ----
                      + verse;
              }
!             return BibleInfo.getShortBookName(book)
!                 + Verse.VERSE_PREF_DELIM1
!                 + chapter
!                 + Verse.VERSE_PREF_DELIM2
!                 + verse;
          }
          catch (Exception ex)
***************
*** 215,238 ****
                  return String.valueOf(verse);
              }
-             else
-             {
-                 if (base.book != book)
-                 {
-                     return BibleInfo.getShortBookName(book)
-                         + Verse.VERSE_PREF_DELIM1
-                         + chapter
-                         + Verse.VERSE_PREF_DELIM2
-                         + verse;
-                 }
  
!                 if (base.chapter != chapter)
!                 {
!                     return chapter
!                         + Verse.VERSE_PREF_DELIM2
!                         + verse;
!                 }
  
!                 return String.valueOf(verse);
              }
          }
          catch (Exception ex)
--- 212,233 ----
                  return String.valueOf(verse);
              }
  
!             if (base.book != book)
!             {
!                 return BibleInfo.getShortBookName(book)
!                     + Verse.VERSE_PREF_DELIM1
!                     + chapter
!                     + Verse.VERSE_PREF_DELIM2
!                     + verse;
!             }
  
!             if (base.chapter != chapter)
!             {
!                 return chapter
!                     + Verse.VERSE_PREF_DELIM2
!                     + verse;
              }
+ 
+             return String.valueOf(verse);
          }
          catch (Exception ex)
***************
*** 585,592 ****
              return b;
          }
!         else
!         {
!             return a;
!         }
      }
  
--- 580,584 ----
              return b;
          }
!         return a;
      }
  
***************
*** 604,611 ****
              return b;
          }
!         else
!         {
!             return a;
!         }
      }
  
--- 596,600 ----
              return b;
          }
!         return a;
      }
  

Index: AccuracyType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/AccuracyType.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** AccuracyType.java	19 Mar 2005 18:44:58 -0000	1.8
--- AccuracyType.java	5 Apr 2005 00:33:40 -0000	1.9
***************
*** 386,393 ****
              return BibleInfo.chaptersInBook(lbook);
          }
!         else
!         {
!             return parseInt(chapter);
!         }
      }
  
--- 386,390 ----
              return BibleInfo.chaptersInBook(lbook);
          }
!         return parseInt(chapter);
      }
  
***************
*** 406,413 ****
              return BibleInfo.versesInChapter(lbook, lchapter);
          }
!         else
!         {
!             return parseInt(verse);
!         }
      }
  
--- 403,407 ----
              return BibleInfo.versesInChapter(lbook, lchapter);
          }
!         return parseInt(verse);
      }
  

Index: AbstractKeyList.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/AbstractKeyList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AbstractKeyList.java	1 Apr 2005 17:09:46 -0000	1.7
--- AbstractKeyList.java	5 Apr 2005 00:33:40 -0000	1.8
***************
*** 187,195 ****
                  return 0;
              }
!             else
!             {
!                 // i am empty, he is not so we are greater
!                 return 1;
!             }
          }
  
--- 187,192 ----
                  return 0;
              }
!             // i am empty, he is not so we are greater
!             return 1;
          }
  

Index: AbstractPassage.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/AbstractPassage.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** AbstractPassage.java	1 Apr 2005 17:09:46 -0000	1.38
--- AbstractPassage.java	5 Apr 2005 00:33:40 -0000	1.39
***************
*** 82,90 ****
                  return 0;
              }
!             else
!             {
!                 // that is empty so he should come before me
!                 return -1;
!             }
          }
  
--- 82,87 ----
                  return 0;
              }
!             // that is empty so he should come before me
!             return -1;
          }
  
***************
*** 477,484 ****
              return remainder;
          }
!         else
!         {
!             return null;
!         }
      }
  
--- 474,478 ----
              return remainder;
          }
!         return null;
      }
  
***************
*** 520,527 ****
              return remainder;
          }
!         else
!         {
!             return null;
!         }
      }
  
--- 514,518 ----
              return remainder;
          }
!         return null;
      }
  

Index: PassageTally.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/PassageTally.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** PassageTally.java	1 Apr 2005 17:09:46 -0000	1.33
--- PassageTally.java	5 Apr 2005 00:33:40 -0000	1.34
***************
*** 290,297 ****
              return new VerseIterator();
          }
!         else
!         {
!             return new OrderedVerseIterator(board);
!         }
      }
  
--- 290,294 ----
              return new VerseIterator();
          }
!         return new OrderedVerseIterator(board);
      }
  
***************
*** 306,313 ****
              return new VerseRangeIterator(iterator(), restrict);
          }
!         else
!         {
!             return new OrderedVerseRangeIterator(iterator(), board);
!         }
      }
  
--- 303,307 ----
              return new VerseRangeIterator(iterator(), restrict);
          }
!         return new OrderedVerseRangeIterator(iterator(), board);
      }
  
***************
*** 595,602 ****
              return remainder;
          }
!         else
!         {
!             return null;
!         }
      }
  
--- 589,593 ----
              return remainder;
          }
!         return null;
      }