[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book/sword 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/book/sword
In directory www.crosswire.org:/tmp/cvs-serv23836/java/jsword/org/crosswire/jsword/book/sword
Modified Files:
SwordUtil.java SwordBookDriver.java SwordDictionary.java
SwordBook.java RawBackend.java ModuleType.java
ConfigEntryTable.java ConfigEntry.java CompressionType.java
LZSSBackend.java Msg.java GZIPBackend.java ZLDBackend.java
BlockType.java SwordConstants.java ConfigEntryType.java
RawLDBackend.java AbstractBackend.java SwordBookMetaData.java
Log Message:
Added support for CheckStyle plugin.
Added a few more CheckStyle rules.
Fixed a spelling mistake.
Index: SwordBookMetaData.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/SwordBookMetaData.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** SwordBookMetaData.java 10 May 2005 02:39:21 -0000 1.43
--- SwordBookMetaData.java 17 May 2005 00:43:15 -0000 1.44
***************
*** 48,52 ****
* <p> \ is used as a continuation line.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Mark Goodwin [mark at thorubio dot org]
--- 48,52 ----
* <p> \ is used as a continuation line.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Mark Goodwin [mark at thorubio dot org]
Index: RawBackend.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/RawBackend.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** RawBackend.java 10 May 2005 02:39:21 -0000 1.26
--- RawBackend.java 17 May 2005 00:43:15 -0000 1.27
***************
*** 40,44 ****
* abstracts out the similarities.
*
! * @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]
--- 40,44 ----
* abstracts out the similarities.
*
! * @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: Msg.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/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]
*/
! class Msg extends MsgBase
{
static final Msg NO_KEY = new Msg("SwordDictionary.NoKey"); //$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]
*/
! final class Msg extends MsgBase
{
static final Msg NO_KEY = new Msg("SwordDictionary.NoKey"); //$NON-NLS-1$
Index: AbstractBackend.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/AbstractBackend.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** AbstractBackend.java 10 May 2005 02:39:21 -0000 1.3
--- AbstractBackend.java 17 May 2005 00:43:15 -0000 1.4
***************
*** 32,36 ****
* A generic way to read data from disk for later formatting.
*
! * @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 generic way to read data from disk for later formatting.
*
! * @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: SwordDictionary.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/SwordDictionary.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** SwordDictionary.java 10 May 2005 02:39:21 -0000 1.43
--- SwordDictionary.java 17 May 2005 00:43:15 -0000 1.44
***************
*** 45,49 ****
* A Sword version of Dictionary.
*
! * @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 ----
* A Sword version of Dictionary.
*
! * @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]
***************
*** 224,229 ****
// TODO(DM): Hack alert!!! This is not in the right place!!!
! private Key getStrongsKey(String text)
{
// Is the string all digits?
Matcher m = STRONGS_PATTERN.matcher(text);
--- 224,230 ----
// TODO(DM): Hack alert!!! This is not in the right place!!!
! private Key getStrongsKey(String txt)
{
+ String text = txt;
// Is the string all digits?
Matcher m = STRONGS_PATTERN.matcher(text);
***************
*** 266,270 ****
* Helper method so we can quickly activate ourselves on access
*/
! private final void checkActive()
{
if (!active)
--- 267,271 ----
* Helper method so we can quickly activate ourselves on access
*/
! private void checkActive()
{
if (!active)
Index: CompressionType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/CompressionType.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** CompressionType.java 10 May 2005 02:39:21 -0000 1.9
--- CompressionType.java 17 May 2005 00:43:15 -0000 1.10
***************
*** 30,34 ****
* Data about Compression types.
*
! * @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 ----
* Data about Compression types.
*
! * @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]
***************
*** 163,167 ****
{
COMPRESSION_ZIP,
! COMPRESSION_LZSS
};
}
--- 163,167 ----
{
COMPRESSION_ZIP,
! COMPRESSION_LZSS,
};
}
Index: ConfigEntryTable.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/ConfigEntryTable.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ConfigEntryTable.java 10 May 2005 02:39:21 -0000 1.7
--- ConfigEntryTable.java 17 May 2005 00:43:15 -0000 1.8
***************
*** 49,53 ****
* <p> \ is used as a continuation line.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Mark Goodwin [mark at thorubio dot org]
--- 49,53 ----
* <p> \ is used as a continuation line.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Mark Goodwin [mark at thorubio dot org]
***************
*** 419,423 ****
if (!langFrom.equals(lang) && !langTo.equals(lang))
{
! log.error("Data error in " + internal + ". Neither " + ConfigEntryType.GLOSSARY_FROM.getName() + " or " + ConfigEntryType.GLOSSARY_FROM.getName() + " match " + ConfigEntryType.LANG.getName()); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
}
--- 419,426 ----
if (!langFrom.equals(lang) && !langTo.equals(lang))
{
! log.error("Data error in " + internal + //$NON-NLS-1$
! ". Neither " + ConfigEntryType.GLOSSARY_FROM.getName() + //$NON-NLS-1$
! " or " + ConfigEntryType.GLOSSARY_FROM.getName() + //$NON-NLS-1$
! " match " + ConfigEntryType.LANG.getName()); //$NON-NLS-1$
}
Index: SwordConstants.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/SwordConstants.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** SwordConstants.java 10 May 2005 02:39:21 -0000 1.32
--- SwordConstants.java 17 May 2005 00:43:15 -0000 1.33
***************
*** 28,32 ****
* A Constants to help the SwordBookDriver to read Sword format data.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
* @author Mark Goodwin [mark at thorubio dot org]
--- 28,32 ----
* A Constants to help the SwordBookDriver to read Sword format data.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
* @author Mark Goodwin [mark at thorubio dot org]
***************
*** 34,38 ****
* @author The Sword project (don't know who - no credits in original files (canon.h))
*/
! public class SwordConstants
{
/**
--- 34,38 ----
* @author The Sword project (don't know who - no credits in original files (canon.h))
*/
! public final class SwordConstants
{
/**
***************
*** 188,192 ****
648, 680, 693, 702, 769, 822, 828,
877, 890, 905, 909, 919, 921, 926,
! 934, 938, 942, 946, 949, 964
};
--- 188,192 ----
648, 680, 693, 702, 769, 822, 828,
877, 890, 905, 909, 919, 921, 926,
! 934, 938, 942, 946, 949, 964,
};
***************
*** 197,201 ****
195, 201, 205, 212, 217, 221, 223,
237, 243, 249, 253, 259, 261, 263,
! 265
};
--- 197,201 ----
195, 201, 205, 212, 217, 221, 223,
237, 243, 249, 253, 259, 261, 263,
! 265,
};
***************
*** 343,347 ****
23852, 23866, 23877, 23892, 23904, 23920, 23935,
23959, 23977, 23990, 24008, 24023, 24033, 24055,
! 24056, 24071, 24089, 24108
};
--- 343,347 ----
23852, 23866, 23877, 23892, 23904, 23920, 23935,
23959, 23977, 23990, 24008, 24023, 24033, 24055,
! 24056, 24071, 24089, 24108,
};
***************
*** 389,393 ****
7939, 7957, 7971, 7993, 8005, 8025, 8043,
8062, 8083, 8092, 8114, 8133, 8158, 8180,
! 8196, 8224
};
--- 389,393 ----
7939, 7957, 7971, 7993, 8005, 8025, 8043,
8062, 8083, 8092, 8114, 8133, 8158, 8180,
! 8196, 8224,
};
Index: ConfigEntryType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/ConfigEntryType.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ConfigEntryType.java 10 May 2005 02:39:21 -0000 1.7
--- ConfigEntryType.java 17 May 2005 00:43:15 -0000 1.8
***************
*** 76,80 ****
* </pre>
*
! * @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]
--- 76,80 ----
* </pre>
*
! * @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]
***************
*** 191,195 ****
"BOOK", //$NON-NLS-1$
"CHAPTER", //$NON-NLS-1$
! "VERSE" //$NON-NLS-1$
}));
--- 191,195 ----
"BOOK", //$NON-NLS-1$
"CHAPTER", //$NON-NLS-1$
! "VERSE", //$NON-NLS-1$
}));
***************
*** 490,494 ****
DIRECTION_LTOR,
DIRECTION_RTOL,
! DIRECTION_BIDI
}));
--- 490,494 ----
DIRECTION_LTOR,
DIRECTION_RTOL,
! DIRECTION_BIDI,
}));
***************
*** 563,567 ****
"Copyrighted; Free non-commercial distribution", //$NON-NLS-1$
"Copyrighted; Permission to distribute granted to CrossWire", //$NON-NLS-1$
! "Copyrighted" //$NON-NLS-1$
}));
--- 563,567 ----
"Copyrighted; Free non-commercial distribution", //$NON-NLS-1$
"Copyrighted; Permission to distribute granted to CrossWire", //$NON-NLS-1$
! "Copyrighted", //$NON-NLS-1$
}));
***************
*** 646,650 ****
{
"Latin-1", //$NON-NLS-1$
! "UTF-8" //$NON-NLS-1$
}));
--- 646,650 ----
{
"Latin-1", //$NON-NLS-1$
! "UTF-8", //$NON-NLS-1$
}));
***************
*** 779,783 ****
return false;
}
! }
/**
--- 779,783 ----
return false;
}
! }
/**
***************
*** 905,909 ****
"RawLD4", //$NON-NLS-1$
"zLD", //$NON-NLS-1$
! "RawGenBook" //$NON-NLS-1$
}));
--- 905,909 ----
"RawLD4", //$NON-NLS-1$
"zLD", //$NON-NLS-1$
! "RawGenBook", //$NON-NLS-1$
}));
***************
*** 1012,1021 ****
*/
private final String[] choiceArray = new String[]
! {
! "Plaintext", //$NON-NLS-1$
! "GBF", //$NON-NLS-1$
! "ThML", //$NON-NLS-1$
! "OSIS", //$NON-NLS-1$
! };
/**
* The set of choices.
--- 1012,1021 ----
*/
private final String[] choiceArray = new String[]
! {
! "Plaintext", //$NON-NLS-1$
! "GBF", //$NON-NLS-1$
! "ThML", //$NON-NLS-1$
! "OSIS", //$NON-NLS-1$
! };
/**
* The set of choices.
***************
*** 1444,1492 ****
private static final ConfigEntryType[] VALUES =
{
! ABOUT,
! BLOCK_COUNT,
! BLOCK_TYPE,
! CATEGORY,
! CIPHER_KEY,
! COMPRESS_TYPE,
! COPYRIGHT,
! COPYRIGHT_CONTACT_ADDRESS,
! COPYRIGHT_CONTACT_EMAIL,
! COPYRIGHT_CONTACT_NAME,
! COPYRIGHT_DATE,
! COPYRIGHT_HOLDER,
! COPYRIGHT_NOTES,
! DATA_PATH,
! DESCRIPTION,
! DIRECTION,
! DISPLAY_LEVEL,
! DISTRIBUTION_LICENSE,
! DISTRIBUTION_NOTES,
! DISTRIBUTION_SOURCE,
! ENCODING,
! GLOBAL_OPTION_FILTER,
! GLOSSARY_FROM,
! GLOSSARY_TO,
! HISTORY,
! INSTALL_SIZE,
! FEATURE,
! FONT,
! LANG,
! LCSH,
! MOD_DRV,
! MINIMUM_VERSION,
! OBSOLETES,
! SOURCE_TYPE,
! SWORD_VERSION_DATE,
! TEXT_SOURCE,
! VERSION,
! OSIS_Q_TO_TICK,
! INITIALS,
! KEY,
! LANGUAGE,
! LANGUAGE_FROM,
! LANGUAGE_TO,
! SHORT_PROMO,
! SHORT_COPYRIGHT,
};
}
--- 1444,1492 ----
private static final ConfigEntryType[] VALUES =
{
! ABOUT,
! BLOCK_COUNT,
! BLOCK_TYPE,
! CATEGORY,
! CIPHER_KEY,
! COMPRESS_TYPE,
! COPYRIGHT,
! COPYRIGHT_CONTACT_ADDRESS,
! COPYRIGHT_CONTACT_EMAIL,
! COPYRIGHT_CONTACT_NAME,
! COPYRIGHT_DATE,
! COPYRIGHT_HOLDER,
! COPYRIGHT_NOTES,
! DATA_PATH,
! DESCRIPTION,
! DIRECTION,
! DISPLAY_LEVEL,
! DISTRIBUTION_LICENSE,
! DISTRIBUTION_NOTES,
! DISTRIBUTION_SOURCE,
! ENCODING,
! GLOBAL_OPTION_FILTER,
! GLOSSARY_FROM,
! GLOSSARY_TO,
! HISTORY,
! INSTALL_SIZE,
! FEATURE,
! FONT,
! LANG,
! LCSH,
! MOD_DRV,
! MINIMUM_VERSION,
! OBSOLETES,
! SOURCE_TYPE,
! SWORD_VERSION_DATE,
! TEXT_SOURCE,
! VERSION,
! OSIS_Q_TO_TICK,
! INITIALS,
! KEY,
! LANGUAGE,
! LANGUAGE_FROM,
! LANGUAGE_TO,
! SHORT_PROMO,
! SHORT_COPYRIGHT,
};
}
Index: SwordBookDriver.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/SwordBookDriver.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** SwordBookDriver.java 10 May 2005 02:39:21 -0000 1.42
--- SwordBookDriver.java 17 May 2005 00:43:15 -0000 1.43
***************
*** 46,50 ****
* This represents all of the SwordBibles.
*
! * @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]
--- 46,50 ----
* This represents all of the SwordBibles.
*
! * @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]
***************
*** 236,244 ****
/**
* Accessor for the Sword directory
! * @param newDirs The new Sword directory
* @throws BookException
*/
! public static void setSwordPath(File[] newDirs) throws BookException
{
newDirs = validateSwordPath(newDirs);
if (newDirs == null)
--- 236,245 ----
/**
* Accessor for the Sword directory
! * @param theNewDirs The new Sword directory
* @throws BookException
*/
! public static void setSwordPath(File[] theNewDirs) throws BookException
{
+ File[] newDirs = theNewDirs;
newDirs = validateSwordPath(newDirs);
if (newDirs == null)
***************
*** 257,265 ****
* location is first in the list. If null or an empty array
* is passed then the defaultList is used.
! * @param files
* @return null if the list is not to be used, otherwise it returns the list.
*/
! private static File[] validateSwordPath(File[] files)
{
// Get the current download file location
File downloadDir = SwordBookDriver.dirs[0];
--- 258,267 ----
* location is first in the list. If null or an empty array
* is passed then the defaultList is used.
! * @param theFiles
* @return null if the list is not to be used, otherwise it returns the list.
*/
! private static File[] validateSwordPath(File[] theFiles)
{
+ File[] files = theFiles;
// Get the current download file location
File downloadDir = SwordBookDriver.dirs[0];
Index: ConfigEntry.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/ConfigEntry.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ConfigEntry.java 10 May 2005 02:39:21 -0000 1.15
--- ConfigEntry.java 17 May 2005 00:43:15 -0000 1.16
***************
*** 36,42 ****
* A ConfigEntry holds the value(s) for an entry of ConfigEntryType.
*
! * @see gnu.gpl.Licence for license details.
* The copyright to this program is held by it's authors.
! * @see gnu.gpl.Licence
* @author DM Smith [ dmsmith555 at hotmail dot com]
*/
--- 36,42 ----
* A ConfigEntry holds the value(s) for an entry of ConfigEntryType.
*
! * @see gnu.gpl.License for license details.
* The copyright to this program is held by it's authors.
! * @see gnu.gpl.License
* @author DM Smith [ dmsmith555 at hotmail dot com]
*/
***************
*** 208,213 ****
* Add a value to the list of values for this ConfigEntry
*/
! public void addValue(String aValue)
{
String confEntryName = getName();
// Filter known types of entries
--- 208,214 ----
* Add a value to the list of values for this ConfigEntry
*/
! public void addValue(String val)
{
+ String aValue = val;
String confEntryName = getName();
// Filter known types of entries
Index: ZLDBackend.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/ZLDBackend.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ZLDBackend.java 10 May 2005 02:39:21 -0000 1.11
--- ZLDBackend.java 17 May 2005 00:43:15 -0000 1.12
***************
*** 33,37 ****
* LATER(joe): implement ZLDBackend
*
! * @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 ----
* LATER(joe): implement ZLDBackend
*
! * @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: SwordBook.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/SwordBook.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** SwordBook.java 10 May 2005 02:39:21 -0000 1.19
--- SwordBook.java 17 May 2005 00:43:15 -0000 1.20
***************
*** 38,42 ****
* SwordBook is a base class for all sword type modules.
*
! * @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 ----
* SwordBook is a base class for all sword type modules.
*
! * @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: RawLDBackend.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/RawLDBackend.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** RawLDBackend.java 10 May 2005 02:39:21 -0000 1.20
--- RawLDBackend.java 17 May 2005 00:43:15 -0000 1.21
***************
*** 41,45 ****
* An implementation KeyBackend to read RAW format files.
*
! * @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]
--- 41,45 ----
* An implementation KeyBackend to read RAW format files.
*
! * @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: ModuleType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/ModuleType.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ModuleType.java 10 May 2005 02:39:21 -0000 1.19
--- ModuleType.java 17 May 2005 00:43:15 -0000 1.20
***************
*** 32,36 ****
* Data about module types.
*
! * @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 ----
* Data about module types.
*
! * @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: BlockType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/BlockType.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BlockType.java 10 May 2005 02:39:21 -0000 1.5
--- BlockType.java 17 May 2005 00:43:15 -0000 1.6
***************
*** 27,31 ****
* Data about Block types.
*
! * @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 ----
* Data about Block types.
*
! * @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]
***************
*** 167,171 ****
BLOCK_BOOK,
BLOCK_CHAPTER,
! BLOCK_VERSE
};
}
--- 167,171 ----
BLOCK_BOOK,
BLOCK_CHAPTER,
! BLOCK_VERSE,
};
}
Index: GZIPBackend.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/GZIPBackend.java,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** GZIPBackend.java 10 May 2005 02:39:21 -0000 1.34
--- GZIPBackend.java 17 May 2005 00:43:15 -0000 1.35
***************
*** 88,92 ****
* At this time it is ignored.
*
! * @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]
--- 88,92 ----
* At this time it is ignored.
*
! * @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: SwordUtil.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/SwordUtil.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** SwordUtil.java 10 May 2005 02:39:21 -0000 1.21
--- SwordUtil.java 17 May 2005 00:43:15 -0000 1.22
***************
*** 36,44 ****
* Various utilities used by different Sword classes.
*
! * @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 SwordUtil
{
/**
--- 36,44 ----
* Various utilities used by different Sword classes.
*
! * @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 SwordUtil
{
/**
***************
*** 53,61 ****
* @param raf The file to read
* @param offset The record to read
! * @param size The number of bytes to read
* @return the read data
*/
! protected static byte[] readRAF(RandomAccessFile raf, int offset, int size) throws IOException
{
if (offset + size > raf.length())
{
--- 53,62 ----
* @param raf The file to read
* @param offset The record to read
! * @param theSize The number of bytes to read
* @return the read data
*/
! protected static byte[] readRAF(RandomAccessFile raf, int offset, int theSize) throws IOException
{
+ int size = theSize;
if (offset + size > raf.length())
{
Index: LZSSBackend.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/LZSSBackend.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** LZSSBackend.java 10 May 2005 02:39:21 -0000 1.15
--- LZSSBackend.java 17 May 2005 00:43:15 -0000 1.16
***************
*** 31,35 ****
* A backend to read LZSS compressed data files.
*
! * @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 ----
* A backend to read LZSS compressed data files.
*
! * @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