[jsword-svn] r1140 - in trunk/jsword-limbo/src/main/java/org/crosswire: bibledesktop/passage jsword/book/basic jsword/book/raw jsword/book/search/ser jsword/book/ser
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Sat Sep 30 20:27:57 MST 2006
Author: dmsmith
Date: 2006-09-30 20:27:42 -0700 (Sat, 30 Sep 2006)
New Revision: 1140
Modified:
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BibleTreeNode.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BookTreeNode.java
trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/ChapterTreeNode.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/basic/Verifier.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/CaseInstsMem.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsDisk.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsMem.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsDisk.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsMem.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/RawBook.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordInstsDisk.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordInstsMem.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/ser/SerIndex.java
trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/ser/BookDataCache.java
Log:
refactoring versification
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BibleTreeNode.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BibleTreeNode.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BibleTreeNode.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -26,10 +26,10 @@
import javax.swing.tree.TreeNode;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.Passage;
import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* BibleTreeNode.
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BookTreeNode.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BookTreeNode.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/BookTreeNode.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -25,10 +25,10 @@
import javax.swing.tree.TreeNode;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.Passage;
import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* PassageTableModel.
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/ChapterTreeNode.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/ChapterTreeNode.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/bibledesktop/passage/ChapterTreeNode.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -25,10 +25,10 @@
import javax.swing.tree.TreeNode;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.Passage;
import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* PassageTableModel.
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/basic/Verifier.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/basic/Verifier.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/basic/Verifier.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -31,11 +31,11 @@
import org.crosswire.jsword.book.BookData;
import org.crosswire.jsword.book.BookException;
import org.crosswire.jsword.index.search.DefaultSearchRequest;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.KeyUtil;
import org.crosswire.jsword.passage.Passage;
import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* The Verifier check 2 versions for identical text.
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/CaseInstsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/CaseInstsMem.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/CaseInstsMem.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -27,7 +27,7 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.crosswire.jsword.passage.BibleInfo;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* A CaseInstsMem provides access to the list of case ids that
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsDisk.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsDisk.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsDisk.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -23,8 +23,8 @@
import java.io.IOException;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* InstsDisk is a Base implementation of the Insts interface using the in
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsMem.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/InstsMem.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -27,8 +27,8 @@
import java.io.ObjectOutputStream;
import java.io.OutputStream;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* InstsMem is a Base implementation of the Insts interface using the in
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsDisk.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsDisk.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsDisk.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -28,7 +28,7 @@
import org.crosswire.common.util.FileUtil;
import org.crosswire.common.util.NetUtil;
import org.crosswire.common.util.Reporter;
-import org.crosswire.jsword.passage.BibleInfo;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* PuncInstsDisk is like PuncInstsMem however the entire block of data is
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsMem.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/PuncInstsMem.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -27,7 +27,7 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.crosswire.jsword.passage.BibleInfo;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* A PuncInstsMem provides access to the list of punctuation ids that
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/RawBook.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/RawBook.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/RawBook.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -40,12 +40,12 @@
import org.crosswire.jsword.book.basic.DefaultBookMetaData;
import org.crosswire.jsword.book.filter.Filter;
import org.crosswire.jsword.book.filter.FilterFactory;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.KeyUtil;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.Passage;
import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.BibleInfo;
import org.jdom.Element;
/**
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordInstsDisk.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordInstsDisk.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordInstsDisk.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -28,7 +28,7 @@
import org.crosswire.common.util.FileUtil;
import org.crosswire.common.util.NetUtil;
import org.crosswire.common.util.Reporter;
-import org.crosswire.jsword.passage.BibleInfo;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* WordInstsDisk is like WordInstsMem however the entire block of data is
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordInstsMem.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordInstsMem.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/raw/WordInstsMem.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -27,7 +27,7 @@
import java.io.InputStream;
import java.io.OutputStream;
-import org.crosswire.jsword.passage.BibleInfo;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* A WordInstsMem provides access to the list of word ids that make up
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/ser/SerIndex.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/ser/SerIndex.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/search/ser/SerIndex.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -50,13 +50,13 @@
import org.crosswire.jsword.book.search.Grammar;
import org.crosswire.jsword.book.search.Thesaurus;
import org.crosswire.jsword.index.AbstractIndex;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.KeyUtil;
import org.crosswire.jsword.passage.NoSuchKeyException;
import org.crosswire.jsword.passage.Passage;
import org.crosswire.jsword.passage.PassageKeyFactory;
import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* A search engine - This is a stepping stone on the way to allowing use of
Modified: trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/ser/BookDataCache.java
===================================================================
--- trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/ser/BookDataCache.java 2006-10-01 03:27:06 UTC (rev 1139)
+++ trunk/jsword-limbo/src/main/java/org/crosswire/jsword/book/ser/BookDataCache.java 2006-10-01 03:27:42 UTC (rev 1140)
@@ -36,8 +36,8 @@
import org.crosswire.common.util.Logger;
import org.crosswire.common.util.NetUtil;
import org.crosswire.jsword.book.BookException;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* A cache of BibleData that can be shared amongst Bibles.
More information about the jsword-svn
mailing list