[jsword-svn] r1868 - in trunk: common/src/main/java/gnu/lgpl common/src/main/java/org/crosswire/common/compress common/src/main/java/org/crosswire/common/util jsword/src/main/java/org/crosswire/jsword/book jsword/src/main/java/org/crosswire/jsword/book/basic jsword/src/main/java/org/crosswire/jsword/book/sword
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Thu Jun 5 11:48:57 MST 2008
Author: dmsmith
Date: 2008-06-05 11:48:56 -0700 (Thu, 05 Jun 2008)
New Revision: 1868
Modified:
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/compress/LZSS.java
trunk/common/src/main/java/org/crosswire/common/util/Translations.java
trunk/common/src/main/java/org/crosswire/common/util/WebResource.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/BookProvider.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/Bookmark.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/DefaultBookmark.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordDailyDevotion.java
Log:
Fixed licensing to lgpl.
Modified: trunk/common/src/main/java/gnu/lgpl/License.java
===================================================================
--- trunk/common/src/main/java/gnu/lgpl/License.java 2008-05-31 18:59:29 UTC (rev 1867)
+++ trunk/common/src/main/java/gnu/lgpl/License.java 2008-06-05 18:48:56 UTC (rev 1868)
@@ -529,7 +529,7 @@
That's all there is to it!
</pre>
*
- * @see gnu.gpl.License for license details.<br>
+ * @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]
* @author DM Smith [dmsmith555 at yahoo dot com]
Modified: trunk/common/src/main/java/gnu/lgpl/Msg.java
===================================================================
--- trunk/common/src/main/java/gnu/lgpl/Msg.java 2008-05-31 18:59:29 UTC (rev 1867)
+++ trunk/common/src/main/java/gnu/lgpl/Msg.java 2008-06-05 18:48:56 UTC (rev 1868)
@@ -1,14 +1,14 @@
/**
* Distribution License:
* JSword is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 2 as published by
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
* the Free Software Foundation. This program is distributed in the hope
* that it will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * See the GNU Lesser General Public License for more details.
*
* The License is available on the internet at:
- * http://www.gnu.org/copyleft/gpl.html
+ * http://www.gnu.org/copyleft/lgpl.html
* or by writing to:
* Free Software Foundation, Inc.
* 59 Temple Place - Suite 330
@@ -26,7 +26,7 @@
/**
* Compile safe Msg resource settings.
*
- * @see gnu.gpl.License for license details.<br>
+ * @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/LZSS.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/compress/LZSS.java 2008-05-31 18:59:29 UTC (rev 1867)
+++ trunk/common/src/main/java/org/crosswire/common/compress/LZSS.java 2008-06-05 18:48:56 UTC (rev 1868)
@@ -119,11 +119,11 @@
// Start with a clean tree.
initTree();
- // code_buf[0] works as eight flags. A "1" represents that the
+ // codeBuff[0] works as eight flags. A "1" represents that the
// unit is an unencoded letter (1 byte), and a "0" represents
// that the next unit is a <position,length> pair (2 bytes).
//
- // code_buf[1..16] stores eight units of code. Since the best
+ // codeBuff[1..16] stores eight units of code. Since the best
// we can do is store eight <position,length> pairs, at most 16
// bytes are needed to store this.
//
@@ -161,7 +161,7 @@
len = input.read(ringBuffer, r, MAX_STORE_LENGTH);
// Make sure there is something to be compressed.
- if (len == 0)
+ if (len <= 0)
{
return out;
}
@@ -192,7 +192,7 @@
// Is it cheaper to store this as a single character? If so, make it so.
if (matchLength < THRESHOLD)
{
- // Send one character. Remember that code_buf[0] is the
+ // Send one character. Remember that codeBuff[0] is the
// set of flags for the next eight items.
matchLength = 1;
codeBuff[0] |= mask;
@@ -218,8 +218,8 @@
// output.
if (mask == 0)
{
- // code_buf is the buffer of characters to be output.
- // code_buf_pos is the number of characters it contains.
+ // codeBuff is the buffer of characters to be output.
+ // codeBufPos is the number of characters it contains.
out.write(codeBuff, 0, codeBufPos);
// Reset for next buffer...
@@ -258,7 +258,7 @@
// into the back end so that when you're looking at characters
// at the back end of the buffer, you can index ahead (beyond
// the normal end of the buffer) and see the characters
- // that are at the front end of the buffer wihtout having
+ // that are at the front end of the buffer without having
// to adjust the index.
//
// That is...
@@ -473,7 +473,7 @@
// For i = 0 to 255, rightSon[RING_SIZE + i + 1] is the root of the tree
// for strings that begin with the character i. This is why
// the right child array is larger than the left child array.
- // These are also initialzied to a "not used" state.
+ // These are also initialized to a "not used" state.
//
// Note that there are 256 of these, one for each of the possible
// 256 characters.
@@ -489,8 +489,8 @@
* 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]
+ * <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
@@ -498,7 +498,7 @@
* 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]
+ * in the ring buffer and also as a tree node. ringBuffer[pos]
* defines a character that is used to identify a tree node.
*/
private void insertNode(short pos)
Modified: trunk/common/src/main/java/org/crosswire/common/util/Translations.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Translations.java 2008-05-31 18:59:29 UTC (rev 1867)
+++ trunk/common/src/main/java/org/crosswire/common/util/Translations.java 2008-06-05 18:48:56 UTC (rev 1868)
@@ -1,14 +1,14 @@
/**
* Distribution License:
* BibleDesktop is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 2 as published by
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
* the Free Software Foundation. This program is distributed in the hope
* that it will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * See the GNU Lesser General Public License for more details.
*
* The License is available on the internet at:
- * http://www.gnu.org/copyleft/gpl.html
+ * http://www.gnu.org/copyleft/lgpl.html
* or by writing to:
* Free Software Foundation, Inc.
* 59 Temple Place - Suite 330
@@ -34,7 +34,7 @@
/**
* Translations provides a list of locales that BibleDesktop has been translated into.
*
- * @see gnu.gpl.License for license details.
+ * @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/util/WebResource.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/WebResource.java 2008-05-31 18:59:29 UTC (rev 1867)
+++ trunk/common/src/main/java/org/crosswire/common/util/WebResource.java 2008-06-05 18:48:56 UTC (rev 1868)
@@ -1,14 +1,14 @@
/**
* Distribution License:
* BibleDesktop is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 2 as published by
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
* the Free Software Foundation. This program is distributed in the hope
* that it will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * See the GNU Lesser General Public License for more details.
*
* The License is available on the internet at:
- * http://www.gnu.org/copyleft/gpl.html
+ * http://www.gnu.org/copyleft/lgpl.html
* or by writing to:
* Free Software Foundation, Inc.
* 59 Temple Place - Suite 330
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/BookProvider.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/BookProvider.java 2008-05-31 18:59:29 UTC (rev 1867)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/BookProvider.java 2008-06-05 18:48:56 UTC (rev 1868)
@@ -1,14 +1,14 @@
/**
* Distribution License:
* BibleDesktop is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 2 as published by
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
* the Free Software Foundation. This program is distributed in the hope
* that it will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * See the GNU Lesser General Public License for more details.
*
* The License is available on the internet at:
- * http://www.gnu.org/copyleft/gpl.html
+ * http://www.gnu.org/copyleft/lgpl.html
* or by writing to:
* Free Software Foundation, Inc.
* 59 Temple Place - Suite 330
@@ -25,7 +25,7 @@
/**
* A BookSelectEvent happens whenever a user selects a book.
*
- * @see gnu.gpl.License for license details.
+ * @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/jsword/src/main/java/org/crosswire/jsword/book/Bookmark.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/Bookmark.java 2008-05-31 18:59:29 UTC (rev 1867)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/Bookmark.java 2008-06-05 18:48:56 UTC (rev 1868)
@@ -31,7 +31,7 @@
* What is viewed regarding a book set is either a SearchRequest
* or a key lookup request.
*
- * @see gnu.gpl.License for license details.
+ * @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/jsword/src/main/java/org/crosswire/jsword/book/basic/DefaultBookmark.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/DefaultBookmark.java 2008-05-31 18:59:29 UTC (rev 1867)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/basic/DefaultBookmark.java 2008-06-05 18:48:56 UTC (rev 1868)
@@ -35,7 +35,7 @@
* What is viewed regarding a book set is either a SearchRequest
* or a key lookup request.
*
- * @see gnu.gpl.License for license details.
+ * @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/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordDailyDevotion.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordDailyDevotion.java 2008-05-31 18:59:29 UTC (rev 1867)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordDailyDevotion.java 2008-06-05 18:48:56 UTC (rev 1868)
@@ -1,14 +1,14 @@
/**
* Distribution Licence:
* JSword is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License, version 2 as published by
+ * the terms of the GNU Lesser General Public License, version 2.1 as published by
* the Free Software Foundation. This program is distributed in the hope
* that it will be useful, but WITHOUT ANY WARRANTY; without even the
* implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
+ * See the GNU Lesser General Public License for more details.
*
* The License is available on the internet at:
- * http://www.gnu.org/copyleft/gpl.html
+ * http://www.gnu.org/copyleft/lgpl.html
* or by writing to:
* Free Software Foundation, Inc.
* 59 Temple Place - Suite 330
More information about the jsword-svn
mailing list