[jsword-svn] jsword/java/jsword/org/crosswire/jsword/passage s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Sun Mar 6 13:21:49 MST 2005
Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage
In directory www.crosswire.org:/tmp/cvs-serv26524/java/jsword/org/crosswire/jsword/passage
Modified Files:
NoSuchKeyException.java SynchronizedPassage.java
PassageEvent.java NoSuchVerseException.java BibleInfo.java
RocketPassage.java
Log Message:
Changes to satisfy CheckStyle
Index: SynchronizedPassage.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/SynchronizedPassage.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** SynchronizedPassage.java 28 Nov 2004 21:36:46 -0000 1.13
--- SynchronizedPassage.java 6 Mar 2005 20:21:47 -0000 1.14
***************
*** 34,38 ****
final class SynchronizedPassage implements Passage
{
! /**
* Construct a SynchronizedPassage from a real Passage to which we proxy.
* @param ref The real Passage
--- 34,38 ----
final class SynchronizedPassage implements Passage
{
! /**
* Construct a SynchronizedPassage from a real Passage to which we proxy.
* @param ref The real Passage
Index: RocketPassage.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/RocketPassage.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** RocketPassage.java 28 Nov 2004 21:36:46 -0000 1.9
--- RocketPassage.java 6 Mar 2005 20:21:47 -0000 1.10
***************
*** 33,37 ****
public class RocketPassage extends BitwisePassage
{
! /**
* Create a new RocketPassage
*/
--- 33,37 ----
public class RocketPassage extends BitwisePassage
{
! /**
* Create a new RocketPassage
*/
Index: NoSuchKeyException.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/NoSuchKeyException.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** NoSuchKeyException.java 28 Nov 2004 21:36:46 -0000 1.4
--- NoSuchKeyException.java 6 Mar 2005 20:21:47 -0000 1.5
***************
*** 30,34 ****
public class NoSuchKeyException extends LucidException
{
! /**
* Construct the Exception with a message
* @param msg The resource id to read
--- 30,34 ----
public class NoSuchKeyException extends LucidException
{
! /**
* Construct the Exception with a message
* @param msg The resource id to read
Index: PassageEvent.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/PassageEvent.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PassageEvent.java 28 Nov 2004 21:36:46 -0000 1.8
--- PassageEvent.java 6 Mar 2005 20:21:47 -0000 1.9
***************
*** 31,35 ****
public class PassageEvent extends EventObject
{
! /**
* Constructs a PassageEvent object.
* @param source the source Object (typically <code>this</code>)
--- 31,35 ----
public class PassageEvent extends EventObject
{
! /**
* Constructs a PassageEvent object.
* @param source the source Object (typically <code>this</code>)
Index: BibleInfo.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/BibleInfo.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** BibleInfo.java 28 Feb 2005 02:21:40 -0000 1.26
--- BibleInfo.java 6 Mar 2005 20:21:47 -0000 1.27
***************
*** 17,21 ****
* static only classes. However they are both non-trivial, so together they would
* be large, and there is a good dividing line between the 2.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 17,21 ----
* static only classes. However they are both non-trivial, so together they would
* be large, and there is a good dividing line between the 2.
! *
* <p><table border='1' cellPadding='3' cellSpacing='0'>
* <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 79,83 ****
for (int i = 0; i < BibleInfo.BOOKS_IN_BIBLE; i++)
{
! Integer bookNum = new Integer(i+1);
String fullBook = getString(resources, FULL_KEY + (i + 1));
fullBooks[i] = fullBook;
--- 79,83 ----
for (int i = 0; i < BibleInfo.BOOKS_IN_BIBLE; i++)
{
! Integer bookNum = new Integer(i + 1);
String fullBook = getString(resources, FULL_KEY + (i + 1));
fullBooks[i] = fullBook;
***************
*** 93,97 ****
String altBook = getString(resources, ALT_KEY + (i + 1));
! String altBooks[] = StringUtil.split(altBook.toLowerCase(), ',');
altBooksLower[i] = altBooks;
--- 93,97 ----
String altBook = getString(resources, ALT_KEY + (i + 1));
! String [] altBooks = StringUtil.split(altBook.toLowerCase(), ',');
altBooksLower[i] = altBooks;
***************
*** 116,120 ****
{
osisBooks[i] = getString(resources, OSIS_KEY + (i + 1));
! osisMap.put(osisBooks[i], new Integer(i+1));
}
}
--- 116,120 ----
{
osisBooks[i] = getString(resources, OSIS_KEY + (i + 1));
! osisMap.put(osisBooks[i], new Integer(i + 1));
}
}
***************
*** 285,289 ****
return -1;
}
!
// Favor OSIS names.
Integer bookNum = (Integer) osisMap.get(find);
--- 285,289 ----
return -1;
}
!
// Favor OSIS names.
Integer bookNum = (Integer) osisMap.get(find);
***************
*** 343,347 ****
public static final boolean isBookName(String find)
{
! return (getBookNumber(find) != -1);
}
--- 343,347 ----
public static final boolean isBookName(String find)
{
! return getBookNumber(find) != -1;
}
***************
*** 1011,1015 ****
/** Standard shortened names for the book of the Bible, in lower case, generated at run time */
private static String[] shortBooksLower;
!
/** Standard shortened names for the book of the Bible, in lower case, generated at runtime. */
private static Map shortBooksMap;
--- 1011,1015 ----
/** Standard shortened names for the book of the Bible, in lower case, generated at run time */
private static String[] shortBooksLower;
!
/** Standard shortened names for the book of the Bible, in lower case, generated at runtime. */
private static Map shortBooksMap;
Index: NoSuchVerseException.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/passage/NoSuchVerseException.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** NoSuchVerseException.java 28 Nov 2004 21:36:46 -0000 1.9
--- NoSuchVerseException.java 6 Mar 2005 20:21:47 -0000 1.10
***************
*** 29,33 ****
public class NoSuchVerseException extends NoSuchKeyException
{
! /**
* Construct the Exception with a message
* @param msg The resource id to read
--- 29,33 ----
public class NoSuchVerseException extends NoSuchKeyException
{
! /**
* Construct the Exception with a message
* @param msg The resource id to read
More information about the jsword-svn
mailing list