[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/sword s
jswordcvs at crosswire.org
jswordcvs at crosswire.org
Tue Jan 25 17:57:35 MST 2005
Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword
In directory www.crosswire.org:/tmp/cvs-serv4948/java/jsword/org/crosswire/jsword/book/sword
Modified Files:
ModuleType.java
Log Message:
Fixed a couple of bugs.
Index: ModuleType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/ModuleType.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ModuleType.java 24 Jan 2005 23:29:45 -0000 1.11
--- ModuleType.java 26 Jan 2005 00:57:33 -0000 1.12
***************
*** 38,42 ****
* Uncompressed Bibles
*/
! public static final ModuleType RAW_TEXT = new ModuleType("RawText", "texts/rawtext", BookType.BIBLE) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
--- 38,42 ----
* Uncompressed Bibles
*/
! public static final ModuleType RAW_TEXT = new ModuleType("RawText", BookType.BIBLE) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
***************
*** 53,57 ****
* Serialization ID
*/
! private static final long serialVersionUID = 3257004341402874419L;
};
--- 53,57 ----
* Serialization ID
*/
! private static final long serialVersionUID = 3544385920414529336L;
};
***************
*** 59,63 ****
* Compressed Bibles
*/
! public static final ModuleType Z_TEXT = new ModuleType("zText", "texts/ztext", BookType.BIBLE) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
--- 59,63 ----
* Compressed Bibles
*/
! public static final ModuleType Z_TEXT = new ModuleType("zText", BookType.BIBLE) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
***************
*** 79,83 ****
* Serialization ID
*/
! private static final long serialVersionUID = 3258697597915772985L;
};
--- 79,83 ----
* Serialization ID
*/
! private static final long serialVersionUID = 3257846571620906039L;
};
***************
*** 85,89 ****
* Uncompressed Commentaries
*/
! public static final ModuleType RAW_COM = new ModuleType("RawCom", "comments/rawcom", BookType.COMMENTARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
--- 85,89 ----
* Uncompressed Commentaries
*/
! public static final ModuleType RAW_COM = new ModuleType("RawCom", BookType.COMMENTARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
***************
*** 100,104 ****
* Serialization ID
*/
! private static final long serialVersionUID = 3762250850940433716L;
};
--- 100,104 ----
* Serialization ID
*/
! private static final long serialVersionUID = 3258129141898294837L;
};
***************
*** 106,110 ****
* Compressed Commentaries
*/
! public static final ModuleType Z_COM = new ModuleType("zCom", "comments/zcom", BookType.COMMENTARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
--- 106,110 ----
* Compressed Commentaries
*/
! public static final ModuleType Z_COM = new ModuleType("zCom", BookType.COMMENTARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
***************
*** 126,130 ****
* Serialization ID
*/
! private static final long serialVersionUID = 3257008752367580211L;
};
--- 126,130 ----
* Serialization ID
*/
! private static final long serialVersionUID = 3257569516166002487L;
};
***************
*** 132,136 ****
* Uncompresses HREF Commentaries
*/
! public static final ModuleType HREF_COM = new ModuleType("HREFCom", "comments/hrefcom", BookType.COMMENTARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
--- 132,136 ----
* Uncompresses HREF Commentaries
*/
! public static final ModuleType HREF_COM = new ModuleType("HREFCom", BookType.COMMENTARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
***************
*** 147,151 ****
* Serialization ID
*/
! private static final long serialVersionUID = 3257567291372548153L;
};
--- 147,151 ----
* Serialization ID
*/
! private static final long serialVersionUID = 3256439209706338354L;
};
***************
*** 153,157 ****
* Uncompressed Commentaries
*/
! public static final ModuleType RAW_FILES = new ModuleType("RawFiles", "comments/rawfiles", BookType.COMMENTARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
--- 153,157 ----
* Uncompressed Commentaries
*/
! public static final ModuleType RAW_FILES = new ModuleType("RawFiles", BookType.COMMENTARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
***************
*** 168,172 ****
* Serialization ID
*/
! private static final long serialVersionUID = 3257005475290625843L;
};
--- 168,172 ----
* Serialization ID
*/
! private static final long serialVersionUID = 3256446901875325236L;
};
***************
*** 174,178 ****
* 2-Byte Index Uncompressed Dictionaries
*/
! public static final ModuleType RAW_LD = new ModuleType("RawLD", "lexdict/rawld", BookType.DICTIONARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
--- 174,178 ----
* 2-Byte Index Uncompressed Dictionaries
*/
! public static final ModuleType RAW_LD = new ModuleType("RawLD", BookType.DICTIONARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
***************
*** 189,193 ****
* Serialization ID
*/
! private static final long serialVersionUID = 3258412833061352242L;
};
--- 189,193 ----
* Serialization ID
*/
! private static final long serialVersionUID = 3257290240195442745L;
};
***************
*** 195,199 ****
* 4-Byte Index Uncompressed Dictionaries
*/
! public static final ModuleType RAW_LD4 = new ModuleType("RawLD4", "lexdict/rawld4", BookType.DICTIONARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
--- 195,199 ----
* 4-Byte Index Uncompressed Dictionaries
*/
! public static final ModuleType RAW_LD4 = new ModuleType("RawLD4", BookType.DICTIONARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
***************
*** 210,214 ****
* Serialization ID
*/
! private static final long serialVersionUID = 3258689892711149625L;
};
--- 210,214 ----
* Serialization ID
*/
! private static final long serialVersionUID = 3689067356945331762L;
};
***************
*** 216,220 ****
* Compressed Dictionaries
*/
! public static final ModuleType Z_LD = new ModuleType("zLD", "lexdict/zld", BookType.DICTIONARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
--- 216,220 ----
* Compressed Dictionaries
*/
! public static final ModuleType Z_LD = new ModuleType("zLD", BookType.DICTIONARY) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
***************
*** 231,235 ****
* Serialization ID
*/
! private static final long serialVersionUID = 3257849883074573619L;
};
--- 231,235 ----
* Serialization ID
*/
! private static final long serialVersionUID = 3691037673259414067L;
};
***************
*** 237,241 ****
* Generic Books
*/
! public static final ModuleType RAW_GEN_BOOK = new ModuleType("RawGenBook", "genbook/rawgenbook", null) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
--- 237,241 ----
* Generic Books
*/
! public static final ModuleType RAW_GEN_BOOK = new ModuleType("RawGenBook", null) //$NON-NLS-1$ //$NON-NLS-2$
{
protected Book getBook(SwordBookMetaData sbmd, Backend backend)
***************
*** 252,256 ****
* Serialization ID
*/
! private static final long serialVersionUID = 3257849895976449588L;
};
--- 252,256 ----
* Serialization ID
*/
! private static final long serialVersionUID = 3257290218703892528L;
};
***************
*** 258,265 ****
* Simple ctor
*/
! public ModuleType(String name, String install, BookType type)
{
this.name = name;
- this.install = install;
this.type = type;
}
--- 258,264 ----
* Simple ctor
*/
! public ModuleType(String name, BookType type)
{
this.name = name;
this.type = type;
}
***************
*** 285,297 ****
/**
- * Strings for where the modules are installed.
- * @return Returns the install directory for this module type.
- */
- public String getInstallDirectory()
- {
- return install;
- }
-
- /**
* The book type of this module
*/
--- 284,287 ----
***************
*** 378,387 ****
/**
- * Where are modules of this type installed relative to the sword module
- * directory?
- */
- private String install;
-
- /**
* What booktype is this module
*/
--- 368,371 ----
***************
*** 432,436 ****
// Support for serialization
- static final long serialVersionUID = 1417463751329673026L;
private static int nextObj;
private final int obj = nextObj++;
--- 416,419 ----
More information about the jsword-svn
mailing list