[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book 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/book
In directory www.crosswire.org:/tmp/cvs-serv26524/java/jsword/org/crosswire/jsword/book
Modified Files:
StudyTool.java BooksEvent.java BookException.java
DataPolice.java BookData.java BookMetaData.java Defaults.java
BookMetaDataSet.java
Log Message:
Changes to satisfy CheckStyle
Index: StudyTool.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/StudyTool.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StudyTool.java 13 Feb 2005 20:03:02 -0000 1.11
--- StudyTool.java 6 Mar 2005 20:21:47 -0000 1.12
***************
*** 76,85 ****
try
{
! trans = new Translation(word, strongs, bible.getKey(null));
! }
catch (NoSuchKeyException ex)
{
log.warn("Failed to create key", ex); //$NON-NLS-1$
! }
reply.put(strongs, trans);
--- 76,85 ----
try
{
! trans = new Translation(word, strongs, bible.getKey(null));
! }
catch (NoSuchKeyException ex)
{
log.warn("Failed to create key", ex); //$NON-NLS-1$
! }
reply.put(strongs, trans);
Index: BookMetaDataSet.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/BookMetaDataSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BookMetaDataSet.java 25 Jan 2005 00:02:32 -0000 1.1
--- BookMetaDataSet.java 6 Mar 2005 20:21:47 -0000 1.2
***************
*** 94,98 ****
return (BookMetaDataSet) filter(new GroupFilter(key, value));
}
!
private static final class GroupFilter implements Filter
{
--- 94,101 ----
return (BookMetaDataSet) filter(new GroupFilter(key, value));
}
!
! /**
! * GroupFilter does the SQL traditional group by.
! */
private static final class GroupFilter implements Filter
{
Index: BookData.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/BookData.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** BookData.java 13 Feb 2005 20:03:02 -0000 1.9
--- BookData.java 6 Mar 2005 20:21:47 -0000 1.10
***************
*** 80,84 ****
List divs = osisText.getChildren(OSISUtil.OSIS_ELEMENT_DIV);
! for (Iterator oit = divs.iterator(); oit.hasNext();)
{
Element div = (Element) oit.next();
--- 80,84 ----
List divs = osisText.getChildren(OSISUtil.OSIS_ELEMENT_DIV);
! for (Iterator oit = divs.iterator(); oit.hasNext(); )
{
Element div = (Element) oit.next();
Index: BookMetaData.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/BookMetaData.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** BookMetaData.java 28 Feb 2005 02:21:40 -0000 1.23
--- BookMetaData.java 6 Mar 2005 20:21:47 -0000 1.24
***************
*** 127,131 ****
*/
public Map getProperties();
!
/**
* Has anyone generated a search index for this Book?
--- 127,131 ----
*/
public Map getProperties();
!
/**
* Has anyone generated a search index for this Book?
Index: Defaults.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/Defaults.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** Defaults.java 28 Feb 2005 02:21:40 -0000 1.25
--- Defaults.java 6 Mar 2005 20:21:47 -0000 1.26
***************
*** 43,66 ****
/**
- * The log stream
- */
- private static final Logger log = Logger.getLogger(Defaults.class);
-
- /**
- * The default Bible
- */
- private static BookMetaData bdeft = null;
-
- /**
- * The default Commentary
- */
- private static BookMetaData cdeft = null;
-
- /**
- * The default Dictionary
- */
- private static BookMetaData ddeft = null;
-
- /**
* Set the default Bible. The new name must be equal() to a string
* returned from getBibleNames. (if does not need to be == however)
--- 43,46 ----
***************
*** 330,335 ****
/**
! * Should this Book become the default?
! * Only if there is not one.
*/
protected static void checkPreferable(BookMetaData bmd)
--- 310,315 ----
/**
! * Determine whether this Book become the default.
! * It should, only if there is not one.
*/
protected static void checkPreferable(BookMetaData bmd)
***************
*** 398,400 ****
--- 378,400 ----
}
}
+ /**
+ * The log stream
+ */
+ private static final Logger log = Logger.getLogger(Defaults.class);
+
+ /**
+ * The default Bible
+ */
+ private static BookMetaData bdeft;
+
+ /**
+ * The default Commentary
+ */
+ private static BookMetaData cdeft;
+
+ /**
+ * The default Dictionary
+ */
+ private static BookMetaData ddeft;
+
}
Index: BookException.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/BookException.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** BookException.java 28 Nov 2004 21:36:46 -0000 1.8
--- BookException.java 6 Mar 2005 20:21:47 -0000 1.9
***************
*** 30,34 ****
public class BookException extends LucidException
{
! /**
* Construct the Exception with a message
* @param msg The resource id to read
--- 30,34 ----
public class BookException extends LucidException
{
! /**
* Construct the Exception with a message
* @param msg The resource id to read
Index: BooksEvent.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/BooksEvent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BooksEvent.java 28 Nov 2004 21:36:46 -0000 1.5
--- BooksEvent.java 6 Mar 2005 20:21:47 -0000 1.6
***************
*** 30,34 ****
public class BooksEvent extends EventObject
{
! /**
* Basic constructor
* @param bmd The meta-data of the changed Bible, or null if there is more than one change.
--- 30,34 ----
public class BooksEvent extends EventObject
{
! /**
* Basic constructor
* @param bmd The meta-data of the changed Bible, or null if there is more than one change.
Index: DataPolice.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/DataPolice.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DataPolice.java 6 Mar 2005 18:13:28 -0000 1.8
--- DataPolice.java 6 Mar 2005 20:21:47 -0000 1.9
***************
*** 82,91 ****
* the last known verse
*/
! private static Key key = null;
/**
* The last known Book
*/
! private static BookMetaData bmd = null;
/**
--- 82,91 ----
* the last known verse
*/
! private static Key key;
/**
* The last known Book
*/
! private static BookMetaData bmd;
/**
More information about the jsword-svn
mailing list