[jsword-svn] r1462 - in trunk/common/src/main/java: gnu/gpl gnu/lgpl org/crosswire/common/activate org/crosswire/common/compress org/crosswire/common/config org/crosswire/common/diff org/crosswire/common/history org/crosswire/common/progress org/crosswire/common/util org/crosswire/common/xml
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Sun Jul 1 19:32:24 MST 2007
Author: dmsmith
Date: 2007-07-01 19:32:23 -0700 (Sun, 01 Jul 2007)
New Revision: 1462
Modified:
trunk/common/src/main/java/gnu/gpl/License.java
trunk/common/src/main/java/gnu/gpl/Msg.java
trunk/common/src/main/java/gnu/lgpl/License.java
trunk/common/src/main/java/gnu/lgpl/Msg.java
trunk/common/src/main/java/org/crosswire/common/activate/Activatable.java
trunk/common/src/main/java/org/crosswire/common/activate/Activator.java
trunk/common/src/main/java/org/crosswire/common/activate/Msg.java
trunk/common/src/main/java/org/crosswire/common/compress/AbstractCompressor.java
trunk/common/src/main/java/org/crosswire/common/compress/Compressor.java
trunk/common/src/main/java/org/crosswire/common/compress/CompressorType.java
trunk/common/src/main/java/org/crosswire/common/compress/LZSS.java
trunk/common/src/main/java/org/crosswire/common/compress/Zip.java
trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java
trunk/common/src/main/java/org/crosswire/common/config/BooleanChoice.java
trunk/common/src/main/java/org/crosswire/common/config/Choice.java
trunk/common/src/main/java/org/crosswire/common/config/ClassChoice.java
trunk/common/src/main/java/org/crosswire/common/config/Config.java
trunk/common/src/main/java/org/crosswire/common/config/ConfigEvent.java
trunk/common/src/main/java/org/crosswire/common/config/ConfigException.java
trunk/common/src/main/java/org/crosswire/common/config/ConfigListener.java
trunk/common/src/main/java/org/crosswire/common/config/DirectoryChoice.java
trunk/common/src/main/java/org/crosswire/common/config/FileChoice.java
trunk/common/src/main/java/org/crosswire/common/config/FontChoice.java
trunk/common/src/main/java/org/crosswire/common/config/IntOptionsChoice.java
trunk/common/src/main/java/org/crosswire/common/config/Msg.java
trunk/common/src/main/java/org/crosswire/common/config/MultipleChoice.java
trunk/common/src/main/java/org/crosswire/common/config/NumberChoice.java
trunk/common/src/main/java/org/crosswire/common/config/PathChoice.java
trunk/common/src/main/java/org/crosswire/common/config/StartupException.java
trunk/common/src/main/java/org/crosswire/common/config/StringArrayChoice.java
trunk/common/src/main/java/org/crosswire/common/config/StringChoice.java
trunk/common/src/main/java/org/crosswire/common/config/StringOptionsChoice.java
trunk/common/src/main/java/org/crosswire/common/diff/Bitap.java
trunk/common/src/main/java/org/crosswire/common/diff/CommonMiddle.java
trunk/common/src/main/java/org/crosswire/common/diff/Commonality.java
trunk/common/src/main/java/org/crosswire/common/diff/Diff.java
trunk/common/src/main/java/org/crosswire/common/diff/DiffCleanup.java
trunk/common/src/main/java/org/crosswire/common/diff/Difference.java
trunk/common/src/main/java/org/crosswire/common/diff/DifferenceEngine.java
trunk/common/src/main/java/org/crosswire/common/diff/Distance.java
trunk/common/src/main/java/org/crosswire/common/diff/EditType.java
trunk/common/src/main/java/org/crosswire/common/diff/LineMap.java
trunk/common/src/main/java/org/crosswire/common/diff/Locator.java
trunk/common/src/main/java/org/crosswire/common/diff/Match.java
trunk/common/src/main/java/org/crosswire/common/diff/Patch.java
trunk/common/src/main/java/org/crosswire/common/diff/PatchEntry.java
trunk/common/src/main/java/org/crosswire/common/history/History.java
trunk/common/src/main/java/org/crosswire/common/history/HistoryEvent.java
trunk/common/src/main/java/org/crosswire/common/history/HistoryListener.java
trunk/common/src/main/java/org/crosswire/common/progress/JobManager.java
trunk/common/src/main/java/org/crosswire/common/progress/Msg.java
trunk/common/src/main/java/org/crosswire/common/progress/Progress.java
trunk/common/src/main/java/org/crosswire/common/progress/WorkEvent.java
trunk/common/src/main/java/org/crosswire/common/progress/WorkListener.java
trunk/common/src/main/java/org/crosswire/common/util/CollectionUtil.java
trunk/common/src/main/java/org/crosswire/common/util/EmptyIterator.java
trunk/common/src/main/java/org/crosswire/common/util/EventListenerList.java
trunk/common/src/main/java/org/crosswire/common/util/FileUtil.java
trunk/common/src/main/java/org/crosswire/common/util/Filter.java
trunk/common/src/main/java/org/crosswire/common/util/Histogram.java
trunk/common/src/main/java/org/crosswire/common/util/Iterable.java
trunk/common/src/main/java/org/crosswire/common/util/Languages.java
trunk/common/src/main/java/org/crosswire/common/util/LogConfig.java
trunk/common/src/main/java/org/crosswire/common/util/Logger.java
trunk/common/src/main/java/org/crosswire/common/util/Msg.java
trunk/common/src/main/java/org/crosswire/common/util/NetUtil.java
trunk/common/src/main/java/org/crosswire/common/util/OSType.java
trunk/common/src/main/java/org/crosswire/common/util/ReflectionUtil.java
trunk/common/src/main/java/org/crosswire/common/util/ReporterEvent.java
trunk/common/src/main/java/org/crosswire/common/util/ReporterListener.java
trunk/common/src/main/java/org/crosswire/common/util/TimeGate.java
trunk/common/src/main/java/org/crosswire/common/util/URIFilter.java
trunk/common/src/main/java/org/crosswire/common/util/WebResource.java
trunk/common/src/main/java/org/crosswire/common/xml/Converter.java
trunk/common/src/main/java/org/crosswire/common/xml/FormatType.java
trunk/common/src/main/java/org/crosswire/common/xml/HTMLSerializingContentHandler.java
trunk/common/src/main/java/org/crosswire/common/xml/JDOMSAXEventProvider.java
trunk/common/src/main/java/org/crosswire/common/xml/PrettySerializingContentHandler.java
trunk/common/src/main/java/org/crosswire/common/xml/RedLetterText.java
trunk/common/src/main/java/org/crosswire/common/xml/SAXEventProvider.java
trunk/common/src/main/java/org/crosswire/common/xml/SAXEventProviderInputSource.java
trunk/common/src/main/java/org/crosswire/common/xml/StringSAXEventProvider.java
trunk/common/src/main/java/org/crosswire/common/xml/TransformingSAXEventProvider.java
trunk/common/src/main/java/org/crosswire/common/xml/TransformingSAXEventProviderConverter.java
trunk/common/src/main/java/org/crosswire/common/xml/XMLFeature.java
trunk/common/src/main/java/org/crosswire/common/xml/XMLFeatureSet.java
trunk/common/src/main/java/org/crosswire/common/xml/XMLHandlerAdapter.java
trunk/common/src/main/java/org/crosswire/common/xml/XMLProcess.java
trunk/common/src/main/java/org/crosswire/common/xml/XMLUtil.java
trunk/common/src/main/java/org/crosswire/common/xml/XalanProcess.java
Log:
Ran Eclipse's cleanup.
Modified: trunk/common/src/main/java/gnu/gpl/License.java
===================================================================
--- trunk/common/src/main/java/gnu/gpl/License.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/gnu/gpl/License.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -384,7 +384,7 @@
/**
* Get the Warranty.
- *
+ *
* @return the warranty for this program
*/
public String getWarranty()
@@ -394,7 +394,7 @@
/**
* Get the license distribution terms.
- *
+ *
* @return the details of this program's distribution license
*/
public String getDetails()
Modified: trunk/common/src/main/java/gnu/gpl/Msg.java
===================================================================
--- trunk/common/src/main/java/gnu/gpl/Msg.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/gnu/gpl/Msg.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* Compile safe Msg resource settings.
- *
+ *
* @see gnu.gpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/gnu/lgpl/License.java
===================================================================
--- trunk/common/src/main/java/gnu/lgpl/License.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/gnu/lgpl/License.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -82,7 +82,7 @@
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -138,7 +138,7 @@
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
-
+
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -173,7 +173,7 @@
on the Library (independent of the use of the Library in a tool for
writing it). Whether that is true depends on what the Library does
and what the program that uses the Library does.
-
+
1. You may copy and distribute verbatim copies of the Library's
complete source code as you receive it, in any medium, provided that
you conspicuously and appropriately publish on each copy an
@@ -185,7 +185,7 @@
You may charge a fee for the physical act of transferring a copy,
and you may at your option offer warranty protection in exchange for a
fee.
-
+
2. You may modify your copy or copies of the Library or any portion
of it, thus forming a work based on the Library, and copy and
distribute such modifications or work under the terms of Section 1
@@ -243,7 +243,7 @@
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -294,7 +294,7 @@
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -356,7 +356,7 @@
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -397,7 +397,7 @@
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -449,7 +449,7 @@
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -483,7 +483,7 @@
DAMAGES.
END OF TERMS AND CONDITIONS
-
+
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
@@ -546,7 +546,7 @@
/**
* Get the Warranty.
- *
+ *
* @return the warranty for this program
*/
public String getWarranty()
@@ -556,7 +556,7 @@
/**
* Get the license distribution terms.
- *
+ *
* @return the details of this program's distribution license
*/
public String getDetails()
Modified: trunk/common/src/main/java/gnu/lgpl/Msg.java
===================================================================
--- trunk/common/src/main/java/gnu/lgpl/Msg.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/gnu/lgpl/Msg.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* Compile safe Msg resource settings.
- *
+ *
* @see gnu.gpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/activate/Activatable.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/activate/Activatable.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/activate/Activatable.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
* A class can be Activatable if it needs a significant amount of memory on an
* irregular basis, and so would benefit from being told when to wake-up and
* when to conserver memory.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/activate/Activator.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/activate/Activator.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/activate/Activator.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -27,11 +27,11 @@
/**
* Manager for instances of Activatable.
- *
+ *
* Activator should be used to manage all activate()ions and deactivate()ions
* so that it can keep a track of exactly what is active and what can be
* deactivate()d is save memory.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/activate/Msg.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/activate/Msg.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/activate/Msg.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* Compile safe Msg resource settings.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/compress/AbstractCompressor.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/compress/AbstractCompressor.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/compress/AbstractCompressor.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* A compressor provides the ability to compress and uncompress text.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/compress/Compressor.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/compress/Compressor.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/compress/Compressor.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -28,7 +28,7 @@
/**
* A compressor provides the ability to compress and uncompress block text.
* Implementing classes are expected to provide a way to supply the input.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -42,21 +42,21 @@
/**
* Compresses the input and provides the result.
- *
+ *
* @return the compressed result
*/
ByteArrayOutputStream compress() throws IOException;
/**
* Uncompresses the input and provides the result.
- *
+ *
* @return the uncompressed result
*/
ByteArrayOutputStream uncompress() throws IOException;
/**
* Uncompresses the input and provides the result.
- *
+ *
* @param expectedLength the size of the result buffer
* @return the uncompressed result
*/
Modified: trunk/common/src/main/java/org/crosswire/common/compress/CompressorType.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/compress/CompressorType.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/compress/CompressorType.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* An Enumeration of the possible Edits.
- *
+ *
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/compress/LZSS.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/compress/LZSS.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/compress/LZSS.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -30,55 +30,55 @@
/**
* The LZSS compression is a port of code as implemented for STEP.
* The following information gives the history of this implementation.
- *
+ *
* <p>Compression Info, 10-11-95<br/>
* Jeff Wheeler</p>
- *
+ *
* <h2><u>Source of Algorithm</u></h2>
- *
- * <p>The compression algorithms used here are based upon the algorithms developed and published by Haruhiko Okumura in a paper entitled "Data Compression Algorithms of LARC and LHarc." This paper discusses three compression algorithms, LSZZ, LZARI, and LZHUF. LZSS is described as the "first" of these, and is described as providing moderate compression with good speed. LZARI is described as an improved LZSS, a combination of the LZSS algorithm with adaptive arithmetic compression. It is described as being slower than LZSS but with better compression. LZHUF (the basis of the common LHA compression program) was included in the paper, however, a free usage license was not included.</p>
- *
+ *
+ * <p>The compression algorithms used here are based upon the algorithms developed and published by Haruhiko Okumura in a paper entitled "Data Compression Algorithms of LARC and LHarc." This paper discusses three compression algorithms, LSZZ, LZARI, and LZHUF. LZSS is described as the "first" of these, and is described as providing moderate compression with good speed. LZARI is described as an improved LZSS, a combination of the LZSS algorithm with adaptive arithmetic compression. It is described as being slower than LZSS but with better compression. LZHUF (the basis of the common LHA compression program) was included in the paper, however, a free usage license was not included.</p>
+ *
* <p>The following are copies of the statements included at the beginning of each source code listing that was supplied in the working paper.</p>
- *
+ *
* <blockquote>LZSS, dated 4/6/89, marked as "Use, distribute and
* modify this program freely."</blockquote>
- *
+ *
* <blockquote>LZARI, dated 4/7/89, marked as "Use, distribute and
* modify this program freely."</blockquote>
- *
+ *
* <blockquote>LZHUF, dated 11/20/88, written by Haruyasu Yoshizaki,
* translated by Haruhiko Okumura on 4/7/89. Not
* expressly marked as redistributable or modifiable.</blockquote>
- *
+ *
* <p>Since both LZSS and LZARI are marked as "use, distribute and modify freely" we have felt at liberty basing our compression algorithm on either of these.</p>
- *
+ *
* <h2><u>Selection of Algorithm</u></h2>
- *
+ *
* <p>Working samples of three possible compression algorithms are supplied in Okumura's paper. Which should be used?</p>
- *
+ *
* <p>LZSS is the fastest at decompression, but does not generated as small a compressed file as the other methods. The other two methods provided, perhaps, a 15% improvement in compression. Or, put another way, on a 100K file, LZSS might compress it to 50K while the others might approach 40-45K. For STEP purposes, it was decided that decoding speed was of more importance than tighter compression. For these reasons, the first compression algorithm implemented is the LZSS algorithm.</p>
- *
+ *
* <h2><u>About LZSS Encoding</u></h2>
- *
+ *
* <p>(adapted from Haruhiko Okumura's paper)</p>
- *
+ *
* <p>This scheme was proposed by Ziv and Lempel [1]. A slightly modified version is described by Storer and Szymanski [2]. An implementation using a binary tree has been proposed by Bell [3].</p>
- *
+ *
* The algorithm is quite simple.<br/>
* <ol>
* <li>Keep a ring buffer which initially contains all space characters.</li>
* <li>Read several letters from the file to the buffer.</li>
* <li>Search the buffer for the longest string that matches the letters just read, and send its length and position into the buffer.</li>
* </ol>
- *
+ *
* <p>If the ring buffer is 4096 bytes, the position can be stored in 12 bits. If the length is represented in 4 bits, the <position, length> pair is two bytes long. If the longest match is no more than two characters, then just one character is sent without encoding. The process starts again with the next character. An extra bit is sent each time to tell the decoder whether the next item is a character of a <position, length> pair.</p>
- *
+ *
* <p>
* [1] J. Ziv and A. Lempel, IEEE Transactions IT-23, 337-343 (1977).<br/>
* [2] J. A. Storer and T. G. Szymanski, J. ACM, 29, 928-951 (1982).<br/>
* [3] T.C. Gell, IEEE Transactions COM-34, 1176-1182 (1986).
* </p>
- *
+ *
* Regarding this port to Java and not the original code, the following license
* applies:
*
@@ -90,7 +90,7 @@
{
/**
* Create an LZSS that is capable of transforming the input.
- *
+ *
* @param input to compress or uncompress.
*/
public LZSS(InputStream input)
@@ -124,7 +124,7 @@
// that the next unit is a <position,length> pair (2 bytes).
//
// code_buf[1..16] stores eight units of code. Since the best
- // we can do is store eight <position,length> pairs, at most 16
+ // we can do is store eight <position,length> pairs, at most 16
// bytes are needed to store this.
//
// This is why the maximum size of the code buffer is 17 bytes.
@@ -138,7 +138,7 @@
// | |
// | first sequence in code buffer
// |
- // last sequence in code buffer
+ // last sequence in code buffer
mask = 1;
s = 0;
@@ -245,12 +245,12 @@
deleteNode(s);
// Put this character into the ring buffer.
- //
+ //
// The original comment here says "If the position is near
// the end of the buffer, extend the buffer to make
// string comparison easier."
//
- // That's a little misleading, because the "end" of the
+ // That's a little misleading, because the "end" of the
// buffer is really what we consider to be the "beginning"
// of the buffer, that is, positions 0 through MAX_STORE_LENGTH.
//
@@ -280,7 +280,7 @@
s = (short) ((s + 1) & (RING_SIZE - 1));
r = (short) ((r + 1) & (RING_SIZE - 1));
- // Register the string that is found in
+ // Register the string that is found in
// ringBuffer[r..r + MAX_STORE_LENGTH - 1].
insertNode((short) r);
}
@@ -412,7 +412,7 @@
// break;
// if ((j = getc(infile)) == EOF)
// break;
- // i |= ((j & 0xf0) << 4);
+ // i |= ((j & 0xf0) << 4);
// j = (j & 0x0f) + THRESHOLD;
//
// I've modified this to only make one input call, and
@@ -488,15 +488,15 @@
* Inserts a string from the ring buffer into one of the trees.
* It loads the match position and length member variables
* for the longest match.
- *
+ *
* <p>The string to be inserted is identified by the parameter Pos,
* A full MAX_STORE_LENGTH bytes are inserted. So, ringBuffer[Pos ... Pos+MAX_STORE_LENGTH-1]
* are inserted.</p>
- *
+ *
* <p>If the matched length is exactly MAX_STORE_LENGTH, then an old node is removed
* in favor of the new one (because the old one will be deleted
* sooner).</p>
- *
+ *
* @param pos plays a dual role. It is used as both a position
* in the ring buffer and also as a tree node. ringBuffer[Pos]
* defines a character that is used to identify a tree node.
@@ -596,7 +596,7 @@
/**
* Remove a node from the tree.
- *
+ *
* @param node the node to remove
*/
private void deleteNode(short node)
@@ -657,7 +657,7 @@
// /**
// * Fill a buffer with some bytes from the input stream.
-// *
+// *
// * @param ibuf the buffer to fill
// * @param start the position in the buffer to start filling
// * @param len the number of bytes to get
@@ -678,7 +678,7 @@
//
// /**
// * Fill a buffer with some bytes from the input stream.
-// *
+// *
// * @param ibuf the buffer to fill
// * @param len the number of bytes to get
// * @return the number of bytes added to the buffer
@@ -698,7 +698,7 @@
//
// /**
// * Return whether there are more bytes to read.
-// *
+// *
// * @return whether there are more bytes to read.
// */
// private boolean hasMoreToRead()
@@ -708,7 +708,7 @@
//
// /**
// * Get the next byte from the stream.
-// *
+// *
// * @return the the next byte from the stream
// */
// private byte getByte()
@@ -752,8 +752,8 @@
// }
/**
- * This is the size of the ring buffer. It is set to 4K.
- * It is important to note that a position within the ring buffer requires 12 bits.
+ * This is the size of the ring buffer. It is set to 4K.
+ * It is important to note that a position within the ring buffer requires 12 bits.
*/
private static final int RING_SIZE = 4096;
@@ -768,7 +768,7 @@
*/
private static final int MAX_STORE_LENGTH = 18;
- /**
+ /**
* It takes 2 bytes to store an offset and a length.
* If a character sequence only requires 1 or 2 characters to store uncompressed,
* then it is better to store it uncompressed than as an offset into the ring buffer.
@@ -787,7 +787,7 @@
* and a length. When decoding, the compressed text may contain
* a position in the ring buffer and a count of the number of
* bytes from the ring buffer that are to be moved into the
- * uncompressed buffer.
+ * uncompressed buffer.
*
* <p>This ring buffer is not maintained as part of the compressed
* text. Instead, it is reconstructed dynamically. That is,
@@ -813,18 +813,18 @@
* a tree structure. The dad is the parent and it has a right and
* left son (child).
*
- * <p>For i = 0 to RING_SIZE-1, rightSon[i] and leftSon[i] will be the right
+ * <p>For i = 0 to RING_SIZE-1, rightSon[i] and leftSon[i] will be the right
* and left children of node i.</p>
*
* <p>For i = 0 to RING_SIZE-1, dad[i] is the parent of node i.</p>
*
- * <p>For i = 0 to 255, rightSon[RING_SIZE + i + 1] is the root of the tree for
- * strings that begin with the character i. Note that this requires
+ * <p>For i = 0 to 255, rightSon[RING_SIZE + i + 1] is the root of the tree for
+ * strings that begin with the character i. Note that this requires
* one byte characters.</p>
*
* <p>These nodes store values of 0...(RING_SIZE-1). Memory requirements
* can be reduces by using 2-byte integers instead of full 4-byte
- * integers (for 32-bit applications). Therefore, these are
+ * integers (for 32-bit applications). Therefore, these are
* defined as "shorts."</p>
*/
private short[] dad = new short[RING_SIZE + 1];
Modified: trunk/common/src/main/java/org/crosswire/common/compress/Zip.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/compress/Zip.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/compress/Zip.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -36,7 +36,7 @@
* A class can be Activatable if it needs a significant amount of memory on an
* irregular basis, and so would benefit from being told when to wake-up and
* when to conserver memory.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -45,7 +45,7 @@
{
/**
* Create a Zip that is capable of transforming the input.
- *
+ *
* @param input to compress or uncompress.
*/
public Zip(InputStream input)
Modified: trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/AbstractReflectedChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -30,7 +30,7 @@
/**
* A helper for when we need to be a choice created dynamically.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/BooleanChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/BooleanChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/BooleanChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* A class to convert between strings and objects of a type.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/Choice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/Choice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/Choice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -27,14 +27,14 @@
/**
* Choice is the fundamental building block of the config system.
- *
+ *
* Every Choice must be able to:<ul>
* <li>get and set itself using a String</li>
* <li>provide some simple help about itself</li>
* <li>elect a user level for itself (Beginner, Intermediate, Advanced)</li>
* <li>provide a GUI editor for itself</li>
* </ul>
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/ClassChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/ClassChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/ClassChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* A class to convert between strings and objects of a type.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/Config.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/Config.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/Config.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -173,7 +173,7 @@
/**
* Remove a key/model pairing
- *
+ *
* @param key The name to kill
*/
public void remove(String key)
@@ -418,7 +418,7 @@
/**
* Take the data stored permanently and copy it to the local
* storage area, using the configured storage area
- * @throws IOException
+ * @throws IOException
*/
public void permanentToLocal(URI uri) throws IOException
{
Modified: trunk/common/src/main/java/org/crosswire/common/config/ConfigEvent.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/ConfigEvent.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/ConfigEvent.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* An event indicating that an exception has happened.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/ConfigException.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/ConfigException.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/ConfigException.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* Something went wrong while setting config options.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/ConfigListener.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/ConfigListener.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/ConfigListener.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* ConfigListener.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/DirectoryChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/DirectoryChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/DirectoryChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -24,7 +24,7 @@
/**
* A class to convert between strings and objects of a type.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/FileChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/FileChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/FileChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* A class to convert between files and objects of a type.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/FontChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/FontChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/FontChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -23,7 +23,7 @@
/**
* A class to convert between strings and objects of a type.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/IntOptionsChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/IntOptionsChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/IntOptionsChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -31,7 +31,7 @@
/**
* A class to convert between strings and objects of a type.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/Msg.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/Msg.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/Msg.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* Compile safe Msg resource settings.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/MultipleChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/MultipleChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/MultipleChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -24,7 +24,7 @@
/**
* MultipleChoice is simply a Choice where there are a number of alternative
* options.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/NumberChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/NumberChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/NumberChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* A class to convert between strings and objects of a type.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/PathChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/PathChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/PathChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -27,7 +27,7 @@
/**
* A class to convert between strings and objects of a type.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/StartupException.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/StartupException.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/StartupException.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* Something in the startup config files failed to start properly.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/StringArrayChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/StringArrayChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/StringArrayChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -28,7 +28,7 @@
/**
* A class to convert between strings and objects of a type.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/StringChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/StringChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/StringChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -23,7 +23,7 @@
/**
* A type of Choice that converts between strings and objects.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/config/StringOptionsChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/StringOptionsChoice.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/config/StringOptionsChoice.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -27,7 +27,7 @@
/**
* A class to convert between strings and objects of a type.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/diff/Bitap.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/Bitap.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/Bitap.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,10 +26,10 @@
/**
* An implementation of the Bitap algorithm for finding a "fuzzy" location of a match.
- *
+ *
* Based on the LGPL Diff_Match_Patch v1.5 javascript of Neil Fraser, Copyright (C) 2006
* <a href="http://neil.fraser.name/software/diff_match_patch/">http://neil.fraser.name/software/diff_match_patch/</a>
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/diff/CommonMiddle.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/CommonMiddle.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/CommonMiddle.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -23,7 +23,7 @@
/**
* A CommonMiddle represents an overlap between a baseline/source text and a changed/target text.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -32,7 +32,7 @@
{
/**
* A CommonMiddle represents an overlap between a baseline/source text and a changed/target text.
- *
+ *
* @param sourcePrefix The text before the commonality form the source
* @param sourceSuffix The text after the commonality form the source
* @param targetPrefix The text before the commonality form the target
Modified: trunk/common/src/main/java/org/crosswire/common/diff/Commonality.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/Commonality.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/Commonality.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -23,10 +23,10 @@
/**
* A Commonality is shared text at the beginning, middle or end of two strings.
- *
+ *
* Based on the LGPL Diff_Match_Patch v1.5 javascript of Neil Fraser, Copyright (C) 2006
* <a href="http://neil.fraser.name/software/diff_match_patch/">http://neil.fraser.name/software/diff_match_patch/</a>
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/diff/Diff.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/Diff.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/Diff.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -28,10 +28,10 @@
/**
* Computes the difference between two texts to create a list of differences.
- *
+ *
* Based on the LGPL Diff_Match_Patch v1.5 javascript of Neil Fraser, Copyright (C) 2006
* <a href="http://neil.fraser.name/software/diff_match_patch/">http://neil.fraser.name/software/diff_match_patch/</a>
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/diff/DiffCleanup.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/DiffCleanup.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/DiffCleanup.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -27,10 +27,10 @@
/**
* Various Strategies to cleanup a diff list.
- *
+ *
* Based on the LGPL Diff_Match_Patch v1.5 javascript of Neil Fraser, Copyright (C) 2006
* <a href="http://neil.fraser.name/software/diff_match_patch/">http://neil.fraser.name/software/diff_match_patch/</a>
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/diff/Difference.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/Difference.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/Difference.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -22,9 +22,9 @@
package org.crosswire.common.diff;
/**
- *
+ *
* Represents a single difference, consisting of an EditType and associated text.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/diff/DifferenceEngine.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/DifferenceEngine.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/DifferenceEngine.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -30,10 +30,10 @@
/**
* Builds a map of a baseline/source text and a changed/target text, navigating it to determine differences.
- *
+ *
* Based on the LGPL Diff_Match_Patch v1.5 javascript of Neil Fraser, Copyright (C) 2006
* <a href="http://neil.fraser.name/software/diff_match_patch/">http://neil.fraser.name/software/diff_match_patch/</a>
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -361,7 +361,7 @@
/**
* Set the timeout for the diff operation. The default is 1 second. Use 0 for infinity.
- *
+ *
* @param newTimeout
*/
public static void setTimeout(float newTimeout)
Modified: trunk/common/src/main/java/org/crosswire/common/diff/Distance.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/Distance.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/Distance.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -24,7 +24,7 @@
/**
* Compute the distance between 2 strings. The larger the number the greater the distance.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -53,20 +53,20 @@
}
/*
- The difference between this impl. and the previous is that, rather
- than creating and retaining a matrix of size s.length()+1 by t.length()+1,
+ The difference between this impl. and the previous is that, rather
+ than creating and retaining a matrix of size s.length()+1 by t.length()+1,
we maintain two single-dimensional arrays of length s.length()+1. The first, d,
is the 'current working' distance array that maintains the newest distance cost
counts as we iterate through the characters of String s. Each time we increment
the index of String t we are comparing, d is copied to p, the second int[]. Doing so
allows us to retain the previous cost counts as required by the algorithm (taking
the minimum of the cost count to the left, up one, and diagonally up and to the left
- of the current cost count being calculated). (Note that the arrays aren't really
- copied anymore, just switched...this is clearly much better than cloning an array
+ of the current cost count being calculated). (Note that the arrays aren't really
+ copied anymore, just switched...this is clearly much better than cloning an array
or doing a System.arraycopy() each time through the outer loop.)
- Effectively, the difference between the two implementations is this one does not
- cause an out of memory condition when calculating the LD over two very large strings.
+ Effectively, the difference between the two implementations is this one does not
+ cause an out of memory condition when calculating the LD over two very large strings.
*/
int sourceLength = source.length(); // length of source
@@ -116,7 +116,7 @@
dist = swap;
}
- // our last action in the above loop was to switch d and p, so p now
+ // our last action in the above loop was to switch d and p, so p now
// actually has the most recent cost counts
return prevDist[sourceLength];
}
Modified: trunk/common/src/main/java/org/crosswire/common/diff/EditType.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/EditType.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/EditType.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* An Enumeration of the possible Edits.
- *
+ *
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/diff/LineMap.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/LineMap.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/LineMap.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -29,7 +29,7 @@
/**
* LineMap is a heuristic algorithm that allows the differencing of a representation of lines.
* A Diff of the source and target maps can be reconstituted with restore.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -39,7 +39,7 @@
/**
* Split two texts into a list of strings. Reduce the texts to a string of
* hashes where each Unicode character represents one line. The result
- * is that text1 is encoded into
+ * is that text1 is encoded into
* @param source Baseline string
* @param target Changed string
*/
Modified: trunk/common/src/main/java/org/crosswire/common/diff/Locator.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/Locator.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/Locator.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -23,7 +23,7 @@
/**
* Represents the location of the best match.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -32,14 +32,14 @@
{
/**
* Locate the best match of a pattern in text near a supplied location.
- *
+ *
* @return Best match index or -1, if no match found
*/
int locate();
/**
* The maximum length a pattern can be.
- *
+ *
* @return maximum pattern length.
*/
int maxPatternLength();
Modified: trunk/common/src/main/java/org/crosswire/common/diff/Match.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/Match.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/Match.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
* Applies the patch onto another text, allowing for errors.
* Based on the LGPL Diff_Match_Patch v1.5 javascript of Neil Fraser, Copyright (C) 2006
* <a href="http://neil.fraser.name/software/diff_match_patch/">http://neil.fraser.name/software/diff_match_patch/</a>
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/diff/Patch.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/Patch.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/Patch.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -29,10 +29,10 @@
/**
* Marshals a patch to a list of Differences, Differences to a patch and applies a list of differences to text to patch it.
- *
+ *
* Based on the LGPL Diff_Match_Patch v1.5 javascript of Neil Fraser, Copyright (C) 2006
* <a href="http://neil.fraser.name/software/diff_match_patch/">http://neil.fraser.name/software/diff_match_patch/</a>
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/diff/PatchEntry.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/diff/PatchEntry.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/diff/PatchEntry.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -30,10 +30,10 @@
/**
* A PatchEntry is a single "instruction" in a Patch, consisting of a interval over which differences
* are applied and the differences that should be applied.
- *
+ *
* Based on the LGPL Diff_Match_Patch v1.5 javascript of Neil Fraser, Copyright (C) 2006
* <a href="http://neil.fraser.name/software/diff_match_patch/">http://neil.fraser.name/software/diff_match_patch/</a>
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/history/History.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/history/History.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/history/History.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -55,7 +55,7 @@
/**
* Make a particular element in the navigation list the current
* item in history.
- *
+ *
* @param index the index of item to make the last one in the back list,
* -1 (or lower) will put everything in the forward list.
* Indexes beyond the end of the list will put everything
@@ -91,7 +91,7 @@
* Add an element to history. If the element is in the forward list,
* then it replaces everything in the forward list upto it.
* Otherwise, it replaces the forward list.
- *
+ *
* @param obj the object to add
*/
public void add(Object obj)
Modified: trunk/common/src/main/java/org/crosswire/common/history/HistoryEvent.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/history/HistoryEvent.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/history/HistoryEvent.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* An Event in History.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/history/HistoryListener.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/history/HistoryListener.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/history/HistoryListener.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* A listener of HistoryEvents.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/progress/JobManager.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/progress/JobManager.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/progress/JobManager.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -33,7 +33,7 @@
/**
* JobManager is responsible for creating jobs and informing listeners about
* the progress they make to completion.
- *
+ *
* <p>Example code:
* <pre>
* final Thread worker = new Thread("DisplayPreLoader")
@@ -42,7 +42,7 @@
* {
* URL predictURI = Project.instance().getWritablePropertiesURI("save-name");
* Progress job = JobManager.createJob("Job Title", predictURI, this, true);
- *
+ *
* try
* {
* job.setProgress("Step 1");
@@ -61,11 +61,11 @@
* }
* }
* };
- *
+ *
* worker.setPriority(Thread.MIN_PRIORITY);
* worker.start();
* </pre>
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/progress/Msg.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/progress/Msg.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/progress/Msg.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* Compile safe Msg resource settings.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/progress/Progress.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/progress/Progress.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/progress/Progress.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -60,7 +60,7 @@
/**
* We have moved onto another section so update the section title.
- *
+ *
* @param name the name of the section
*/
void setSectionName(String name);
@@ -72,7 +72,7 @@
/**
* Indicate progress toward the whole.
- *
+ *
* @param progress a part of the whole.
*/
void setWork(int progress);
@@ -85,7 +85,7 @@
/**
* Cancel the job (if possible). If isCancelable() is false, then the job
* will be canceled if cancelable becomes true. There is no guarantee that
- *
+ *
*/
void cancel();
@@ -101,7 +101,7 @@
/**
* Indicates whether the job is cancelable or not.
- *
+ *
* @param newCancelable The state to set.
*/
void setCancelable(boolean newCancelable);
Modified: trunk/common/src/main/java/org/crosswire/common/progress/WorkEvent.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/progress/WorkEvent.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/progress/WorkEvent.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* A WorkEvent happens whenever a MutableBook makes some progress
* in generating a new Bible.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/progress/WorkListener.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/progress/WorkListener.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/progress/WorkListener.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* Implement WorkListener and call MutableBook.addProgressListener()
* to recieve ProgressEvents when ever we make progress.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/CollectionUtil.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/CollectionUtil.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/CollectionUtil.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -35,7 +35,7 @@
/**
* Some utils to help work with Collections.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/EmptyIterator.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/EmptyIterator.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/EmptyIterator.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -28,8 +28,8 @@
/**
* An <code>EmptyIterator</code> is an <code>Iterator</code> that iterates
* over nothing.
- *
- *
+ *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/EventListenerList.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/EventListenerList.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/EventListenerList.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -33,7 +33,7 @@
* This code is lifted from javax.sw*ng.event.EventListnerList. It is
* very useful in non GUI code which does not need the rest of sw*ng.
* BORROWED: From javax.sw*ng.event.EventListnerList
- *
+ *
* <p>It differs in that it is fully synchronized, thus thread safe.
*
* <p>If you inculde sw*ng code in non-gui code then you can end up not being
@@ -117,7 +117,7 @@
/**
* This passes back the event listener list as an array
* of ListenerType - listener pairs.
- *
+ *
* This method is guaranteed to pass back a non-null
* array, so that no null-checking is required in
* fire methods. A zero-length array of Object should
@@ -132,11 +132,11 @@
}
/**
- * Return an array of all the listeners of the given type.
- * @return all of the listeners of the specified type.
+ * Return an array of all the listeners of the given type.
+ * @return all of the listeners of the specified type.
* @exception ClassCastException if the supplied class
* is not assignable to EventListener
- *
+ *
* @since 1.3
*/
public EventListener[] getListeners(Class t)
@@ -164,7 +164,7 @@
}
/**
- * Returns the total number of listeners of the supplied type
+ * Returns the total number of listeners of the supplied type
* for this listener list.
*/
public int getListenerCount(Class t)
Modified: trunk/common/src/main/java/org/crosswire/common/util/FileUtil.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/FileUtil.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/FileUtil.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -27,7 +27,7 @@
/**
* .
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/Filter.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Filter.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/Filter.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -24,8 +24,8 @@
/**
* A method of filtering Objects.
- *
- *
+ *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/Histogram.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Histogram.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/Histogram.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -28,7 +28,7 @@
/**
* A simple implementation of a histogram. It would be nice to enhance
* it to order on frequency.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/Iterable.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Iterable.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/Iterable.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* A placeholder until Java 1.5.
- *
+ *
* @author DM Smith [dmsmith555 at yahoo dot com]
*
*/
Modified: trunk/common/src/main/java/org/crosswire/common/util/Languages.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Languages.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/Languages.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -28,7 +28,7 @@
/**
* A utility class that converts ISO-639 codes or locales to their "friendly" language name.
- *
+ *
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -48,7 +48,7 @@
* The code is valid if it is in iso639.properties.
* If a locale is used for the iso639Code, it will use the part before the '_'.
* Thus, this code does not support dialects, except as found in the iso639.
- *
+ *
* @param iso639Code
* @return true if the language is valid.
*/
@@ -90,7 +90,7 @@
* Otherwise, it will generate a log message and return unknown.
* If a locale is used for the iso639Code, it will use the part before the '_'.
* Thus, this code does not support dialects, except as found in the iso639.
- *
+ *
* @param iso639Code
* @return the name of the language
*/
Modified: trunk/common/src/main/java/org/crosswire/common/util/LogConfig.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/LogConfig.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/LogConfig.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* Loads a java logging configuration file using the JSword methodology.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [ dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/Logger.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Logger.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/Logger.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -28,7 +28,7 @@
/**
* This class is very similar to Commons-Logging except it should be even
* smaller and have an API closer to the Log4J API (and even J2SE 1.4 logging).
- *
+ *
* This implementation is lazy. The actual internal logger is not initialized
* until first use. Turns out that this class indirectly depends upon JSword's
* Project class to help find the logging configuration file. If it is not
Modified: trunk/common/src/main/java/org/crosswire/common/util/Msg.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Msg.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/Msg.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -23,7 +23,7 @@
/**
* Compile safe Msg resource settings.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/NetUtil.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/NetUtil.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/NetUtil.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -272,7 +272,7 @@
* by downloading to a temp dir first
* @param uri The original URI to the file.
* @return The URI as a file
- * @throws IOException
+ * @throws IOException
*/
public static File getAsFile(URI uri) throws IOException
{
@@ -558,7 +558,7 @@
/**
* List all the files specified by the index file passed in.
* @return String[] Matching results.
- * @throws FileNotFoundException
+ * @throws FileNotFoundException
*/
public static String[] listByIndexFile(URI index, URIFilter filter) throws IOException
{
Modified: trunk/common/src/main/java/org/crosswire/common/util/OSType.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/OSType.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/OSType.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -27,7 +27,7 @@
/**
* Types of Operating Systems for which specialized behavior is needed.
- *
+ *
* @see gnu.lgpl.License for license details.
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -131,10 +131,10 @@
/**
* A folder in the user area. This osType will determine which to use in constructing
* the URI to the folder.
- *
+ *
* @param hiddenFolderName is typically a "unix" hidden folder name such as .jsword.
* @param visibleFolderName is an visible folder name, such as JSword.
- *
+ *
* @return the user area folder
*/
public abstract URI getUserAreaFolder(String hiddenFolderName, String visibleFolderName);
@@ -168,7 +168,7 @@
/**
* Get the machine's OSType.
- *
+ *
* @return the machine's OSType
*/
public static OSType getOSType()
Modified: trunk/common/src/main/java/org/crosswire/common/util/ReflectionUtil.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/ReflectionUtil.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/ReflectionUtil.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* Various utilities for running introspected methods.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/ReporterEvent.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/ReporterEvent.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/ReporterEvent.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* An event indicating that some bit of data needs capturing.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/ReporterListener.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/ReporterListener.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/ReporterListener.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -25,7 +25,7 @@
/**
* ReporterListener informs users of problems and messages.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/TimeGate.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/TimeGate.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/TimeGate.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -24,7 +24,7 @@
/**
* A TimeGate when entered will cause the gate to be closed for a specified period of time.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/URIFilter.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/URIFilter.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/URIFilter.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -23,7 +23,7 @@
/**
* This is the URI equivalent of FilenameFilter in the java.io package.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/util/WebResource.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/WebResource.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/util/WebResource.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -41,7 +41,7 @@
* A WebResource is backed by an URL and potentially the proxy through which it
* need go. It can get basic information about the resource and it can get the
* resource.
- *
+ *
* @see gnu.lgpl.License for license details.<br> The copyright to this program is
* held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -73,7 +73,7 @@
/**
* Determine the size of this WebResource.
* <p>Note that the http client may read the entire file to determine this.</p>
- *
+ *
* @return the size of the file
*/
public int getSize()
@@ -106,7 +106,7 @@
/**
* Determine the last modified date of this WebResource.
* <p>Note that the http client may read the entire file.</p>
- *
+ *
* @return the last mod date of the file
*/
public long getLastModified()
@@ -135,7 +135,7 @@
/**
* Copy this WebResource to the destination.
- *
+ *
* @param dest
* @throws LucidException
*/
Modified: trunk/common/src/main/java/org/crosswire/common/xml/Converter.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/Converter.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/Converter.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* A generic method of converting one SAX stream into another.
* This can be a wrapper around an XSL transform or anything else.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/xml/FormatType.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/FormatType.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/FormatType.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* The PrettySerializingContentHandler uses a FormatType to control its output.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/xml/HTMLSerializingContentHandler.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/HTMLSerializingContentHandler.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/HTMLSerializingContentHandler.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -46,7 +46,7 @@
* A formatting serializer that adds whitespace to the document
* according to the specified <code>FormatType</code>. This uses
* a StringWriter and the toString method will return its content.
- *
+ *
* @param theFormat the formatting to use
*/
public HTMLSerializingContentHandler(FormatType theFormat)
@@ -58,7 +58,7 @@
* A formatting serializer that adds whitespace to the document
* according to the specified <code>FormatType</code>. As the document
* is serialized it is written to the provided <code>Writer</code>.
- *
+ *
* @param theFormat the formatting to use
* @param theWriter the writer to use
*/
Modified: trunk/common/src/main/java/org/crosswire/common/xml/JDOMSAXEventProvider.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/JDOMSAXEventProvider.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/JDOMSAXEventProvider.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -29,7 +29,7 @@
/**
* A SAXEventProvider that provides SAX events from a JDOM Document.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/xml/PrettySerializingContentHandler.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/PrettySerializingContentHandler.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/PrettySerializingContentHandler.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -52,7 +52,7 @@
* A formatting serializer that adds whitespace to the document
* according to the specified <code>FormatType</code>. This uses
* a StringWriter and the toString method will return its content.
- *
+ *
* @param theFormat the formatting to use
*/
public PrettySerializingContentHandler(FormatType theFormat)
@@ -64,7 +64,7 @@
* A formatting serializer that adds whitespace to the document
* according to the specified <code>FormatType</code>. As the document
* is serialized it is written to the provided <code>Writer</code>.
- *
+ *
* @param theFormat the formatting to use
* @param theWriter the writer to use
*/
Modified: trunk/common/src/main/java/org/crosswire/common/xml/RedLetterText.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/RedLetterText.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/RedLetterText.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -24,7 +24,7 @@
/**
* RedLetterText remembers when text should be red.
* Red Letter Text is used to highlight the words of Jesus.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -65,7 +65,7 @@
/**
* Returns true when one is in Red Letter Text
- *
+ *
* @return true if in RLT, false otherwise
*/
public boolean isRLT()
Modified: trunk/common/src/main/java/org/crosswire/common/xml/SAXEventProvider.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/SAXEventProvider.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/SAXEventProvider.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* A simple way of giving someone a place from which to get SAX events.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/xml/SAXEventProviderInputSource.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/SAXEventProviderInputSource.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/SAXEventProviderInputSource.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* This is a simple marker interface that we can use with
* SAXEventProviderXMLReader.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/xml/StringSAXEventProvider.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/StringSAXEventProvider.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/StringSAXEventProvider.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -35,7 +35,7 @@
/**
* A SAXEventProvider that provides SAX events from a String.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/xml/TransformingSAXEventProvider.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/TransformingSAXEventProvider.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/TransformingSAXEventProvider.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -69,7 +69,7 @@
/**
* Compile the XSL or retrieve it from the cache
- * @throws IOException
+ * @throws IOException
*/
private TemplateInfo getTemplateInfo() throws TransformerConfigurationException, IOException
{
Modified: trunk/common/src/main/java/org/crosswire/common/xml/TransformingSAXEventProviderConverter.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/TransformingSAXEventProviderConverter.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/TransformingSAXEventProviderConverter.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -26,7 +26,7 @@
/**
* An implementation of Converter that uses a TransformingSAXEventProvider to
* transform one SAXEventProvider into another SAXEventProvider using XSL.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author Joe Walker [joe at eireneh dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/xml/XMLFeature.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/XMLFeature.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/XMLFeature.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -27,7 +27,7 @@
/**
* Wraps an XML Feature. The "known" set of XML Features is found in
* XMLFeatureSet.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -69,7 +69,7 @@
/**
* Construct a feature for xml, setting the initial state
- *
+ *
* @param control
* @param initialState
*/
@@ -81,7 +81,7 @@
/**
* Construct a feature for xml, setting the initial state set to false.
- *
+ *
* @param control
*/
private XMLFeature(String control)
Modified: trunk/common/src/main/java/org/crosswire/common/xml/XMLFeatureSet.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/XMLFeatureSet.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/XMLFeatureSet.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -2,21 +2,21 @@
* This is inspired by DocumentChecker.
* @author Andy Clark, IBM
* @author Arnaud Le Hors, IBM
- *
+ *
* Copyright 2000-2002,2004,2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
/**
@@ -54,7 +54,7 @@
/**
* A set of useful XML Features
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
@@ -204,7 +204,7 @@
/**
* Set the control state on the parser.
- *
+ *
* @param parser
*/
public void setFeature(XMLReader parser)
Modified: trunk/common/src/main/java/org/crosswire/common/xml/XMLHandlerAdapter.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/XMLHandlerAdapter.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/XMLHandlerAdapter.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -2,21 +2,21 @@
* This is based on XMLProcess.
* @author Andy Clark, IBM
* @author Arnaud Le Hors, IBM
- *
+ *
* Copyright 2000-2002,2004,2005 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
- *
+ *
*/
/**
@@ -58,7 +58,7 @@
/**
* Checks a XML document for problems, reporting line and offset.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/xml/XMLProcess.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/XMLProcess.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/XMLProcess.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -30,7 +30,7 @@
/**
* Runs an xml parser on an xml file using an xml handler.
* The default behavior is to check that the xml file is well-formed.
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/org/crosswire/common/xml/XMLUtil.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/XMLUtil.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/XMLUtil.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -143,7 +143,7 @@
* For each entity in the input that is not allowed in XML, replace the entity with its unicode equivalent or remove it.
* For each instance of a bare &, replace it with &<br/>
* XML only allows 4 entities: &amp;, &quot;, &lt; and &gt;.
- *
+ *
* @param broken the string to handle entities
* @return the string with entities appropriately fixed up
*/
@@ -228,7 +228,7 @@
* The set of allowable characters are:<br />
* #x9 | #xA | #xD | [#x20-#xD7FF] | [#xE000-#xFFFD] | [#x10000-#x10FFFF]<br/>
* Note: Java handles to \uFFFF
- *
+ *
* @param broken the string to be cleaned
* @return the cleaned string
*/
@@ -324,7 +324,7 @@
* Replace entity with its unicode equivalent, if it is not a valid XML entity.
* Otherwise strip it out.
* XML only allows 4 entities: &amp;, &quot;, &lt; and &gt;.
- *
+ *
* @param entity the entity to be replaced
* @return the substitution for the entity, either itself, the unicode equivalent or an empty string.
*/
Modified: trunk/common/src/main/java/org/crosswire/common/xml/XalanProcess.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/xml/XalanProcess.java 2007-07-01 14:02:55 UTC (rev 1461)
+++ trunk/common/src/main/java/org/crosswire/common/xml/XalanProcess.java 2007-07-02 02:32:23 UTC (rev 1462)
@@ -28,7 +28,7 @@
* Allows xalan's xslt process class to be invoked as a command line
* application. Java 5 has renamed the main routine to _main. This class
* normalizes the difference between Java 1.4 and 1.5 (aka 5).
- *
+ *
* @see gnu.lgpl.License for license details.<br>
* The copyright to this program is held by it's authors.
* @author DM Smith [dmsmith555 at yahoo dot com]
More information about the jsword-svn
mailing list