[jsword-svn] r1161 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop common/src/main/java/org/crosswire/common/util common-swing/src/main/java/org/crosswire/common/config/swing common-swing/src/main/java/org/crosswire/common/swing/desktop jsword/src/main/java/org/crosswire/jsword/book jsword/src/main/java/org/crosswire/jsword/book/basic jsword/src/main/java/org/crosswire/jsword/book/sword jsword/src/main/java/org/crosswire/jsword/passage jsword/src/main/java/org/crosswire/jsword/versification jsword-limbo/src/main/java/org/crosswire/jsword/book/jdbc
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Sun Oct 15 15:38:13 MST 2006
Author: dmsmith
Date: 2006-10-15 15:37:25 -0700 (Sun, 15 Oct 2006)
New Revision: 1161
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksComboBoxModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksListModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DictionaryPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitesPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/ColorField.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/PathField.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/StringArrayField.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java
trunk/common/src/main/java/org/crosswire/common/util/LucidRuntimeException.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/jdbc/JDBCBook.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/Book.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/BookMetaData.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/BookSet.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/AbstractBook.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/AbstractBookMetaData.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/AbstractBackend.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/IndexKey.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookDriver.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookPath.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/Passage.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/SectionNames.java
Log:
Cleanup of javadoc
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -372,7 +372,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksComboBoxModel.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksComboBoxModel.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -147,7 +147,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksListModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksListModel.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksListModel.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -200,7 +200,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DictionaryPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DictionaryPane.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DictionaryPane.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -378,7 +378,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -728,7 +728,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -392,7 +392,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitePane.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -527,7 +527,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitesPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitesPane.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SitesPane.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -190,7 +190,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SwordSiteEditor.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -180,7 +180,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -991,7 +991,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Splash.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -163,7 +163,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/common/src/main/java/org/crosswire/common/util/LucidRuntimeException.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/LucidRuntimeException.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/common/src/main/java/org/crosswire/common/util/LucidRuntimeException.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -76,7 +76,7 @@
* All LucidRuntimeException are constructed with references to resources in
* an i18n properties file. This version allows us to add parameters
* @param msg The resource id to read
- * @param params An array of parameters
+ * @param newParams An array of parameters
*/
public LucidRuntimeException(MsgBase msg, Throwable cause, Object[] newParams)
{
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/ColorField.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/ColorField.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/ColorField.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -106,7 +106,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/PathField.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/PathField.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/PathField.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -192,7 +192,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/StringArrayField.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/StringArrayField.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/StringArrayField.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -196,7 +196,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/WizardConfigEditor.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -275,7 +275,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/ToolBar.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -212,7 +212,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/Book.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/Book.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/Book.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -226,6 +226,18 @@
Map getProperties();
/**
+ * @param key the key of the property.
+ * @return the value of the property
+ */
+ String getProperty(String key);
+
+ /**
+ * @param key the key of the property.
+ * @param value the value of the property
+ */
+ void putProperty(String key, String value);
+
+ /**
* Has anyone generated a search index for this Book?
* @see org.crosswire.jsword.index.IndexManager
*/
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/BookMetaData.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/BookMetaData.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/BookMetaData.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -198,6 +198,18 @@
Map getProperties();
/**
+ * @param key the key of the property.
+ * @return the value of the property
+ */
+ String getProperty(String key);
+
+ /**
+ * @param key the key of the property to set
+ * @param value the value of the property
+ */
+ void putProperty(String key, String value);
+
+ /**
* Has anyone generated a search index for this Book?
* @see org.crosswire.jsword.index.IndexManager
*/
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/BookSet.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/BookSet.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/BookSet.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -86,8 +86,8 @@
while (iter.hasNext())
{
Book book = (Book) iter.next();
- Object property = book.getProperties().get(key);
- String propertyValue = property == null ? Msg.BOOK_METADATA_SET_OTHER.toString() : property.toString();
+ String property = book.getProperty(key);
+ String propertyValue = property == null ? Msg.BOOK_METADATA_SET_OTHER.toString() : property;
results.add(propertyValue);
}
return results;
@@ -196,7 +196,8 @@
public boolean test(Object obj)
{
Book book = (Book) obj;
- return book.getProperties().get(key) == value;
+ String property = book.getProperty(key);
+ return property != null && property.equals(value);
}
private String key;
private String value;
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/AbstractBook.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/AbstractBook.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/AbstractBook.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -208,6 +208,22 @@
}
/* (non-Javadoc)
+ * @see org.crosswire.jsword.book.Book#getProperty(java.lang.String)
+ */
+ public String getProperty(String key)
+ {
+ return bmd.getProperty(key);
+ }
+
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.Book#putProperty(java.lang.String, java.lang.String)
+ */
+ public void putProperty(String key, String value)
+ {
+ bmd.putProperty(key, value);
+ }
+
+ /* (non-Javadoc)
* @see org.crosswire.jsword.book.BookMetaData#getType()
*/
public BookCategory getBookCategory()
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/AbstractBookMetaData.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/AbstractBookMetaData.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/AbstractBookMetaData.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -23,6 +23,7 @@
import java.net.MalformedURLException;
import java.net.URL;
+import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
@@ -164,7 +165,7 @@
*/
public String getLanguage()
{
- return (String) getProperty(KEY_LANGUAGE);
+ return getProperty(KEY_LANGUAGE);
}
/* (non-Javadoc)
@@ -175,7 +176,7 @@
URL url = null;
try
{
- String loc = (String) getProperty(KEY_LIBRARY_URL);
+ String loc = getProperty(KEY_LIBRARY_URL);
if (loc != null)
{
url = new URL(loc);
@@ -196,7 +197,7 @@
URL url = null;
try
{
- String loc = (String) getProperty(KEY_LOCATION_URL);
+ String loc = getProperty(KEY_LOCATION_URL);
if (loc != null)
{
url = new URL(loc);
@@ -214,7 +215,7 @@
*/
public Map getProperties()
{
- return prop;
+ return Collections.unmodifiableMap(prop);
}
/**
@@ -225,20 +226,18 @@
prop = newProperties;
}
- /**
- * @param key
- * @return the object found by the key
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.BookMetaData#getProperty(java.lang.String)
*/
- protected Object getProperty(String key)
+ public String getProperty(String key)
{
- return prop.get(key);
+ return (String) prop.get(key);
}
- /**
- * @param key
- * @param value
+ /* (non-Javadoc)
+ * @see org.crosswire.jsword.book.BookMetaData#putProperty(java.lang.String, java.lang.String)
*/
- protected void putProperty(String key, String value)
+ public void putProperty(String key, String value)
{
prop.put(key, value);
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/AbstractBackend.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/AbstractBackend.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/AbstractBackend.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -42,7 +42,6 @@
/**
* Construct a minimal backend
* @param sbmd
- * @param location
*/
public AbstractBackend(SwordBookMetaData sbmd)
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/IndexKey.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/IndexKey.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/IndexKey.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -102,4 +102,4 @@
*/
private static final long serialVersionUID = -2472601787934480762L;
-}
\ No newline at end of file
+}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookDriver.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookDriver.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookDriver.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -203,7 +203,6 @@
* A helper class for the SwordInstaller to tell us that it has copied a
* new Book into our install directory
* @param sbmd The SwordBookMetaData object for the new Book
- * @param bookpath The path that we have installed to
* @throws BookException
*/
public static void registerNewBook(SwordBookMetaData sbmd) throws BookException
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookPath.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookPath.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookPath.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -237,6 +237,8 @@
/**
* Check to see if the given directory is a Sword mods.d directory
* and then add it to the list if it is.
+ * @param bookDirs The list to add good paths
+ * @param path the path to check
*/
private static void testDefaultPath(List bookDirs, File path)
{
@@ -255,7 +257,8 @@
/**
* Check to see if the given directory is a Sword mods.d directory
* and then add it to the list if it is.
- * @param readonly
+ * @param bookDirs The list to add good paths
+ * @param path the path to check
*/
private static void testDefaultPath(List bookDirs, String path)
{
@@ -367,7 +370,7 @@
}
/**
- * @param downloadDir The download directory to set.
+ * @param dlDir The download directory to set.
*/
public static void setDownloadDir(File dlDir)
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -1305,7 +1305,7 @@
/**
* Serialization support.
*
- * @param in
+ * @param is
* @throws IOException
* @throws ClassNotFoundException
*/
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/Passage.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/Passage.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/Passage.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -62,7 +62,7 @@
* </ul>
*
* <p>The upshot of all this is that I am removing the Collections interface from
- * Passage, but writing a PassageSet as a proxy.
+ * Passage.
*
* <p>I considered giving Passages names to allow for a CLI that could
* use named RangedPassages, however that is perhaps better left to another class.
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -54,7 +54,6 @@
* This is only used by config.
* @param bookCase The new case to use for reporting book names
* @exception IllegalArgumentException If the case is not between 0 and 2
- * @see Passage
* @see #getCase()
*/
public static void setCase(int bookCase)
@@ -65,8 +64,7 @@
/**
* This is only used by config
* @return The current case setting
- * @see Passage
- * @see BibleInfo#setCase(CaseType)
+ * @see #setCase(CaseType)
*/
public static int getCase()
{
@@ -81,7 +79,6 @@
* BibleInfo.MIXED is not allowed
* @param newBookCase The new case to use for reporting book names
* @exception IllegalArgumentException If the case is not between 0 and 2
- * @see Passage
* @see #getCase()
*/
public static void setCase(CaseType newBookCase)
@@ -92,7 +89,7 @@
/**
* This is only used by config
* @return Whether the name is long or short. Default is Full (true).
- * @see BibleInfo#setFullBookName(boolean)
+ * @see #setFullBookName(boolean)
*/
public static boolean isFullBookName()
{
@@ -112,8 +109,7 @@
/**
* How do we report the names of the books?.
* @return The current case setting
- * @see Passage
- * @see BibleInfo#setCase(int)
+ * @see #setCase(int)
*/
public static CaseType getDefaultCase()
{
@@ -555,7 +551,7 @@
* How many books are there in each of the above sections
* @param section The section
* @return The number of books in the given section
- * @see #getSection(int)
+ * @see SectionNames#getSection(int)
*/
public static int booksInSection(int section)
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/SectionNames.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/SectionNames.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/SectionNames.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -30,7 +30,7 @@
import org.crosswire.jsword.passage.NoSuchVerseException;
/**
- * SectionNames is a class that deals with sections of the Bible.
+ * SectionNames deals with traditional sections of the Bible.
*
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
@@ -40,7 +40,7 @@
public final class SectionNames
{
/**
- * Ensure that we can not be instantiated
+ * Create a SectionNames object
*/
public SectionNames()
{
@@ -131,7 +131,6 @@
* What section is this book a part of?
* @param book The book to test
* @return True The section
- * @see SectionNames.Section
*/
public static int getSection(int book)
{
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/jdbc/JDBCBook.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/jdbc/JDBCBook.java 2006-10-14 15:34:33 UTC (rev 1160)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/jdbc/JDBCBook.java 2006-10-15 22:37:25 UTC (rev 1161)
@@ -30,7 +30,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
-import java.util.Map;
import java.util.NoSuchElementException;
import java.util.Properties;
@@ -64,14 +63,12 @@
setBookMetaData(new DefaultBookMetaData(driver, this, prop));
- Map props = getProperties();
-
// Load the specified JDBC name
int driver_attempt = 1;
while (true)
{
String property = "JdbcDriver" + driver_attempt; //$NON-NLS-1$
- String drivername = (String) props.get(property);
+ String drivername = getProperty(property);
try
{
@@ -89,26 +86,26 @@
try
{
// Actually connect to the database
- String text_url = (String) props.get("TextURL"); //$NON-NLS-1$
+ String text_url = getProperty("TextURL"); //$NON-NLS-1$
textCon = DriverManager.getConnection(text_url);
- String concord_url = (String) props.get("ConcordURL"); //$NON-NLS-1$
+ String concord_url = getProperty("ConcordURL"); //$NON-NLS-1$
concCon = DriverManager.getConnection(concord_url);
// SQL statements
- String doc_query = (String) props.get("DocQuery"); //$NON-NLS-1$
+ String doc_query = getProperty("DocQuery"); //$NON-NLS-1$
docStmt = textCon.prepareStatement(doc_query);
- String ref_query = (String) props.get("RefQuery"); //$NON-NLS-1$
+ String ref_query = getProperty("RefQuery"); //$NON-NLS-1$
refStmt = concCon.prepareStatement(ref_query);
- //String verse_query = (String) props.get("VerseQuery");
+ //String verse_query = getProperty("VerseQuery");
//verse_stmt = textcnx.prepareStatement(verse_query);
- String start_query = (String) props.get("StartQuery"); //$NON-NLS-1$
+ String start_query = getProperty("StartQuery"); //$NON-NLS-1$
startStmt = concCon.prepareStatement(start_query);
- wordsQuery = (String) props.get("WordsQuery"); //$NON-NLS-1$
+ wordsQuery = getProperty("WordsQuery"); //$NON-NLS-1$
}
catch (SQLException ex)
{
More information about the jsword-svn
mailing list