[jsword-svn] jsword/java/jsword/org/crosswire/jsword/passage s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Mon May 16 17:43:17 MST 2005
Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage
In directory www.crosswire.org:/tmp/cvs-serv23836/java/jsword/org/crosswire/jsword/passage
Modified Files:
PassageListType.java VerseFactory.java PassageTally.java
RocketPassage.java PreferredKey.java PassageListener.java
ReadOnlyKeyList.java SetKeyList.java RestrictionType.java
KeyFactory.java VerseRange.java PassageEvent.java
DefaultLeafKeyList.java NoSuchVerseException.java
PassageUtil.java NoSuchKeyException.java
SynchronizedPassage.java AbstractPassage.java KeyUtil.java
VerseRangeFactory.java RangedPassage.java BitwisePassage.java
DistinctPassage.java DefaultKeyVisitor.java BibleInfo.java
Passage.java ReadOnlyPassage.java PassageKeyFactory.java
VerseBase.java AccuracyType.java DefaultKeyList.java
KeyVisitor.java AbstractKeyList.java Msg.java Verse.java
Key.java
Log Message:
Added support for CheckStyle plugin.
Added a few more CheckStyle rules.
Fixed a spelling mistake.
Index: RocketPassage.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/RocketPassage.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** RocketPassage.java 10 May 2005 02:39:21 -0000 1.12
--- RocketPassage.java 17 May 2005 00:43:15 -0000 1.13
***************
*** 30,34 ****
* the fastest implementation for each fo its methods from the 3 available.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 30,34 ----
* the fastest implementation for each fo its methods from the 3 available.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: KeyVisitor.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/KeyVisitor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** KeyVisitor.java 10 May 2005 02:39:21 -0000 1.4
--- KeyVisitor.java 17 May 2005 00:43:15 -0000 1.5
***************
*** 25,29 ****
* An interface for components wanting to visit all the nodes in a Key tree.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 25,29 ----
* An interface for components wanting to visit all the nodes in a Key tree.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 36,40 ****
* @param key The found leaf node.
*/
! public void visitLeaf(Key key);
/**
--- 36,40 ----
* @param key The found leaf node.
*/
! void visitLeaf(Key key);
/**
***************
*** 43,46 ****
* @param key The found branch node.
*/
! public void visitBranch(Key key);
}
--- 43,46 ----
* @param key The found branch node.
*/
! void visitBranch(Key key);
}
Index: DefaultLeafKeyList.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/DefaultLeafKeyList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DefaultLeafKeyList.java 10 May 2005 02:39:21 -0000 1.7
--- DefaultLeafKeyList.java 17 May 2005 00:43:15 -0000 1.8
***************
*** 29,33 ****
* A simple default implementation of the Key interface.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 29,33 ----
* A simple default implementation of the Key interface.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: Key.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/Key.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Key.java 10 May 2005 02:39:21 -0000 1.7
--- Key.java 17 May 2005 00:43:15 -0000 1.8
***************
*** 31,35 ****
* return void and not a boolean.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 31,35 ----
* return void and not a boolean.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 43,47 ****
* @return a String containing a description of the Key
*/
! public String getName();
/**
--- 43,47 ----
* @return a String containing a description of the Key
*/
! String getName();
/**
***************
*** 50,54 ****
* @return a String containing the OSIS description of the verses
*/
! public String getOSISName();
/**
--- 50,54 ----
* @return a String containing the OSIS description of the verses
*/
! String getOSISName();
/**
***************
*** 56,60 ****
* @return The parent of this tree, or null if this Key is the root.
*/
! public Key getParent();
/**
--- 56,60 ----
* @return The parent of this tree, or null if this Key is the root.
*/
! Key getParent();
/**
***************
*** 62,66 ****
* Any attempt to add()/remove() wlll throw
*/
! public boolean canHaveChildren();
/**
--- 62,66 ----
* Any attempt to add()/remove() wlll throw
*/
! boolean canHaveChildren();
/**
***************
*** 70,74 ****
* @return the number of elements in this set (its cardinality).
*/
! public int getChildCount();
/**
--- 70,74 ----
* @return the number of elements in this set (its cardinality).
*/
! int getChildCount();
/**
***************
*** 76,80 ****
* @return <tt>true</tt> if this set contains no elements.
*/
! public boolean isEmpty();
/**
--- 76,80 ----
* @return <tt>true</tt> if this set contains no elements.
*/
! boolean isEmpty();
/**
***************
*** 83,92 ****
* @return <tt>true</tt> if this set contains the specified element.
*/
! public boolean contains(Key key);
/**
* @return an iterator over the elements in this set.
*/
! public Iterator iterator();
/**
--- 83,92 ----
* @return <tt>true</tt> if this set contains the specified element.
*/
! boolean contains(Key key);
/**
* @return an iterator over the elements in this set.
*/
! Iterator iterator();
/**
***************
*** 95,99 ****
* @throws NullPointerException if the specified element is null
*/
! public void addAll(Key key);
/**
--- 95,99 ----
* @throws NullPointerException if the specified element is null
*/
! void addAll(Key key);
/**
***************
*** 102,106 ****
* @throws NullPointerException if the specified element is null
*/
! public void removeAll(Key key);
/**
--- 102,106 ----
* @throws NullPointerException if the specified element is null
*/
! void removeAll(Key key);
/**
***************
*** 109,113 ****
* @throws NullPointerException if the specified element is null
*/
! public void retainAll(Key key);
/**
--- 109,113 ----
* @throws NullPointerException if the specified element is null
*/
! void retainAll(Key key);
/**
***************
*** 116,120 ****
* exception).
*/
! public void clear();
/**
--- 116,120 ----
* exception).
*/
! void clear();
/**
***************
*** 123,127 ****
* @return The specified key
*/
! public Key get(int index);
/**
--- 123,127 ----
* @return The specified key
*/
! Key get(int index);
/**
***************
*** 130,134 ****
* @return The index of the key or -1 if the key is not in the list
*/
! public int indexOf(Key that);
/**
--- 130,134 ----
* @return The index of the key or -1 if the key is not in the list
*/
! int indexOf(Key that);
/**
***************
*** 139,143 ****
* @see Passage
*/
! public void blur(int by, RestrictionType restrict);
/**
--- 139,143 ----
* @see Passage
*/
! void blur(int by, RestrictionType restrict);
/**
***************
*** 146,149 ****
* @return A complete copy of ourselves
*/
! public Object clone();
}
--- 146,149 ----
* @return A complete copy of ourselves
*/
! Object clone();
}
Index: VerseBase.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/VerseBase.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** VerseBase.java 10 May 2005 02:39:21 -0000 1.13
--- VerseBase.java 17 May 2005 00:43:15 -0000 1.14
***************
*** 28,32 ****
* The base unit that is collected by a Passage.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 28,32 ----
* The base unit that is collected by a Passage.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 38,42 ****
* @return The string representation
*/
! public String getName();
/**
--- 38,42 ----
* @return The string representation
*/
! String getName();
/**
***************
*** 48,52 ****
* @return The string representation
*/
! public String getName(Verse base);
/**
--- 48,52 ----
* @return The string representation
*/
! String getName(Verse base);
/**
***************
*** 55,59 ****
* @return a String containing the OSIS description of the verses
*/
! public String getOSISName();
/**
--- 55,59 ----
* @return a String containing the OSIS description of the verses
*/
! String getOSISName();
/**
***************
*** 63,67 ****
* @see #verseIterator()
*/
! public Verse[] toVerseArray();
/**
--- 63,67 ----
* @see #verseIterator()
*/
! Verse[] toVerseArray();
/**
***************
*** 76,79 ****
* @return A verse iterator
*/
! public Iterator verseIterator();
}
--- 76,79 ----
* @return A verse iterator
*/
! Iterator verseIterator();
}
Index: NoSuchVerseException.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/NoSuchVerseException.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** NoSuchVerseException.java 10 May 2005 02:39:21 -0000 1.12
--- NoSuchVerseException.java 17 May 2005 00:43:15 -0000 1.13
***************
*** 27,31 ****
* When something tries to use a verse that we don't understand.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 27,31 ----
* When something tries to use a verse that we don't understand.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: VerseFactory.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/VerseFactory.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VerseFactory.java 10 May 2005 02:39:21 -0000 1.3
--- VerseFactory.java 17 May 2005 00:43:15 -0000 1.4
***************
*** 26,30 ****
* A factory to create a Verse from user input.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 26,30 ----
* A factory to create a Verse from user input.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: AccuracyType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/AccuracyType.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AccuracyType.java 10 May 2005 02:39:21 -0000 1.11
--- AccuracyType.java 17 May 2005 00:43:15 -0000 1.12
***************
*** 61,65 ****
* start.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 61,65 ----
* start.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 551,555 ****
* @throws NoSuchVerseException If the text is invalid
*/
! private static final void checkValidChapterOrVerse(String text) throws NoSuchVerseException
{
if (!isEndMarker(text))
--- 551,555 ----
* @throws NoSuchVerseException If the text is invalid
*/
! private static void checkValidChapterOrVerse(String text) throws NoSuchVerseException
{
if (!isEndMarker(text))
***************
*** 851,855 ****
BOOK_ONLY,
CHAPTER_VERSE,
! VERSE_ONLY
};
--- 851,855 ----
BOOK_ONLY,
CHAPTER_VERSE,
! VERSE_ONLY,
};
Index: SetKeyList.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/SetKeyList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SetKeyList.java 10 May 2005 02:39:21 -0000 1.7
--- SetKeyList.java 17 May 2005 00:43:15 -0000 1.8
***************
*** 32,36 ****
* A Key that uses a Set of Keys as it's store of data.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 32,36 ----
* A Key that uses a Set of Keys as it's store of data.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: VerseRangeFactory.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/VerseRangeFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** VerseRangeFactory.java 10 May 2005 02:39:21 -0000 1.6
--- VerseRangeFactory.java 17 May 2005 00:43:15 -0000 1.7
***************
*** 27,31 ****
* A factory that creates VerseRanges from user input.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 27,31 ----
* A factory that creates VerseRanges from user input.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 42,56 ****
}
! /**
! * Construct a VerseRange from a human readable string. For example
! * "Gen 1:1-3" in case the user does not want to have their typing
! * 'fixed' by a meddling patronizing computer.
! * @param orginal The textual representation
! * @exception NoSuchVerseException If the text can not be understood
! */
! public static VerseRange fromString(String orginal) throws NoSuchVerseException
! {
! return fromString(orginal, null);
! }
/**
--- 42,56 ----
}
! /**
! * Construct a VerseRange from a human readable string. For example
! * "Gen 1:1-3" in case the user does not want to have their typing
! * 'fixed' by a meddling patronizing computer.
! * @param orginal The textual representation
! * @exception NoSuchVerseException If the text can not be understood
! */
! public static VerseRange fromString(String orginal) throws NoSuchVerseException
! {
! return fromString(orginal, null);
! }
/**
Index: DefaultKeyVisitor.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/DefaultKeyVisitor.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DefaultKeyVisitor.java 10 May 2005 02:39:21 -0000 1.4
--- DefaultKeyVisitor.java 17 May 2005 00:43:15 -0000 1.5
***************
*** 26,30 ****
* inheritance where you want to save space by not overriding all methods.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 26,30 ----
* inheritance where you want to save space by not overriding all methods.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: Verse.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/Verse.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** Verse.java 10 May 2005 02:39:21 -0000 1.38
--- Verse.java 17 May 2005 00:43:15 -0000 1.39
***************
*** 55,59 ****
* </p>
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 55,59 ----
* </p>
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 579,583 ****
* @return The bigger of the 2 verses
*/
! public static final Verse max(Verse a, Verse b)
{
if (a.compareTo(b) == -1)
--- 579,583 ----
* @return The bigger of the 2 verses
*/
! public static Verse max(Verse a, Verse b)
{
if (a.compareTo(b) == -1)
***************
*** 595,599 ****
* @return The smaller of the 2 verses
*/
! public static final Verse min(Verse a, Verse b)
{
if (a.compareTo(b) == 1)
--- 595,599 ----
* @return The smaller of the 2 verses
*/
! public static Verse min(Verse a, Verse b)
{
if (a.compareTo(b) == 1)
***************
*** 744,748 ****
* @param verse The verse to set
*/
! private final void setAndPatch(int book, int chapter, int verse)
{
int[] ref = { book, chapter, verse };
--- 744,748 ----
* @param verse The verse to set
*/
! private void setAndPatch(int book, int chapter, int verse)
{
int[] ref = { book, chapter, verse };
***************
*** 774,778 ****
* @exception NoSuchVerseException If the verse can not be understood
*/
! private final void set(int book, int chapter, int verse) throws NoSuchVerseException
{
BibleInfo.validate(book, chapter, verse);
--- 774,778 ----
* @exception NoSuchVerseException If the verse can not be understood
*/
! private void set(int book, int chapter, int verse) throws NoSuchVerseException
{
BibleInfo.validate(book, chapter, verse);
***************
*** 789,793 ****
* @exception NoSuchVerseException If the verse can not be understood
*/
! private final void set(int ordinal) throws NoSuchVerseException
{
int[] ref = BibleInfo.decodeOrdinal(ordinal);
--- 789,793 ----
* @exception NoSuchVerseException If the verse can not be understood
*/
! private void set(int ordinal) throws NoSuchVerseException
{
int[] ref = BibleInfo.decodeOrdinal(ordinal);
Index: ReadOnlyKeyList.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/ReadOnlyKeyList.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ReadOnlyKeyList.java 10 May 2005 02:39:21 -0000 1.8
--- ReadOnlyKeyList.java 17 May 2005 00:43:15 -0000 1.9
***************
*** 27,31 ****
* A read-only wrapper around any writable implementation of Key.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 27,31 ----
* A read-only wrapper around any writable implementation of Key.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: PassageEvent.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/PassageEvent.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PassageEvent.java 10 May 2005 02:39:21 -0000 1.11
--- PassageEvent.java 17 May 2005 00:43:15 -0000 1.12
***************
*** 29,33 ****
* hard. In these cases we default the range to Gen 1:1-Rev 22:21
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 29,33 ----
* hard. In these cases we default the range to Gen 1:1-Rev 22:21
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: PassageTally.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/PassageTally.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** PassageTally.java 10 May 2005 02:39:21 -0000 1.37
--- PassageTally.java 17 May 2005 00:43:15 -0000 1.38
***************
*** 79,83 ****
* <p>LATER(joe): Specify how passage ranks work.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 79,83 ----
* <p>LATER(joe): Specify how passage ranks work.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 182,190 ****
* A Human readable version of the verse list. Uses short books names,
* and the shortest possible rendering eg "Mat 3:1-4, 6"
! * @param max_count The number of matches to return, 0 gives all matches
* @return a String containing a description of the verses
*/
! public String getName(int max_count)
{
if (PassageUtil.isPersistentNaming() && originalName != null)
{
--- 182,191 ----
* A Human readable version of the verse list. Uses short books names,
* and the shortest possible rendering eg "Mat 3:1-4, 6"
! * @param cnt The number of matches to return, 0 gives all matches
* @return a String containing a description of the verses
*/
! public String getName(int cnt)
{
+ int max_count = cnt;
if (PassageUtil.isPersistentNaming() && originalName != null)
{
***************
*** 260,268 ****
* A Human readable version of the PassageTally.
* Uses short books names, and the shortest possible rendering eg "Mat 3:1-4"
! * @param max_count The number of matches to return, 0 gives all matches
* @return a String containing a description of the verses
*/
! public String getNameAndTally(int max_count)
{
StringBuffer retcode = new StringBuffer();
if (max_count == 0)
--- 261,270 ----
* A Human readable version of the PassageTally.
* Uses short books names, and the shortest possible rendering eg "Mat 3:1-4"
! * @param cnt The number of matches to return, 0 gives all matches
* @return a String containing a description of the verses
*/
! public String getNameAndTally(int cnt)
{
+ int max_count = cnt;
StringBuffer retcode = new StringBuffer();
if (max_count == 0)
***************
*** 759,763 ****
* @param tally The amount to inrease by
*/
! private final void increment(int ord, int tally)
{
boolean exists = board[ord - 1] > 0;
--- 761,765 ----
* @param tally The amount to inrease by
*/
! private void increment(int ord, int tally)
{
boolean exists = board[ord - 1] > 0;
***************
*** 787,791 ****
* @param tally The amount to inrease by
*/
! private final void incrementMax(int tally)
{
max += tally;
--- 789,793 ----
* @param tally The amount to inrease by
*/
! private void incrementMax(int tally)
{
max += tally;
***************
*** 804,808 ****
* @param ord The verse to increment
*/
! private final void kill(int ord)
{
if (board[ord - 1] > 0)
--- 806,810 ----
* @param ord The verse to increment
*/
! private void kill(int ord)
{
if (board[ord - 1] > 0)
Index: DefaultKeyList.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/DefaultKeyList.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DefaultKeyList.java 10 May 2005 02:39:21 -0000 1.7
--- DefaultKeyList.java 17 May 2005 00:43:15 -0000 1.8
***************
*** 33,37 ****
* <p>This implementation uses <tt>java.util.TreeSet</tt> to store keys.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 33,37 ----
* <p>This implementation uses <tt>java.util.TreeSet</tt> to store keys.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: PassageListener.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/PassageListener.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** PassageListener.java 10 May 2005 02:39:21 -0000 1.9
--- PassageListener.java 17 May 2005 00:43:15 -0000 1.10
***************
*** 28,32 ****
* or removed).
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 28,32 ----
* or removed).
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 39,43 ****
* @param ev a PassageEvent encapuslating the event information
*/
! public void versesAdded(PassageEvent ev);
/**
--- 39,43 ----
* @param ev a PassageEvent encapuslating the event information
*/
! void versesAdded(PassageEvent ev);
/**
***************
*** 46,50 ****
* @param ev a PassageEvent encapuslating the event information
*/
! public void versesRemoved(PassageEvent ev);
/**
--- 46,50 ----
* @param ev a PassageEvent encapuslating the event information
*/
! void versesRemoved(PassageEvent ev);
/**
***************
*** 53,56 ****
* @param ev a PassageEvent encapuslating the event information
*/
! public void versesChanged(PassageEvent ev);
}
--- 53,56 ----
* @param ev a PassageEvent encapuslating the event information
*/
! void versesChanged(PassageEvent ev);
}
Index: PreferredKey.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/PreferredKey.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PreferredKey.java 10 May 2005 02:39:21 -0000 1.4
--- PreferredKey.java 17 May 2005 00:43:15 -0000 1.5
***************
*** 27,31 ****
* preferrence.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 27,31 ----
* preferrence.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 37,40 ****
* @return The preferredKey
*/
! public Key getPreferred();
}
--- 37,40 ----
* @return The preferredKey
*/
! Key getPreferred();
}
Index: AbstractPassage.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/AbstractPassage.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** AbstractPassage.java 10 May 2005 02:39:21 -0000 1.44
--- AbstractPassage.java 17 May 2005 00:43:15 -0000 1.45
***************
*** 45,49 ****
* optimized way. I think I am going to have a look at replacement here.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 45,49 ----
* optimized way. I think I am going to have a look at replacement here.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 1121,1125 ****
* @see java.util.Iterator#hasNext()
*/
! public final boolean hasNext()
{
return next_range != null;
--- 1121,1125 ----
* @see java.util.Iterator#hasNext()
*/
! public boolean hasNext()
{
return next_range != null;
***************
*** 1129,1133 ****
* @see java.util.Iterator#next()
*/
! public final Object next() throws NoSuchElementException
{
Object retcode = next_range;
--- 1129,1133 ----
* @see java.util.Iterator#next()
*/
! public Object next() throws NoSuchElementException
{
Object retcode = next_range;
***************
*** 1164,1168 ****
Verse end = next_verse;
! findnext:
while (true)
{
--- 1164,1168 ----
Verse end = next_verse;
! findnext:
while (true)
{
Index: RangedPassage.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/RangedPassage.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** RangedPassage.java 10 May 2005 02:39:21 -0000 1.23
--- RangedPassage.java 17 May 2005 00:43:15 -0000 1.24
***************
*** 49,53 ****
* optimizing later ... Maybe the best is to allow the user to choose?
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 49,53 ----
* optimizing later ... Maybe the best is to allow the user to choose?
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 401,405 ****
* @see java.util.Iterator#hasNext()
*/
! public final boolean hasNext()
{
return real.hasNext();
--- 401,405 ----
* @see java.util.Iterator#hasNext()
*/
! public boolean hasNext()
{
return real.hasNext();
***************
*** 409,413 ****
* @see java.util.Iterator#next()
*/
! public final Object next() throws NoSuchElementException
{
return real.next();
--- 409,413 ----
* @see java.util.Iterator#next()
*/
! public Object next() throws NoSuchElementException
{
return real.next();
Index: PassageListType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/PassageListType.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PassageListType.java 10 May 2005 02:39:21 -0000 1.6
--- PassageListType.java 17 May 2005 00:43:15 -0000 1.7
***************
*** 27,31 ****
* Types of Passage Lists.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 27,31 ----
* Types of Passage Lists.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 172,176 ****
{
VERSES,
! RANGES
};
}
--- 172,176 ----
{
VERSES,
! RANGES,
};
}
Index: KeyFactory.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/KeyFactory.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** KeyFactory.java 10 May 2005 02:39:21 -0000 1.6
--- KeyFactory.java 17 May 2005 00:43:15 -0000 1.7
***************
*** 25,29 ****
* A Factory for new Keys and KeyLists.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 25,29 ----
* A Factory for new Keys and KeyLists.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 39,43 ****
* @return A Key that includes all of the known Keys
*/
! public Key getGlobalKeyList();
/**
--- 39,43 ----
* @return A Key that includes all of the known Keys
*/
! Key getGlobalKeyList();
/**
***************
*** 51,55 ****
* @throws NoSuchKeyException If the name can not be parsed.
*/
! public Key getKey(String name) throws NoSuchKeyException;
/**
--- 51,55 ----
* @throws NoSuchKeyException If the name can not be parsed.
*/
! Key getKey(String name) throws NoSuchKeyException;
/**
***************
*** 61,64 ****
* @return An empty Key that can hold other Keys from this factory.
*/
! public Key createEmptyKeyList();
}
--- 61,64 ----
* @return An empty Key that can hold other Keys from this factory.
*/
! Key createEmptyKeyList();
}
Index: ReadOnlyPassage.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/ReadOnlyPassage.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ReadOnlyPassage.java 10 May 2005 02:39:21 -0000 1.21
--- ReadOnlyPassage.java 17 May 2005 00:43:15 -0000 1.22
***************
*** 31,35 ****
* to write to it.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 31,35 ----
* to write to it.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: SynchronizedPassage.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/SynchronizedPassage.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** SynchronizedPassage.java 10 May 2005 02:39:21 -0000 1.17
--- SynchronizedPassage.java 17 May 2005 00:43:15 -0000 1.18
***************
*** 32,36 ****
* being able to inline stuff.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 32,36 ----
* being able to inline stuff.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: PassageUtil.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/PassageUtil.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** PassageUtil.java 10 May 2005 02:39:21 -0000 1.35
--- PassageUtil.java 17 May 2005 00:43:15 -0000 1.36
***************
*** 25,33 ****
* A Utility class containing various static methods.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
! public class PassageUtil
{
/**
--- 25,33 ----
* A Utility class containing various static methods.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
! public final class PassageUtil
{
/**
Index: VerseRange.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/VerseRange.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** VerseRange.java 10 May 2005 02:39:21 -0000 1.41
--- VerseRange.java 17 May 2005 00:43:15 -0000 1.42
***************
*** 39,43 ****
* that they consider to be mis-translated in some way.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 39,43 ----
* that they consider to be mis-translated in some way.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 884,888 ****
* @return The last verse in the range
*/
! private static final Verse calcEnd(Verse start, int verseCount)
{
return start.add(verseCount - 1);
--- 884,888 ----
* @return The last verse in the range
*/
! private static Verse calcEnd(Verse start, int verseCount)
{
return start.add(verseCount - 1);
***************
*** 895,899 ****
* @return The number of verses. Always >= 1.
*/
! private static final int calcVerseCount(Verse start, Verse end)
{
return end.subtract(start) + 1;
--- 895,899 ----
* @return The number of verses. Always >= 1.
*/
! private static int calcVerseCount(Verse start, Verse end)
{
return end.subtract(start) + 1;
Index: RestrictionType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/RestrictionType.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RestrictionType.java 10 May 2005 02:39:21 -0000 1.7
--- RestrictionType.java 17 May 2005 00:43:15 -0000 1.8
***************
*** 27,31 ****
* Types of Passage Restrictions.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 27,31 ----
* Types of Passage Restrictions.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 390,394 ****
NONE,
BOOK,
! CHAPTER
};
}
--- 390,394 ----
NONE,
BOOK,
! CHAPTER,
};
}
Index: Msg.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/Msg.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Msg.java 10 May 2005 02:39:21 -0000 1.17
--- Msg.java 17 May 2005 00:43:15 -0000 1.18
***************
*** 27,35 ****
* Compile safe Msg resource settings.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
! public class Msg extends MsgBase
{
static final Msg TALLY_ERROR_ENUM = new Msg("PassageTally.ErrorEnum"); //$NON-NLS-1$
--- 27,35 ----
* Compile safe Msg resource settings.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
! public final class Msg extends MsgBase
{
static final Msg TALLY_ERROR_ENUM = new Msg("PassageTally.ErrorEnum"); //$NON-NLS-1$
Index: NoSuchKeyException.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/NoSuchKeyException.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** NoSuchKeyException.java 10 May 2005 02:39:21 -0000 1.7
--- NoSuchKeyException.java 17 May 2005 00:43:15 -0000 1.8
***************
*** 28,32 ****
* When something tries to use a key that we don't understand.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 28,32 ----
* When something tries to use a key that we don't understand.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: BitwisePassage.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/BitwisePassage.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** BitwisePassage.java 10 May 2005 02:39:21 -0000 1.24
--- BitwisePassage.java 17 May 2005 00:43:15 -0000 1.25
***************
*** 42,46 ****
* maths.</p>
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 42,46 ----
* maths.</p>
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: BibleInfo.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/BibleInfo.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** BibleInfo.java 10 May 2005 02:39:21 -0000 1.32
--- BibleInfo.java 17 May 2005 00:43:15 -0000 1.33
***************
*** 39,47 ****
* be large, and there is a good dividing line between the 2.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
! public class BibleInfo
{
/**
--- 39,47 ----
* be large, and there is a good dividing line between the 2.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
! public final class BibleInfo
{
/**
***************
*** 147,151 ****
* @see #getCase()
*/
! public static final void setCase(int bookCase)
{
BibleInfo.bookCase = CaseType.fromInteger(bookCase);
--- 147,151 ----
* @see #getCase()
*/
! public static void setCase(int bookCase)
{
BibleInfo.bookCase = CaseType.fromInteger(bookCase);
***************
*** 158,162 ****
* @see BibleInfo#setCase(CaseType)
*/
! public static final int getCase()
{
return BibleInfo.bookCase.toInteger();
--- 158,162 ----
* @see BibleInfo#setCase(CaseType)
*/
! public static int getCase()
{
return BibleInfo.bookCase.toInteger();
***************
*** 174,178 ****
* @see #getCase()
*/
! public static final void setCase(CaseType newBookCase)
{
if (newBookCase.equals(CaseType.MIXED))
--- 174,178 ----
* @see #getCase()
*/
! public static void setCase(CaseType newBookCase)
{
if (newBookCase.equals(CaseType.MIXED))
***************
*** 189,193 ****
* @see BibleInfo#setCase(int)
*/
! public static final CaseType getDefaultCase()
{
return BibleInfo.bookCase;
--- 189,193 ----
* @see BibleInfo#setCase(int)
*/
! public static CaseType getDefaultCase()
{
return BibleInfo.bookCase;
***************
*** 201,205 ****
* @exception NoSuchVerseException If the book number is not valid
*/
! public static final String getLongBookName(int book) throws NoSuchVerseException
{
try
--- 201,205 ----
* @exception NoSuchVerseException If the book number is not valid
*/
! public static String getLongBookName(int book) throws NoSuchVerseException
{
try
***************
*** 233,237 ****
* @exception NoSuchVerseException If the book number is not valid
*/
! public static final String getShortBookName(int book) throws NoSuchVerseException
{
try
--- 233,237 ----
* @exception NoSuchVerseException If the book number is not valid
*/
! public static String getShortBookName(int book) throws NoSuchVerseException
{
try
***************
*** 246,250 ****
}
! return shortBooks[book - 1];
}
catch (ArrayIndexOutOfBoundsException ex)
--- 246,250 ----
}
! return shortBooks[book - 1];
}
catch (ArrayIndexOutOfBoundsException ex)
***************
*** 263,267 ****
* @exception NoSuchVerseException If the book number is not valid
*/
! public static final String getOSISName(int book) throws NoSuchVerseException
{
try
--- 263,267 ----
* @exception NoSuchVerseException If the book number is not valid
*/
! public static String getOSISName(int book) throws NoSuchVerseException
{
try
***************
*** 283,287 ****
* @return The book number (1 to 66) On error -1
*/
! public static final int getBookNumber(String find)
{
if (!containsLetter(find))
--- 283,287 ----
* @return The book number (1 to 66) On error -1
*/
! public static int getBookNumber(String find)
{
if (!containsLetter(find))
***************
*** 345,349 ****
* @return The book number (1 to 66)
*/
! public static final boolean isBookName(String find)
{
return getBookNumber(find) != -1;
--- 345,349 ----
* @return The book number (1 to 66)
*/
! public static boolean isBookName(String find)
{
return getBookNumber(find) != -1;
***************
*** 354,358 ****
* @return 66 always - the number of books in the Bible
*/
! public static final int booksInBible()
{
return BOOKS_IN_BIBLE;
--- 354,358 ----
* @return 66 always - the number of books in the Bible
*/
! public static int booksInBible()
{
return BOOKS_IN_BIBLE;
***************
*** 363,367 ****
* @return 1189 always - the number of chapters in the Bible
*/
! public static final int chaptersInBible()
{
return CHAPTERS_IN_BIBLE;
--- 363,367 ----
* @return 1189 always - the number of chapters in the Bible
*/
! public static int chaptersInBible()
{
return CHAPTERS_IN_BIBLE;
***************
*** 374,378 ****
* @return 31102 always - the number of verses in the Bible
*/
! public static final int versesInBible()
{
return VERSES_IN_BIBLE;
--- 374,378 ----
* @return 31102 always - the number of verses in the Bible
*/
! public static int versesInBible()
{
return VERSES_IN_BIBLE;
***************
*** 385,389 ****
* @exception NoSuchVerseException If the book number is not valid
*/
! public static final int chaptersInBook(int book) throws NoSuchVerseException
{
try
--- 385,389 ----
* @exception NoSuchVerseException If the book number is not valid
*/
! public static int chaptersInBook(int book) throws NoSuchVerseException
{
try
***************
*** 407,411 ****
* @exception NoSuchVerseException If the book or chapter number is not valid
*/
! public static final int versesInChapter(int book, int chapter) throws NoSuchVerseException
{
try
--- 407,411 ----
* @exception NoSuchVerseException If the book or chapter number is not valid
*/
! public static int versesInChapter(int book, int chapter) throws NoSuchVerseException
{
try
***************
*** 430,434 ****
* @exception NoSuchVerseException If the book number is not valid
*/
! public static final int versesInBook(int book) throws NoSuchVerseException
{
try
--- 430,434 ----
* @exception NoSuchVerseException If the book number is not valid
*/
! public static int versesInBook(int book) throws NoSuchVerseException
{
try
***************
*** 455,459 ****
* @exception NoSuchVerseException If the reference is illegal
*/
! public static final int verseOrdinal(int book, int chapter, int verse) throws NoSuchVerseException
{
validate(book, chapter, verse);
--- 455,459 ----
* @exception NoSuchVerseException If the reference is illegal
*/
! public static int verseOrdinal(int book, int chapter, int verse) throws NoSuchVerseException
{
validate(book, chapter, verse);
***************
*** 469,473 ****
* @exception NoSuchVerseException If the reference is illegal
*/
! public static final int verseOrdinal(int[] ref) throws NoSuchVerseException
{
if (ref.length != 3)
--- 469,473 ----
* @exception NoSuchVerseException If the reference is illegal
*/
! public static int verseOrdinal(int[] ref) throws NoSuchVerseException
{
if (ref.length != 3)
***************
*** 487,491 ****
* @exception NoSuchVerseException If the reference is illegal
*/
! public static final int[] decodeOrdinal(int ordinal) throws NoSuchVerseException
{
if (ordinal < 1 || ordinal > BibleInfo.versesInBible())
--- 487,491 ----
* @exception NoSuchVerseException If the reference is illegal
*/
! public static int[] decodeOrdinal(int ordinal) throws NoSuchVerseException
{
if (ordinal < 1 || ordinal > BibleInfo.versesInBible())
***************
*** 524,528 ****
* @exception NoSuchVerseException If the reference is illegal
*/
! public static final void validate(int book, int chapter, int verse) throws NoSuchVerseException
{
// Check the book
--- 524,528 ----
* @exception NoSuchVerseException If the reference is illegal
*/
! public static void validate(int book, int chapter, int verse) throws NoSuchVerseException
{
// Check the book
***************
*** 562,566 ****
* @exception NoSuchVerseException If the reference is illegal
*/
! public static final void validate(int[] ref) throws NoSuchVerseException
{
if (ref.length != 3)
--- 562,566 ----
* @exception NoSuchVerseException If the reference is illegal
*/
! public static void validate(int[] ref) throws NoSuchVerseException
{
if (ref.length != 3)
***************
*** 592,596 ****
* @return The original array that has been patched.
*/
! public static final int[] patch(int[] ref)
{
try
--- 592,596 ----
* @return The original array that has been patched.
*/
! public static int[] patch(int[] ref)
{
try
***************
*** 673,677 ****
* @exception NoSuchVerseException If either reference is illegal
*/
! public static final int verseCount(int book1, int chapter1, int verse1, int book2, int chapter2, int verse2) throws NoSuchVerseException
{
int verse_ord1 = verseOrdinal(book1, chapter1, verse1);
--- 673,677 ----
* @exception NoSuchVerseException If either reference is illegal
*/
! public static int verseCount(int book1, int chapter1, int verse1, int book2, int chapter2, int verse2) throws NoSuchVerseException
{
int verse_ord1 = verseOrdinal(book1, chapter1, verse1);
***************
*** 688,692 ****
* @exception NoSuchVerseException If either reference is illegal
*/
! public static final int verseCount(int[] ref1, int[] ref2) throws NoSuchVerseException
{
if (ref1.length != 3 || ref2.length != 3)
--- 688,692 ----
* @exception NoSuchVerseException If either reference is illegal
*/
! public static int verseCount(int[] ref1, int[] ref2) throws NoSuchVerseException
{
if (ref1.length != 3 || ref2.length != 3)
***************
*** 703,707 ****
* @return True if this book is a part of this section
*/
! public static final boolean isPentateuch(int book)
{
return book >= Names.GENESIS && book <= Names.DEUTERONOMY;
--- 703,707 ----
* @return True if this book is a part of this section
*/
! public static boolean isPentateuch(int book)
{
return book >= Names.GENESIS && book <= Names.DEUTERONOMY;
***************
*** 713,717 ****
* @return True if this book is a part of this section
*/
! public static final boolean isHistory(int book)
{
return book >= Names.JOSHUA && book <= Names.ESTHER;
--- 713,717 ----
* @return True if this book is a part of this section
*/
! public static boolean isHistory(int book)
{
return book >= Names.JOSHUA && book <= Names.ESTHER;
***************
*** 723,727 ****
* @return True if this book is a part of this section
*/
! public static final boolean isPoetry(int book)
{
return book >= Names.JOB && book <= Names.SONGOFSOLOMON;
--- 723,727 ----
* @return True if this book is a part of this section
*/
! public static boolean isPoetry(int book)
{
return book >= Names.JOB && book <= Names.SONGOFSOLOMON;
***************
*** 733,737 ****
* @return True if this book is a part of this section
*/
! public static final boolean isMajorProphet(int book)
{
return book >= Names.ISAIAH && book <= Names.DANIEL;
--- 733,737 ----
* @return True if this book is a part of this section
*/
! public static boolean isMajorProphet(int book)
{
return book >= Names.ISAIAH && book <= Names.DANIEL;
***************
*** 743,747 ****
* @return True if this book is a part of this section
*/
! public static final boolean isMinorProphet(int book)
{
return book >= Names.HOSEA && book <= Names.MALACHI;
--- 743,747 ----
* @return True if this book is a part of this section
*/
! public static boolean isMinorProphet(int book)
{
return book >= Names.HOSEA && book <= Names.MALACHI;
***************
*** 753,757 ****
* @return True if this book is a part of this section
*/
! public static final boolean isGospel(int book)
{
return book >= Names.MATTHEW && book <= Names.JOHN;
--- 753,757 ----
* @return True if this book is a part of this section
*/
! public static boolean isGospel(int book)
{
return book >= Names.MATTHEW && book <= Names.JOHN;
***************
*** 763,767 ****
* @return True if this book is a part of this section
*/
! public static final boolean isGospelOrActs(int book)
{
return book >= Names.MATTHEW && book <= Names.ACTS;
--- 763,767 ----
* @return True if this book is a part of this section
*/
! public static boolean isGospelOrActs(int book)
{
return book >= Names.MATTHEW && book <= Names.ACTS;
***************
*** 773,777 ****
* @return True if this book is a part of this section
*/
! public static final boolean isLetter(int book)
{
return book >= Names.ROMANS && book <= Names.JUDE;
--- 773,777 ----
* @return True if this book is a part of this section
*/
! public static boolean isLetter(int book)
{
return book >= Names.ROMANS && book <= Names.JUDE;
***************
*** 784,788 ****
* @see BibleInfo.Section
*/
! public static final int getSection(int book)
{
// Ordered by section size for speed
--- 784,788 ----
* @see BibleInfo.Section
*/
! public static int getSection(int book)
{
// Ordered by section size for speed
***************
*** 831,835 ****
* @see #getSection(int)
*/
! public static final int booksInSection(int section)
{
return BOOKS_IN_SECTION[section];
--- 831,835 ----
* @see #getSection(int)
*/
! public static int booksInSection(int section)
{
return BOOKS_IN_SECTION[section];
***************
*** 843,847 ****
* @exception NoSuchVerseException If the book number is not valid
*/
! public static final String getSectionName(int section) throws NoSuchVerseException
{
if (section == 0)
--- 843,847 ----
* @exception NoSuchVerseException If the book number is not valid
*/
! public static String getSectionName(int section) throws NoSuchVerseException
{
if (section == 0)
***************
*** 1056,1060 ****
/** Constant for the number of chapters in each book */
! private static final short[] CHAPTERS_IN_BOOK =
{
50, 40, 27, 36, 34, 24, 21, 4, 31, 24,
--- 1056,1060 ----
/** Constant for the number of chapters in each book */
! static final short[] CHAPTERS_IN_BOOK =
{
50, 40, 27, 36, 34, 24, 21, 4, 31, 24,
***************
*** 1068,1075 ****
/** Constant for the number of verses in the Bible */
! private static final short VERSES_IN_BIBLE = 31102;
/** Constant for the number of verses in each book */
! private static final short[] VERSES_IN_BOOK =
{
1533, 1213, 859, 1288, 959, 658, 618, 85, 810, 695,
--- 1068,1075 ----
/** Constant for the number of verses in the Bible */
! static final short VERSES_IN_BIBLE = 31102;
/** Constant for the number of verses in each book */
! static final short[] VERSES_IN_BOOK =
{
1533, 1213, 859, 1288, 959, 658, 618, 85, 810, 695,
***************
*** 1083,1087 ****
/** Constant for the number of verses in each chapter */
! private static final short[][] VERSES_IN_CHAPTER =
{
{ 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26 },
--- 1083,1087 ----
/** Constant for the number of verses in each chapter */
! static final short[][] VERSES_IN_CHAPTER =
{
{ 31, 25, 24, 26, 32, 22, 24, 22, 29, 32, 32, 20, 18, 24, 21, 16, 27, 33, 38, 18, 34, 24, 20, 67, 34, 35, 46, 22, 35, 43, 55, 32, 20, 31, 29, 43, 36, 30, 23, 23, 57, 38, 34, 34, 28, 34, 31, 22, 33, 26 },
***************
*** 1150,1158 ****
{ 14 },
{ 25 },
! { 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 17, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21 }
};
/** Constant for the ordinal number of the first verse in each book */
! private static final short[] ORDINAL_AT_START_OF_BOOK =
{
1, 1534, 2747, 3606, 4894, 5853, 6511, 7129, 7214, 8024,
--- 1150,1158 ----
{ 14 },
{ 25 },
! { 20, 29, 22, 11, 14, 17, 17, 13, 21, 11, 19, 17, 18, 20, 8, 21, 18, 24, 21, 15, 27, 21 },
};
/** Constant for the ordinal number of the first verse in each book */
! static final short[] ORDINAL_AT_START_OF_BOOK =
{
1, 1534, 2747, 3606, 4894, 5853, 6511, 7129, 7214, 8024,
***************
*** 1171,1203 ****
* get it to compile under JBuilder.
*/
! private static final short[][] ORDINAL_AT_START_OF_CHAPTER =
{
! { 1, 32, 57, 81, 107, 139, 161, 185, 207, 236, 268, 300, 320, 338, 362, 383, 399, 426, 459, 497, 515, 549, 573, 593, 660, 694, 729, 775, 797, 832, 875, 930, 962, 982, 1013, 1042, 1085, 1121, 1151, 1174, 1197, 1254, 1292, 1326, 1360, 1388, 1422, 1453, 1475, 1508, },
! { 1534, 1556, 1581, 1603, 1634, 1657, 1687, 1712, 1744, 1779, 1808, 1818, 1869, 1891, 1922, 1949, 1985, 2001, 2028, 2053, 2079, 2115, 2146, 2179, 2197, 2237, 2274, 2295, 2338, 2384, 2422, 2440, 2475, 2498, 2533, 2568, 2606, 2635, 2666, 2709, },
! { 2747, 2764, 2780, 2797, 2832, 2851, 2881, 2919, 2955, 2979, 2999, 3046, 3054, 3113, 3170, 3203, 3237, 3253, 3283, 3320, 3347, 3371, 3404, 3448, 3471, 3526, 3572, },
! { 3606, 3660, 3694, 3745, 3794, 3825, 3852, 3941, 3967, 3990, 4026, 4061, 4077, 4110, 4155, 4196, 4246, 4259, 4291, 4313, 4342, 4377, 4418, 4448, 4473, 4491, 4556, 4579, 4610, 4650, 4666, 4720, 4762, 4818, 4847, 4881, },
! { 4894, 4940, 4977, 5006, 5055, 5088, 5113, 5139, 5159, 5188, 5210, 5242, 5274, 5292, 5321, 5344, 5366, 5386, 5408, 5429, 5449, 5472, 5502, 5527, 5549, 5568, 5587, 5613, 5681, 5710, 5730, 5760, 5812, 5841, },
! { 5853, 5871, 5895, 5912, 5936, 5951, 5978, 6004, 6039, 6066, 6109, 6132, 6156, 6189, 6204, 6267, 6277, 6295, 6323, 6374, 6383, 6428, 6462, 6478, },
! { 6511, 6547, 6570, 6601, 6625, 6656, 6696, 6721, 6756, 6813, 6831, 6871, 6886, 6911, 6931, 6951, 6982, 6995, 7026, 7056, 7104, },
{ 7129, 7151, 7174, 7192, },
! { 7214, 7242, 7278, 7299, 7321, 7333, 7354, 7371, 7393, 7420, 7447, 7462, 7487, 7510, 7562, 7597, 7620, 7678, 7708, 7732, 7774, 7789, 7812, 7841, 7863, 7907, 7932, 7944, 7969, 7980, 8011, },
! { 8024, 8051, 8083, 8122, 8134, 8159, 8182, 8211, 8229, 8242, 8261, 8288, 8319, 8358, 8391, 8428, 8451, 8480, 8513, 8556, 8582, 8604, 8655, 8694, },
! { 8719, 8772, 8818, 8846, 8880, 8898, 8936, 8987, 9053, 9081, 9110, 9153, 9186, 9220, 9251, 9285, 9319, 9343, 9389, 9410, 9453, 9482, },
! { 9535, 9553, 9578, 9605, 9649, 9676, 9709, 9729, 9758, 9795, 9831, 9852, 9873, 9898, 9927, 9965, 9985, 10026, 10063, 10100, 10121, 10147, 10167, 10204, 10224, },
! { 10254, 10308, 10363, 10387, 10430, 10456, 10537, 10577, 10617, 10661, 10675, 10722, 10762, 10776, 10793, 10822, 10865, 10892, 10909, 10928, 10936, 10966, 10985, 11017, 11048, 11079, 11111, 11145, 11166, },
! { 11196, 11213, 11231, 11248, 11270, 11284, 11326, 11348, 11366, 11397, 11416, 11439, 11455, 11477, 11492, 11511, 11525, 11544, 11578, 11589, 11626, 11646, 11658, 11679, 11706, 11734, 11757, 11766, 11793, 11829, 11856, 11877, 11910, 11935, 11968, 11995, },
{ 12018, 12029, 12099, 12112, 12136, 12153, 12175, 12203, 12239, 12254, },
{ 12298, 12309, 12329, 12361, 12384, 12403, 12422, 12495, 12513, 12551, 12590, 12626, 12673, },
{ 12704, 12726, 12749, 12764, 12781, 12795, 12809, 12819, 12836, 12868, },
! { 12871, 12893, 12906, 12932, 12953, 12980, 13010, 13031, 13053, 13088, 13110, 13130, 13155, 13183, 13205, 13240, 13262, 13278, 13299, 13328, 13357, 13391, 13421, 13438, 13463, 13469, 13483, 13506, 13534, 13559, 13590, 13630, 13652, 13685, 13722, 13738, 13771, 13795, 13836, 13866, 13890, 13924, },
! { 13941, 13947, 13959, 13967, 13975, 13987, 13997, 14014, 14023, 14043, 14061, 14068, 14076, 14082, 14089, 14094, 14105, 14120, 14170, 14184, 14193, 14206, 14237, 14243, 14253, 14275, 14287, 14301, 14310, 14321, 14333, 14357, 14368, 14390, 14412, 14440, 14452, 14492, 14514, 14527, 14544, 14557, 14568, 14573, 14599, 14616, 14627, 14636, 14650, 14670, 14693, 14712, 14721, 14727, 14734, 14757, 14770, 14781, 14792, 14809, 14821, 14829, 14841, 14852, 14862, 14875, 14895, 14902, 14937, 14973, 14978, 15002,
! 15022, 15050, 15073, 15083, 15095, 15115, 15187, 15200, 15219, 15235, 15243, 15261, 15273, 15286, 15303, 15310, 15328, 15380, 15397, 15413, 15428, 15433, 15456, 15467, 15480, 15492, 15501, 15510, 15515, 15523, 15551, 15573, 15608, 15653, 15701, 15744, 15757, 15788, 15795, 15805, 15815, 15824, 15832, 15850, 15869, 15871, 15900, 16076, 16083, 16091, 16100, 16104, 16112, 16117, 16123, 16128, 16134, 16142, 16150, 16153, 16171, 16174, 16177, 16198, 16224, 16233, 16241, 16265, 16278, 16288, 16295, 16307, 16322, 16343, 16353, 16373, 16387, 16396, },
! { 16402, 16435, 16457, 16492, 16519, 16542, 16577, 16604, 16640, 16658, 16690, 16721, 16749, 16774, 16809, 16842, 16875, 16903, 16927, 16956, 16986, 17017, 17046, 17081, 17115, 17143, 17171, 17198, 17226, 17253, 17286, },
{ 17317, 17335, 17361, 17383, 17399, 17419, 17431, 17460, 17477, 17495, 17515, 17525, },
{ 17539, 17556, 17573, 17584, 17600, 17616, 17629, 17642, },
! { 17656, 17687, 17709, 17735, 17741, 17771, 17784, 17809, 17831, 17852, 17886, 17902, 17908, 17930, 17962, 17971, 17985, 17999, 18006, 18031, 18037, 18054, 18079, 18097, 18120, 18132, 18153, 18166, 18195, 18219, 18252, 18261, 18281, 18305, 18322, 18332, 18354, 18392, 18414, 18422, 18453, 18482, 18507, 18535, 18563, 18588, 18601, 18616, 18638, 18664, 18675, 18698, 18713, 18725, 18742, 18755, 18767, 18788, 18802, 18823, 18845, 18856, 18868, 18887, 18899, 18924, },
! { 18948, 18967, 19004, 19029, 19060, 19091, 19121, 19155, 19177, 19203, 19228, 19251, 19268, 19295, 19317, 19338, 19359, 19386, 19409, 19424, 19442, 19456, 19486, 19526, 19536, 19574, 19598, 19620, 19637, 19669, 19693, 19733, 19777, 19803, 19825, 19844, 19876, 19897, 19925, 19943, 19959, 19977, 19999, 20012, 20042, 20047, 20075, 20082, 20129, 20168, 20214, 20278, },
{ 20312, 20334, 20356, 20422, 20444, },
! { 20466, 20494, 20504, 20531, 20548, 20565, 20579, 20606, 20624, 20635, 20657, 20682, 20710, 20733, 20756, 20764, 20827, 20851, 20883, 20897, 20946, 20978, 21009, 21058, 21085, 21102, 21123, 21159, 21185, 21206, 21232, 21250, 21282, 21315, 21346, 21361, 21399, 21427, 21450, 21479, 21528, 21554, 21574, 21601, 21632, 21657, 21681, 21704, },
{ 21739, 21760, 21809, 21839, 21876, 21907, 21935, 21963, 21990, 22017, 22038, 22083, },
{ 22096, 22107, 22130, 22135, 22154, 22169, 22180, 22196, 22210, 22227, 22242, 22254, 22268, 22284, },
--- 1171,1233 ----
* get it to compile under JBuilder.
*/
! static final short[][] ORDINAL_AT_START_OF_CHAPTER =
{
! { 1, 32, 57, 81, 107, 139, 161, 185, 207, 236, 268, 300, 320, 338, 362, 383, 399, 426, 459, 497,
! 515, 549, 573, 593, 660, 694, 729, 775, 797, 832, 875, 930, 962, 982, 1013, 1042, 1085, 1121, 1151, 1174,
! 1197, 1254, 1292, 1326, 1360, 1388, 1422, 1453, 1475, 1508, },
! { 1534, 1556, 1581, 1603, 1634, 1657, 1687, 1712, 1744, 1779, 1808, 1818, 1869, 1891, 1922, 1949, 1985, 2001, 2028, 2053,
! 2079, 2115, 2146, 2179, 2197, 2237, 2274, 2295, 2338, 2384, 2422, 2440, 2475, 2498, 2533, 2568, 2606, 2635, 2666, 2709, },
! { 2747, 2764, 2780, 2797, 2832, 2851, 2881, 2919, 2955, 2979, 2999, 3046, 3054, 3113, 3170, 3203, 3237, 3253, 3283, 3320,
! 3347, 3371, 3404, 3448, 3471, 3526, 3572, },
! { 3606, 3660, 3694, 3745, 3794, 3825, 3852, 3941, 3967, 3990, 4026, 4061, 4077, 4110, 4155, 4196, 4246, 4259, 4291, 4313,
! 4342, 4377, 4418, 4448, 4473, 4491, 4556, 4579, 4610, 4650, 4666, 4720, 4762, 4818, 4847, 4881, },
! { 4894, 4940, 4977, 5006, 5055, 5088, 5113, 5139, 5159, 5188, 5210, 5242, 5274, 5292, 5321, 5344, 5366, 5386, 5408, 5429,
! 5449, 5472, 5502, 5527, 5549, 5568, 5587, 5613, 5681, 5710, 5730, 5760, 5812, 5841, },
! { 5853, 5871, 5895, 5912, 5936, 5951, 5978, 6004, 6039, 6066, 6109, 6132, 6156, 6189, 6204, 6267, 6277, 6295, 6323, 6374,
! 6383, 6428, 6462, 6478, },
! { 6511, 6547, 6570, 6601, 6625, 6656, 6696, 6721, 6756, 6813, 6831, 6871, 6886, 6911, 6931, 6951, 6982, 6995, 7026, 7056,
! 7104, },
{ 7129, 7151, 7174, 7192, },
! { 7214, 7242, 7278, 7299, 7321, 7333, 7354, 7371, 7393, 7420, 7447, 7462, 7487, 7510, 7562, 7597, 7620, 7678, 7708, 7732,
! 7774, 7789, 7812, 7841, 7863, 7907, 7932, 7944, 7969, 7980, 8011, },
! { 8024, 8051, 8083, 8122, 8134, 8159, 8182, 8211, 8229, 8242, 8261, 8288, 8319, 8358, 8391, 8428, 8451, 8480, 8513, 8556,
! 8582, 8604, 8655, 8694, },
! { 8719, 8772, 8818, 8846, 8880, 8898, 8936, 8987, 9053, 9081, 9110, 9153, 9186, 9220, 9251, 9285, 9319, 9343, 9389, 9410,
! 9453, 9482, },
! { 9535, 9553, 9578, 9605, 9649, 9676, 9709, 9729, 9758, 9795, 9831, 9852, 9873, 9898, 9927, 9965, 9985, 10026, 10063, 10100,
! 10121, 10147, 10167, 10204, 10224, },
! { 10254, 10308, 10363, 10387, 10430, 10456, 10537, 10577, 10617, 10661, 10675, 10722, 10762, 10776, 10793, 10822, 10865, 10892, 10909, 10928,
! 10936, 10966, 10985, 11017, 11048, 11079, 11111, 11145, 11166, },
! { 11196, 11213, 11231, 11248, 11270, 11284, 11326, 11348, 11366, 11397, 11416, 11439, 11455, 11477, 11492, 11511, 11525, 11544, 11578, 11589,
! 11626, 11646, 11658, 11679, 11706, 11734, 11757, 11766, 11793, 11829, 11856, 11877, 11910, 11935, 11968, 11995, },
{ 12018, 12029, 12099, 12112, 12136, 12153, 12175, 12203, 12239, 12254, },
{ 12298, 12309, 12329, 12361, 12384, 12403, 12422, 12495, 12513, 12551, 12590, 12626, 12673, },
{ 12704, 12726, 12749, 12764, 12781, 12795, 12809, 12819, 12836, 12868, },
! { 12871, 12893, 12906, 12932, 12953, 12980, 13010, 13031, 13053, 13088, 13110, 13130, 13155, 13183, 13205, 13240, 13262, 13278, 13299, 13328,
! 13357, 13391, 13421, 13438, 13463, 13469, 13483, 13506, 13534, 13559, 13590, 13630, 13652, 13685, 13722, 13738, 13771, 13795, 13836, 13866,
! 13890, 13924, },
! { 13941, 13947, 13959, 13967, 13975, 13987, 13997, 14014, 14023, 14043, 14061, 14068, 14076, 14082, 14089, 14094, 14105, 14120, 14170, 14184,
! 14193, 14206, 14237, 14243, 14253, 14275, 14287, 14301, 14310, 14321, 14333, 14357, 14368, 14390, 14412, 14440, 14452, 14492, 14514, 14527,
! 14544, 14557, 14568, 14573, 14599, 14616, 14627, 14636, 14650, 14670, 14693, 14712, 14721, 14727, 14734, 14757, 14770, 14781, 14792, 14809,
! 14821, 14829, 14841, 14852, 14862, 14875, 14895, 14902, 14937, 14973, 14978, 15002, 15022, 15050, 15073, 15083, 15095, 15115, 15187, 15200,
! 15219, 15235, 15243, 15261, 15273, 15286, 15303, 15310, 15328, 15380, 15397, 15413, 15428, 15433, 15456, 15467, 15480, 15492, 15501, 15510,
! 15515, 15523, 15551, 15573, 15608, 15653, 15701, 15744, 15757, 15788, 15795, 15805, 15815, 15824, 15832, 15850, 15869, 15871, 15900, 16076,
! 16083, 16091, 16100, 16104, 16112, 16117, 16123, 16128, 16134, 16142, 16150, 16153, 16171, 16174, 16177, 16198, 16224, 16233, 16241, 16265,
! 16278, 16288, 16295, 16307, 16322, 16343, 16353, 16373, 16387, 16396, },
! { 16402, 16435, 16457, 16492, 16519, 16542, 16577, 16604, 16640, 16658, 16690, 16721, 16749, 16774, 16809, 16842, 16875, 16903, 16927, 16956,
! 16986, 17017, 17046, 17081, 17115, 17143, 17171, 17198, 17226, 17253, 17286, },
{ 17317, 17335, 17361, 17383, 17399, 17419, 17431, 17460, 17477, 17495, 17515, 17525, },
{ 17539, 17556, 17573, 17584, 17600, 17616, 17629, 17642, },
! { 17656, 17687, 17709, 17735, 17741, 17771, 17784, 17809, 17831, 17852, 17886, 17902, 17908, 17930, 17962, 17971, 17985, 17999, 18006, 18031,
! 18037, 18054, 18079, 18097, 18120, 18132, 18153, 18166, 18195, 18219, 18252, 18261, 18281, 18305, 18322, 18332, 18354, 18392, 18414, 18422,
! 18453, 18482, 18507, 18535, 18563, 18588, 18601, 18616, 18638, 18664, 18675, 18698, 18713, 18725, 18742, 18755, 18767, 18788, 18802, 18823,
! 18845, 18856, 18868, 18887, 18899, 18924, },
! { 18948, 18967, 19004, 19029, 19060, 19091, 19121, 19155, 19177, 19203, 19228, 19251, 19268, 19295, 19317, 19338, 19359, 19386, 19409, 19424,
! 19442, 19456, 19486, 19526, 19536, 19574, 19598, 19620, 19637, 19669, 19693, 19733, 19777, 19803, 19825, 19844, 19876, 19897, 19925, 19943,
! 19959, 19977, 19999, 20012, 20042, 20047, 20075, 20082, 20129, 20168, 20214, 20278, },
{ 20312, 20334, 20356, 20422, 20444, },
! { 20466, 20494, 20504, 20531, 20548, 20565, 20579, 20606, 20624, 20635, 20657, 20682, 20710, 20733, 20756, 20764, 20827, 20851, 20883, 20897,
! 20946, 20978, 21009, 21058, 21085, 21102, 21123, 21159, 21185, 21206, 21232, 21250, 21282, 21315, 21346, 21361, 21399, 21427, 21450, 21479,
! 21528, 21554, 21574, 21601, 21632, 21657, 21681, 21704, },
{ 21739, 21760, 21809, 21839, 21876, 21907, 21935, 21963, 21990, 22017, 22038, 22083, },
{ 22096, 22107, 22130, 22135, 22154, 22169, 22180, 22196, 22210, 22227, 22242, 22254, 22268, 22284, },
***************
*** 1213,1221 ****
{ 22880, 22901, 22914, 22924, 22938, 22949, 22964, 22978, 23001, 23018, 23030, 23047, 23061, 23070, },
{ 23091, 23105, 23122, 23140, },
! { 23146, 23171, 23194, 23211, 23236, 23284, 23318, 23347, 23381, 23419, 23461, 23491, 23541, 23599, 23635, 23674, 23702, 23729, 23764, 23794, 23828, 23874, 23920, 23959, 24010, 24056, 24131, 24197, },
{ 24217, 24262, 24290, 24325, 24366, 24409, 24465, 24502, 24540, 24590, 24642, 24675, 24719, 24756, 24828, 24875, },
! { 24895, 24975, 25027, 25065, 25109, 25148, 25197, 25247, 25303, 25365, 25407, 25461, 25520, 25555, 25590, 25622, 25653, 25690, 25733, 25781, 25828, 25866, 25937, 25993, },
! { 26046, 26097, 26122, 26158, 26212, 26259, 26330, 26383, 26442, 26483, 26525, 26582, 26632, 26670, 26701, 26728, 26761, 26787, 26827, 26869, 26900, },
! { 26925, 26951, 26998, 27024, 27061, 27103, 27118, 27178, 27218, 27261, 27309, 27339, 27364, 27416, 27444, 27485, 27525, 27559, 27587, 27628, 27666, 27706, 27736, 27771, 27798, 27825, 27857, 27901, },
{ 27932, 27964, 27993, 28024, 28049, 28070, 28093, 28118, 28157, 28190, 28211, 28247, 28268, 28282, 28305, 28338, },
{ 28365, 28396, 28412, 28435, 28456, 28469, 28489, 28529, 28542, 28569, 28602, 28636, 28667, 28680, 28720, 28778, },
--- 1243,1255 ----
{ 22880, 22901, 22914, 22924, 22938, 22949, 22964, 22978, 23001, 23018, 23030, 23047, 23061, 23070, },
{ 23091, 23105, 23122, 23140, },
! { 23146, 23171, 23194, 23211, 23236, 23284, 23318, 23347, 23381, 23419, 23461, 23491, 23541, 23599, 23635, 23674, 23702, 23729, 23764, 23794,
! 23828, 23874, 23920, 23959, 24010, 24056, 24131, 24197, },
{ 24217, 24262, 24290, 24325, 24366, 24409, 24465, 24502, 24540, 24590, 24642, 24675, 24719, 24756, 24828, 24875, },
! { 24895, 24975, 25027, 25065, 25109, 25148, 25197, 25247, 25303, 25365, 25407, 25461, 25520, 25555, 25590, 25622, 25653, 25690, 25733, 25781,
! 25828, 25866, 25937, 25993, },
! { 26046, 26097, 26122, 26158, 26212, 26259, 26330, 26383, 26442, 26483, 26525, 26582, 26632, 26670, 26701, 26728, 26761, 26787, 26827, 26869,
! 26900, },
! { 26925, 26951, 26998, 27024, 27061, 27103, 27118, 27178, 27218, 27261, 27309, 27339, 27364, 27416, 27444, 27485, 27525, 27559, 27587, 27628,
! 27666, 27706, 27736, 27771, 27798, 27825, 27857, 27901, },
{ 27932, 27964, 27993, 28024, 28049, 28070, 28093, 28118, 28157, 28190, 28211, 28247, 28268, 28282, 28305, 28338, },
{ 28365, 28396, 28412, 28435, 28456, 28469, 28489, 28529, 28542, 28569, 28602, 28636, 28667, 28680, 28720, 28778, },
***************
*** 1239,1243 ****
{ 30660, },
{ 30674, },
! { 30699, 30719, 30748, 30770, 30781, 30795, 30812, 30829, 30842, 30863, 30874, 30893, 30910, 30928, 30948, 30956, 30977, 30995, 31019, 31040, 31055, 31082, },
};
--- 1273,1278 ----
{ 30660, },
{ 30674, },
! { 30699, 30719, 30748, 30770, 30781, 30795, 30812, 30829, 30842, 30863, 30874, 30893, 30910, 30928, 30948, 30956, 30977, 30995, 31019, 31040,
! 31055, 31082, },
};
***************
*** 1245,1249 ****
* The number of books in each section
*/
! private static final short[] BOOKS_IN_SECTION =
{
0, // Does not exist
--- 1280,1284 ----
* The number of books in each section
*/
! static final short[] BOOKS_IN_SECTION =
{
0, // Does not exist
Index: AbstractKeyList.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/AbstractKeyList.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** AbstractKeyList.java 10 May 2005 02:39:21 -0000 1.11
--- AbstractKeyList.java 17 May 2005 00:43:15 -0000 1.12
***************
*** 27,31 ****
* An implementation of some of the easier methods from Key.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 27,31 ----
* An implementation of some of the easier methods from Key.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Index: KeyUtil.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/KeyUtil.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** KeyUtil.java 10 May 2005 02:39:21 -0000 1.8
--- KeyUtil.java 17 May 2005 00:43:15 -0000 1.9
***************
*** 29,37 ****
* .
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
! public class KeyUtil
{
/**
--- 29,37 ----
* .
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
! public final class KeyUtil
{
/**
Index: Passage.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/Passage.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** Passage.java 10 May 2005 02:39:21 -0000 1.17
--- Passage.java 17 May 2005 00:43:15 -0000 1.18
***************
*** 68,72 ****
* use named RangedPassages, however that is perhaps better left to another class.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 68,72 ----
* use named RangedPassages, however that is perhaps better left to another class.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
***************
*** 79,83 ****
* @return a String containing an overview of the verses
*/
! public String getOverview();
/**
--- 79,83 ----
* @return a String containing an overview of the verses
*/
! String getOverview();
/**
***************
*** 88,92 ****
* @see Verse
*/
! public int countVerses();
/**
--- 88,92 ----
* @see Verse
*/
! int countVerses();
/**
***************
*** 99,103 ****
* @see VerseRange
*/
! public int countRanges(RestrictionType restrict);
/**
--- 99,103 ----
* @see VerseRange
*/
! int countRanges(RestrictionType restrict);
/**
***************
*** 112,116 ****
* @see Verse
*/
! public Passage trimVerses(int count);
/**
--- 112,116 ----
* @see Verse
*/
! Passage trimVerses(int count);
/**
***************
*** 126,130 ****
* @see VerseRange
*/
! public Passage trimRanges(int count, RestrictionType restrict);
/**
--- 126,130 ----
* @see VerseRange
*/
! Passage trimRanges(int count, RestrictionType restrict);
/**
***************
*** 132,136 ****
* @return The number of distinct books
*/
! public int booksInPassage();
/**
--- 132,136 ----
* @return The number of distinct books
*/
! int booksInPassage();
/**
***************
*** 140,144 ****
* @throws NoSuchVerseException if the book is invalid
*/
! public int chaptersInPassage(int book) throws NoSuchVerseException;
/**
--- 140,144 ----
* @throws NoSuchVerseException if the book is invalid
*/
! int chaptersInPassage(int book) throws NoSuchVerseException;
/**
***************
*** 150,154 ****
* @throws NoSuchVerseException if the book/chapter is invalid
*/
! public int versesInPassage(int book, int chapter) throws NoSuchVerseException;
/**
--- 150,154 ----
* @throws NoSuchVerseException if the book/chapter is invalid
*/
! int versesInPassage(int book, int chapter) throws NoSuchVerseException;
/**
***************
*** 158,162 ****
* @throws ArrayIndexOutOfBoundsException If the offset is out of range
*/
! public Verse getVerseAt(int offset) throws ArrayIndexOutOfBoundsException;
/**
--- 158,162 ----
* @throws ArrayIndexOutOfBoundsException If the offset is out of range
*/
! Verse getVerseAt(int offset) throws ArrayIndexOutOfBoundsException;
/**
***************
*** 167,171 ****
* @throws ArrayIndexOutOfBoundsException If the offset is out of range
*/
! public VerseRange getRangeAt(int offset, RestrictionType restrict) throws ArrayIndexOutOfBoundsException;
/**
--- 167,171 ----
* @throws ArrayIndexOutOfBoundsException If the offset is out of range
*/
! VerseRange getRangeAt(int offset, RestrictionType restrict) throws ArrayIndexOutOfBoundsException;
/**
***************
*** 176,180 ****
* @return A list enumerator
*/
! public Iterator rangeIterator(RestrictionType restrict);
/**
--- 176,180 ----
* @return A list enumerator
*/
! Iterator rangeIterator(RestrictionType restrict);
/**
***************
*** 183,187 ****
* @return true if this collection contains that
*/
! public boolean contains(VerseBase that);
/**
--- 183,187 ----
* @return true if this collection contains that
*/
! boolean contains(VerseBase that);
/**
***************
*** 189,193 ****
* @param that The Verses to be removed from this Passage
*/
! public void add(VerseBase that);
/**
--- 189,193 ----
* @param that The Verses to be removed from this Passage
*/
! void add(VerseBase that);
/**
***************
*** 195,199 ****
* @param that The Verses to be removed from this Passage
*/
! public void remove(VerseBase that);
/**
--- 195,199 ----
* @param that The Verses to be removed from this Passage
*/
! void remove(VerseBase that);
/**
***************
*** 202,206 ****
* @return true if this reference contains all of the Verses in that Passage
*/
! public boolean containsAll(Passage that);
/**
--- 202,206 ----
* @return true if this reference contains all of the Verses in that Passage
*/
! boolean containsAll(Passage that);
/**
***************
*** 211,215 ****
* @exception NoSuchVerseException If the file was invalid
*/
! public void readDescription(Reader in) throws IOException, NoSuchVerseException;
/**
--- 211,215 ----
* @exception NoSuchVerseException If the file was invalid
*/
! void readDescription(Reader in) throws IOException, NoSuchVerseException;
/**
***************
*** 219,223 ****
* @exception java.io.IOException If the file/network etc breaks
*/
! public void writeDescription(Writer out) throws IOException;
/**
--- 219,223 ----
* @exception java.io.IOException If the file/network etc breaks
*/
! void writeDescription(Writer out) throws IOException;
/**
***************
*** 229,233 ****
* Passage.
*/
! public void optimizeReads();
/**
--- 229,233 ----
* Passage.
*/
! void optimizeReads();
/**
***************
*** 235,239 ****
* @param li The listener to add
*/
! public void addPassageListener(PassageListener li);
/**
--- 235,239 ----
* @param li The listener to add
*/
! void addPassageListener(PassageListener li);
/**
***************
*** 241,244 ****
* @param li The listener to remove
*/
! public void removePassageListener(PassageListener li);
}
--- 241,244 ----
* @param li The listener to remove
*/
! void removePassageListener(PassageListener li);
}
Index: PassageKeyFactory.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/PassageKeyFactory.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** PassageKeyFactory.java 10 May 2005 02:39:21 -0000 1.10
--- PassageKeyFactory.java 17 May 2005 00:43:15 -0000 1.11
***************
*** 30,38 ****
* the verses in the Bible.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
! public class PassageKeyFactory implements KeyFactory
{
/**
--- 30,38 ----
* the verses in the Bible.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
*/
! public final class PassageKeyFactory implements KeyFactory
{
/**
Index: DistinctPassage.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/DistinctPassage.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DistinctPassage.java 10 May 2005 02:39:21 -0000 1.13
--- DistinctPassage.java 17 May 2005 00:43:15 -0000 1.14
***************
*** 38,42 ****
* </ul>
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
--- 38,42 ----
* </ul>
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
More information about the jsword-svn
mailing list