[jsword-svn] r1142 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/passage biblemapper/src/main/java/org/crosswire/biblemapper/model biblemapper/src/main/java/org/crosswire/biblemapper/swing jsword/src/main/java/org/crosswire/jsword/examples jsword/src/main/java/org/crosswire/jsword/index/lucene
dmsmith at www.crosswire.org
dmsmith at www.crosswire.org
Sat Sep 30 20:32:06 MST 2006
Author: dmsmith
Date: 2006-09-30 20:31:40 -0700 (Sat, 30 Sep 2006)
New Revision: 1142
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/AntiGravityRule.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/DefraggingRule.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Link.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/LinkArray.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Map.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/MapEvent.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/VBAExport.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookVerseColor.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/CliMapper.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/GroupVerseColor.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapTableModel.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/Mapper.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapperPane.java
trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/SectionVerseColor.java
trunk/jsword/src/main/java/org/crosswire/jsword/examples/APIExamples.java
trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java
trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java
Log:
refactoring versification
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -25,9 +25,9 @@
import javax.swing.ComboBoxModel;
import org.crosswire.common.util.Logger;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* A ComboBoxModel for selecting book/chapter/verse.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModelSet.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -29,9 +29,9 @@
import javax.swing.JComboBox;
import javax.swing.event.EventListenerList;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.Verse;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* A set of correctly constructed and linked BibleComboBoxModels.
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -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.Verse;
import org.crosswire.jsword.passage.VerseRange;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* A PassageTreeNode extends TreeNode to Model a Passage.
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/AntiGravityRule.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/AntiGravityRule.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/AntiGravityRule.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -22,8 +22,8 @@
package org.crosswire.biblemapper.model;
import org.crosswire.common.util.Logger;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* AntiGravityRule.
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/DefraggingRule.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/DefraggingRule.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/DefraggingRule.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -21,7 +21,7 @@
*/
package org.crosswire.biblemapper.model;
-import org.crosswire.jsword.passage.BibleInfo;
+import org.crosswire.jsword.versification.BibleInfo;
import org.crosswire.common.util.Reporter;
/**
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Link.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Link.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Link.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -23,10 +23,10 @@
import java.io.Serializable;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.Verse;
import org.crosswire.jsword.passage.VerseRange;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* A Link describes a destination verse and a link strength.
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/LinkArray.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/LinkArray.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/LinkArray.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -32,11 +32,11 @@
import org.crosswire.common.util.Logger;
import org.crosswire.jsword.book.Book;
import org.crosswire.jsword.book.BookData;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.PassageTally;
import org.crosswire.jsword.passage.Verse;
import org.crosswire.jsword.passage.VerseRange;
+import org.crosswire.jsword.versification.BibleInfo;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Map.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Map.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/Map.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -32,8 +32,8 @@
import org.crosswire.common.util.EventListenerList;
import org.crosswire.common.util.Logger;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
+import org.crosswire.jsword.versification.BibleInfo;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.JDOMException;
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/MapEvent.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/MapEvent.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/MapEvent.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -23,8 +23,8 @@
import java.util.EventObject;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* A MapEvent happens whenever a Map changes.
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/VBAExport.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/VBAExport.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/model/VBAExport.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -23,8 +23,8 @@
import java.io.PrintWriter;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* VBAExport takes a Map and exports the data to a Word VBA file.
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookVerseColor.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookVerseColor.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/BookVerseColor.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -23,8 +23,8 @@
import java.awt.Color;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* BookVerseColor gives a color to a selected books, leaving the
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/CliMapper.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/CliMapper.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/CliMapper.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -32,12 +32,12 @@
import org.crosswire.jsword.book.Books;
import org.crosswire.jsword.book.search.parse.IndexSearcher;
import org.crosswire.jsword.book.search.parse.PhraseParamWord;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.PassageTally;
import org.crosswire.jsword.passage.Verse;
import org.crosswire.jsword.passage.VerseRange;
+import org.crosswire.jsword.versification.BibleInfo;
import org.jdom.Document;
import org.jdom.Element;
import org.jdom.output.Format;
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/GroupVerseColor.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/GroupVerseColor.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/GroupVerseColor.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -23,7 +23,7 @@
import java.awt.Color;
-import org.crosswire.jsword.passage.BibleInfo;
+import org.crosswire.jsword.versification.SectionNames;
/**
* GroupVerseColor gives colors to groups of books, so the pentetuch is
@@ -44,7 +44,7 @@
*/
public Color getColor(int book, int chapter, int verse)
{
- return array[BibleInfo.getSection(book)-1];
+ return array[SectionNames.getSection(book)-1];
}
/**
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapTableModel.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapTableModel.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapTableModel.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -28,10 +28,10 @@
import org.crosswire.biblemapper.model.MapEvent;
import org.crosswire.biblemapper.model.MapListener;
import org.crosswire.common.util.Reporter;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.Verse;
import org.crosswire.jsword.passage.VerseRange;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* A MapTableModel takes an underlying map and represents it as a
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/Mapper.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/Mapper.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/Mapper.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -76,7 +76,8 @@
import org.crosswire.jsword.book.Book;
import org.crosswire.jsword.book.BookFilters;
import org.crosswire.jsword.book.Books;
-import org.crosswire.jsword.passage.BibleInfo;
+import org.crosswire.jsword.versification.BibleNames;
+import org.crosswire.jsword.versification.SectionNames;
import org.jdom.Document;
/**
@@ -110,13 +111,13 @@
vcols = new VerseColor[76];
vcols[0] = new RainbowVerseColor();
vcols[1] = new GroupVerseColor();
- for (int i = BibleInfo.Section.PENTATEUCH; i <= BibleInfo.Section.LETTERS; i++)
+ for (int i = SectionNames.PENTATEUCH; i <= SectionNames.LETTERS; i++)
{
vcols[i + 1] = new SectionVerseColor(i);
}
- for (int i = BibleInfo.Names.GENESIS; i <= BibleInfo.Names.REVELATION; i++)
+ for (int i = BibleNames.GENESIS; i <= BibleNames.REVELATION; i++)
{
- vcols[i + 1 + BibleInfo.Section.LETTERS] = new BookVerseColor(i);
+ vcols[i + 1 + SectionNames.LETTERS] = new BookVerseColor(i);
}
init();
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapperPane.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapperPane.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/MapperPane.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -35,8 +35,8 @@
import org.crosswire.biblemapper.model.MapEvent;
import org.crosswire.biblemapper.model.MapListener;
import org.crosswire.common.swing.GuiUtil;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* This is an Swing GUI interface to the BMap project.
Modified: trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/SectionVerseColor.java
===================================================================
--- trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/SectionVerseColor.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/biblemapper/src/main/java/org/crosswire/biblemapper/swing/SectionVerseColor.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -23,8 +23,9 @@
import java.awt.Color;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.NoSuchVerseException;
+import org.crosswire.jsword.versification.BibleInfo;
+import org.crosswire.jsword.versification.SectionNames;
/**
* SectionVerseColor gives a color to a selected group of books,
@@ -71,7 +72,7 @@
*/
public Color getColor(int book, int chapter, int verse)
{
- if (section != BibleInfo.getSection(book))
+ if (section != SectionNames.getSection(book))
{
return Color.gray;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/examples/APIExamples.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/examples/APIExamples.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/examples/APIExamples.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -43,7 +43,6 @@
import org.crosswire.jsword.book.BooksListener;
import org.crosswire.jsword.index.search.DefaultSearchModifier;
import org.crosswire.jsword.index.search.DefaultSearchRequest;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.NoSuchKeyException;
import org.crosswire.jsword.passage.Passage;
@@ -51,6 +50,7 @@
import org.crosswire.jsword.passage.RestrictionType;
import org.crosswire.jsword.passage.Verse;
import org.crosswire.jsword.util.ConverterFactory;
+import org.crosswire.jsword.versification.BibleInfo;
import org.xml.sax.SAXException;
/**
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/examples/BibleToOsis.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -46,12 +46,12 @@
import org.crosswire.jsword.book.BookMetaData;
import org.crosswire.jsword.book.Books;
import org.crosswire.jsword.book.sword.SwordConstants;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.NoSuchKeyException;
import org.crosswire.jsword.passage.NoSuchVerseException;
import org.crosswire.jsword.passage.Verse;
import org.crosswire.jsword.passage.VerseFactory;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* Start of a mechanism to extract a Bible module to OSIS.
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java 2006-10-01 03:28:46 UTC (rev 1141)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/index/lucene/LuceneIndex.java 2006-10-01 03:31:40 UTC (rev 1142)
@@ -54,7 +54,6 @@
import org.crosswire.jsword.index.IndexStatus;
import org.crosswire.jsword.index.search.SearchModifier;
import org.crosswire.jsword.passage.AbstractPassage;
-import org.crosswire.jsword.passage.BibleInfo;
import org.crosswire.jsword.passage.Key;
import org.crosswire.jsword.passage.KeyUtil;
import org.crosswire.jsword.passage.NoSuchKeyException;
@@ -62,6 +61,7 @@
import org.crosswire.jsword.passage.PassageTally;
import org.crosswire.jsword.passage.Verse;
import org.crosswire.jsword.passage.VerseFactory;
+import org.crosswire.jsword.versification.BibleInfo;
/**
* Implement the SearchEngine using Lucene as the search engine.
More information about the jsword-svn
mailing list