[jsword-svn] r2223 - in trunk: bibledesktop/.settings bibledesktop/src/main/java/org/crosswire/bibledesktop bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic bibledesktop/src/main/java/org/crosswire/bibledesktop/passage common-swing/.settings common-swing/src/main/java/org/crosswire/common/swing jsword jsword/.settings jsword/src/main/java/org/crosswire/common/util jsword/src/main/java/org/crosswire/jsword/book jsword/src/main/java/org/crosswire/jsword/book/filter/thml jsword/src/main/java/org/crosswire/jsword/book/readings jsword/src/main/java/org/crosswire/jsword/book/sword jsword/src/main/java/org/crosswire/jsword/index jsword/src/main/java/org/crosswire/jsword/passage jsword/src/main/java/org/crosswire/jsword/versification jsword/src/main/java/org/crosswire/jsword/versification/system jsword/src/test/java/org/crosswire/jsword/book/sword jsword/src/test/java/org/crosswire/jsword/passage jsword/src/test/java/org/crosswire/jsword/versification
dmsmith at crosswire.org
dmsmith at crosswire.org
Thu Jan 26 14:28:03 MST 2012
Author: dmsmith
Date: 2012-01-26 14:28:02 -0700 (Thu, 26 Jan 2012)
New Revision: 2223
Added:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/scraps.jpage
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/package.html
Modified:
trunk/bibledesktop/.settings/org.eclipse.jdt.core.prefs
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/BDMsg.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipHelper.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
trunk/common-swing/.settings/org.eclipse.jdt.core.prefs
trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/FontChooser.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiConvert.java
trunk/jsword/.settings/org.eclipse.jdt.core.prefs
trunk/jsword/.settings/org.eclipse.jdt.ui.prefs
trunk/jsword/JSwordDictionary.txt
trunk/jsword/core.xml
trunk/jsword/src/main/java/org/crosswire/common/util/Convert.java
trunk/jsword/src/main/java/org/crosswire/common/util/EventListenerList.java
trunk/jsword/src/main/java/org/crosswire/common/util/MsgBase.java
trunk/jsword/src/main/java/org/crosswire/common/util/Version.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/SentenceUtil.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/THMLFilter.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/readings/ReadingsBook.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java
trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookPath.java
trunk/jsword/src/main/java/org/crosswire/jsword/index/IndexStatus.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/KeyUtil.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageEvent.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageKeyFactory.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageTally.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/RestrictionType.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/Verse.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseFactory.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRange.java
trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRangeFactory.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBook.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBookList.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleNames.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/DivisionName.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/SectionNames.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/Versification.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic2.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemDefault.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemGerman.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJVA.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLeningrad.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLuther.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemMT.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSV.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSVA.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodal.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodalP.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemVulg.java
trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/Versifications.java
trunk/jsword/src/test/java/org/crosswire/jsword/book/sword/RawFileBackendTest.java
trunk/jsword/src/test/java/org/crosswire/jsword/passage/AccuracyTypeTest.java
trunk/jsword/src/test/java/org/crosswire/jsword/passage/PassageParentTst.java
trunk/jsword/src/test/java/org/crosswire/jsword/passage/PassageTally2Test.java
trunk/jsword/src/test/java/org/crosswire/jsword/passage/PassageUtilTest.java
trunk/jsword/src/test/java/org/crosswire/jsword/passage/VerseRangeTest.java
trunk/jsword/src/test/java/org/crosswire/jsword/passage/VerseTest.java
trunk/jsword/src/test/java/org/crosswire/jsword/versification/VersificationTest.java
trunk/jsword/tags.txt
Log:
Cleaned up checkstyle warnings
Added AV11N task tag for potential problem areas.
Modified: trunk/bibledesktop/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/bibledesktop/.settings/org.eclipse.jdt.core.prefs 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/bibledesktop/.settings/org.eclipse.jdt.core.prefs 2012-01-26 21:28:02 UTC (rev 2223)
@@ -1,4 +1,4 @@
-#Thu Nov 11 22:22:16 EST 2010
+#Thu Jan 26 16:19:13 EST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -31,8 +31,8 @@
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,NORMAL,LOW,NORMAL,LOW,LOW,NORMAL,LOW,LOW,LOW,LOW,LOW
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,URGENT,PENDING,LATER,BUG,DEAD,SPEEDUP,I18N,JDK14,JDK15,NOWARN,BORROWED,SERIALUID
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,NORMAL,LOW,NORMAL,LOW,LOW,NORMAL,LOW,LOW,LOW,LOW,LOW,HIGH
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,URGENT,PENDING,LATER,BUG,DEAD,SPEEDUP,I18N,JDK14,JDK15,NOWARN,BORROWED,SERIALUID,AV11N
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/BDMsg.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/BDMsg.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/BDMsg.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -99,7 +99,7 @@
* The current version of Bible Desktop. Adjust for each release.
* And increment after each release and append alpha, beta, ... to it.
*/
- private static String VERSION = shaper.shape("1.6.1beta");
+ private static final String VERSION = shaper.shape("1.6.1beta");
private static MsgBase msg = new BDMsg();
}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -224,7 +224,8 @@
// Broken but we don't serialize views
set = null;
selected = null;
- v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ v11n = Versifications.instance().getDefaultVersification();
is.defaultReadObject();
}
@@ -233,7 +234,8 @@
*/
private static final Logger log = Logger.getLogger(BibleComboBoxModel.class);
- private transient Versification v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ private transient Versification v11n = Versifications.instance().getDefaultVersification();
/**
* Shared settings
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -124,7 +124,8 @@
// The application has started and there are no installed bibles.
// Should always get a key from book, unless we need a PassageTally
// But here we don't have a book yet.
- key = new RocketPassage(Versifications.instance().getVersification("KJV"));
+ // AV11N(DMS): Is this right?
+ key = new RocketPassage(Versifications.instance().getDefaultVersification());
}
JComboBox cboBooks = new JComboBox();
@@ -279,7 +280,8 @@
Verse start = quickSet.getVerse();
BibleBook book = start.getBook();
int chapter = start.getChapter();
- Versification v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ Versification v11n = Versifications.instance().getDefaultVersification();
VerseRange range = new VerseRange(v11n, start, new Verse(book, chapter, v11n.getLastVerse(book, chapter)));
txtSearch.setText("");
txtKey.setText(range.getName());
@@ -301,15 +303,16 @@
}
/**
- *
+ * Clear the contents
*/
public void clear() {
- setKey(selected == null || selected.length == 0 ? new RocketPassage(Versifications.instance().getVersification("KJV")) : selected[0].createEmptyKeyList());
+ // AV11N(DMS): Is this right?
+ setKey(selected == null || selected.length == 0 ? new RocketPassage(Versifications.instance().getDefaultVersification()) : selected[0].createEmptyKeyList());
setTitle(Mode.CLEAR);
}
/**
- *
+ * Determine whether there is content
*/
public boolean isClear() {
// TRANSLATOR: This must match the word that is used for "Untitled {0}".
@@ -480,6 +483,10 @@
return biblePicker;
}
+ /**
+ * Set the key
+ * @param newKey the new key
+ */
public void setKey(String newKey) {
if (selected == null || selected.length == 0) {
return;
@@ -492,6 +499,10 @@
}
}
+ /**
+ * Set the key
+ * @param newKey the new key
+ */
public void setKey(Key newKey) {
if (newKey == null || newKey.isEmpty()) {
if (!key.isEmpty()) {
@@ -799,6 +810,9 @@
private AdvancedSearchPane advanced;
private JButton btnIndex;
+ /**
+ * Defines the state of this DisplaySelectPane
+ */
private enum Mode {
CLEAR,
PASSAGE,
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/PassageSelectionPane.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -221,7 +221,8 @@
String refstr = txtDisplay.getText();
try {
- Versification v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ Versification v11n = Versifications.instance().getDefaultVersification();
Passage temp = (Passage) keyf.getKey(v11n, refstr);
ref.clear();
ref.addAll(temp);
@@ -282,7 +283,8 @@
*/
public String showInDialog(Component parent, String title, boolean modal, String refstr) {
try {
- Versification v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ Versification v11n = Versifications.instance().getDefaultVersification();
ref = (Passage) keyf.getKey(v11n, refstr);
txtDisplay.setText(refstr);
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -982,7 +982,7 @@
public void propertyChange(PropertyChangeEvent evt) {
// When the font changes update all the visible locations
// using it.
- if (evt.getPropertyName().equals("BibleDisplay.ConfigurableFont"))
+ if ("BibleDisplay.ConfigurableFont".equals(evt.getPropertyName()))
{
BibleViewPane view = (BibleViewPane) getViews().getSelected();
SplitBookDataDisplay da = view.getPassagePane();
@@ -991,7 +991,7 @@
reference.refresh();
}
- if (evt.getPropertyName().equals("BibleDisplay.MaxPickers"))
+ if ("BibleDisplay.MaxPickers".equals(evt.getPropertyName()))
{
BibleViewPane view = (BibleViewPane) getViews().getSelected();
DisplaySelectPane selector = view.getSelectPane();
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/ActiveURITip.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -92,8 +92,9 @@
}
public void updateText(URIEvent event) {
- if (event == null)
+ if (event == null) {
return;
+ }
String txt = null;
String protocol = event.getScheme();
Book book = null;
Added: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java (rev 0)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -0,0 +1,76 @@
+/**
+ * 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 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.
+ *
+ * The License is available on the internet at:
+ * http://www.gnu.org/copyleft/gpl.html
+ * or by writing to:
+ * Free Software Foundation, Inc.
+ * 59 Temple Place - Suite 330
+ * Boston, MA 02111-1307, USA
+ *
+ * Copyright: 2007
+ * The copyright to this program is held by it's authors.
+ *
+ * ID: $Id$
+ */
+package org.crosswire.bibledesktop.display.basic;
+
+import java.awt.Dimension;
+import java.awt.Insets;
+
+import javax.swing.JTextPane;
+import javax.swing.JToolTip;
+import javax.swing.text.html.HTMLEditorKit;
+
+import org.crosswire.common.swing.AntiAliasedTextPane;
+
+/**
+ * A specialization of a JToolTip
+ *
+ * @see gnu.gpl.License for license details.<br>
+ * The copyright to this program is held by it's authors.
+ * @author Yingjie Lan [lanyjie at yahoo dot com]
+ */
+class FullHTMLTip extends JToolTip {
+ public FullHTMLTip() {
+ this.setLayout(new java.awt.CardLayout());
+ txtView = new AntiAliasedTextPane();
+ txtView.setEditable(false);
+ txtView.setEditorKit(new HTMLEditorKit());
+ this.add(txtView, "HTMLTip");
+ }
+
+ @Override
+ public Dimension getPreferredSize() {
+ Insets ist = getBorder().getBorderInsets(txtView);
+ Dimension d = txtView.getPreferredSize();
+ d.width += ist.left + ist.right;
+ d.height += ist.top + ist.bottom;
+ return d;
+ }
+
+ @Override
+ public void setTipText(String tipText) {
+ txtView.setText(tipText);
+ }
+
+ /**
+ * @return the text view
+ */
+ public JTextPane getTextView() {
+ return txtView;
+ }
+
+ private JTextPane txtView;
+
+ /**
+ * randomly generated sid.
+ */
+ private static final long serialVersionUID = 6364125062683029727L;
+}
Property changes on: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/FullHTMLTip.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipHelper.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipHelper.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/URITipHelper.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -21,15 +21,11 @@
*/
package org.crosswire.bibledesktop.display.basic;
-import java.awt.Dimension;
-import java.awt.Insets;
import java.net.URI;
import java.util.Locale;
-import javax.swing.JTextPane;
import javax.swing.JToolTip;
import javax.swing.ToolTipManager;
-import javax.swing.text.html.HTMLEditorKit;
import javax.xml.transform.TransformerException;
import org.crosswire.bibledesktop.book.install.BookFont;
@@ -37,7 +33,6 @@
import org.crosswire.bibledesktop.desktop.XSLTProperty;
import org.crosswire.bibledesktop.display.URIEvent;
import org.crosswire.bibledesktop.display.URIEventListener;
-import org.crosswire.common.swing.AntiAliasedTextPane;
import org.crosswire.common.swing.GuiConvert;
import org.crosswire.common.swing.GuiUtil;
import org.crosswire.common.util.Reporter;
@@ -263,47 +258,3 @@
private URIEvent event;
private String txt;
}
-
-/**
- * A specialization of a JToolTip
- *
- * @see gnu.gpl.License for license details.<br>
- * The copyright to this program is held by it's authors.
- * @author Yingjie Lan [lanyjie at yahoo dot com]
- */
-class FullHTMLTip extends JToolTip {
- public FullHTMLTip() {
- this.setLayout(new java.awt.CardLayout());
- txtView = new AntiAliasedTextPane();
- txtView.setEditable(false);
- txtView.setEditorKit(new HTMLEditorKit());
- this.add(txtView, "HTMLTip");
- }
-
- @Override
- public Dimension getPreferredSize() {
- Insets ist = getBorder().getBorderInsets(txtView);
- Dimension d = txtView.getPreferredSize();
- d.width += ist.left + ist.right;
- d.height += ist.top + ist.bottom;
- return d;
- }
-
- @Override
- public void setTipText(String tipText) {
- txtView.setText(tipText);
- }
-
- /**
- * @return the text view
- */
- public JTextPane getTextView() {
- return txtView;
- }
-
- /**
- * randomly generated sid.
- */
- private static final long serialVersionUID = 6364125062683029727L;
- private JTextPane txtView;
-}
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeySidebar.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -149,7 +149,7 @@
private void doBlur(int amount) {
// Remember what was selected
Object[] objs = list.getSelectedValues();
-
+
// Make sure that key changes are not visible until blur is done.
Key copy = key.clone();
Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/WholeBibleTreeNode.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -45,7 +45,8 @@
* The start point for all WholeBibleTreeNodes.
*/
public static WholeBibleTreeNode getRootNode() {
- Versification v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ Versification v11n = Versifications.instance().getDefaultVersification();
return new WholeBibleTreeNode(null, v11n.getAllVerses(), Level.BIBLE);
}
@@ -53,7 +54,8 @@
* We could do some caching here if needs be.
*/
protected static WholeBibleTreeNode getNode(TreeNode parent, BibleBook b, int c, int v) {
- Versification v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ Versification v11n = Versifications.instance().getDefaultVersification();
Verse start = null;
Verse end = null;
Level thislevel = Level.BOOK;
@@ -201,6 +203,7 @@
switch (level) {
case BIBLE:
+ // AV11N(DMS): need to get ordinal from the BibleBookList
return vnode.getVerseRange().getStart().getBook().ordinal();
case BOOK:
@@ -241,6 +244,9 @@
private int count;
}
+ /**
+ * Levels at which this node stands.
+ */
private enum Level {
BIBLE,
BOOK,
@@ -248,7 +254,8 @@
VERSE,
}
- private Versification rs = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ private Versification rs = Versifications.instance().getDefaultVersification();
/** Change the number representation as needed */
private NumberShaper shaper;
Modified: trunk/common-swing/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/common-swing/.settings/org.eclipse.jdt.core.prefs 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/common-swing/.settings/org.eclipse.jdt.core.prefs 2012-01-26 21:28:02 UTC (rev 2223)
@@ -1,4 +1,4 @@
-#Thu Nov 11 22:12:03 EST 2010
+#Thu Jan 26 16:18:33 EST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -31,8 +31,8 @@
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,NORMAL,LOW,NORMAL,LOW,LOW,NORMAL,LOW,LOW,LOW,LOW,LOW
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,URGENT,PENDING,LATER,BUG,DEAD,SPEEDUP,I18N,JDK14,JDK15,NOWARN,BORROWED,SERIALUID
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,NORMAL,LOW,NORMAL,LOW,LOW,NORMAL,LOW,LOW,LOW,LOW,LOW,HIGH
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,URGENT,PENDING,LATER,BUG,DEAD,SPEEDUP,I18N,JDK14,JDK15,NOWARN,BORROWED,SERIALUID,AV11N
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -223,7 +223,7 @@
* @param key
* the internal name of the CWAction
* @return CWAction null if it does not exist
- * @deprecated
+ * @deprecated use {@link #findAction(String)} instead
*/
@Deprecated
public Action getAction(String key) {
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ExceptionPane.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -307,7 +307,7 @@
// The message in the exception
String msg = ex.getMessage();
- if (msg == null || msg.equals("")) {
+ if (msg == null || "".equals(msg)) {
// TRANSLATOR: When an error dialog is presented to the user, this is shown when
// there is no other message available
msg = CWMsg.gettext("No description available.");
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/FontChooser.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/FontChooser.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/FontChooser.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -224,7 +224,7 @@
// We need to exclude certain fonts that cause the JVM to crash.
// BUG_PARADE(DMS): 6376296
// It will be fixed in Java 1.6 (Mustang)
- if (names[i].equals("padmaa") || names[i].equals("Rekha") || names[i].indexOf("Lohit") > -1 || names[i].indexOf("aakar") > -1)
+ if ("padmaa".equals(names[i]) || "Rekha".equals(names[i]) || names[i].indexOf("Lohit") > -1 || names[i].indexOf("aakar") > -1)
{
continue;
}
Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiConvert.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiConvert.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiConvert.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -54,7 +54,7 @@
* @return the converted data
*/
public static Font string2Font(String value) {
- if (value == null || value.equals("")) {
+ if (value == null || "".equals(value)) {
return null;
}
@@ -123,7 +123,7 @@
* @return the converted data
*/
public static Color string2Color(String value) {
- if (value == null || value.equals("")) {
+ if (value == null || "".equals(value)) {
return null;
}
Modified: trunk/jsword/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/jsword/.settings/org.eclipse.jdt.core.prefs 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/.settings/org.eclipse.jdt.core.prefs 2012-01-26 21:28:02 UTC (rev 2223)
@@ -1,4 +1,4 @@
-#Thu Dec 09 13:05:02 EST 2010
+#Thu Jan 26 16:18:13 EST 2012
eclipse.preferences.version=1
org.eclipse.jdt.core.builder.cleanOutputFolder=clean
org.eclipse.jdt.core.builder.duplicateResourceTask=warning
@@ -34,8 +34,8 @@
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
-org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,NORMAL,LOW,NORMAL,LOW,LOW,NORMAL,LOW,LOW,LOW,LOW,LOW
-org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,URGENT,PENDING,LATER,BUG,DEAD,SPEEDUP,I18N,JDK14,JDK15,NOWARN,BORROWED,SERIALUID
+org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH,NORMAL,LOW,NORMAL,LOW,LOW,NORMAL,LOW,LOW,LOW,LOW,LOW,HIGH
+org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,URGENT,PENDING,LATER,BUG,DEAD,SPEEDUP,I18N,JDK14,JDK15,NOWARN,BORROWED,SERIALUID,AV11N
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
Modified: trunk/jsword/.settings/org.eclipse.jdt.ui.prefs
===================================================================
--- trunk/jsword/.settings/org.eclipse.jdt.ui.prefs 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/.settings/org.eclipse.jdt.ui.prefs 2012-01-26 21:28:02 UTC (rev 2223)
@@ -1,10 +1,11 @@
-#Thu Dec 09 13:05:02 EST 2010
+#Sat Jan 14 09:33:07 EST 2012
eclipse.preferences.version=1
formatter_profile=_JSword Style Formatting
formatter_settings_version=11
internal.default.compliance=user
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
+org.eclipse.jdt.ui.javadoc=false
org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.overrideannotation=true
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * Distribution License\:\n * JSword is free software; you can redistribute it and/or modify it under\n * the terms of the GNU Lesser General Public License, version 2.1 as published by\n * the Free Software Foundation. This program is distributed in the hope\n * that it will be useful, but WITHOUT ANY WARRANTY; without even the\n * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n * See the GNU Lesser General Public License for more details.\n *\n * The License is available on the internet at\:\n * http\://www.gnu.org/copyleft/lgpl.html\n * or by writing to\:\n * Free Software Foundation, Inc.\n * 59 Temple Place - Suite 330\n * Boston, MA 02111-1307, USA\n *\n * Copyright\: 2007\n * The copyright to this program is held by it's authors.\n *\n * ID\: $$Id\: org.eclipse.jdt.ui.prefs 1178 2006-11-06 12\:48\:02Z dmsmith $$\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n *\n *\n * @see gnu.lgpl.License for license details.<br>\n * The copyright to this program is held by it's authors.\n * @author DM Smith [dmsmith555 at yahoo dot com]\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
+org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates><template autoinsert\="true" context\="gettercomment_context" deleted\="false" description\="Comment for getter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.gettercomment" name\="gettercomment">/**\n * @return the ${bare_field_name}\n */</template><template autoinsert\="true" context\="settercomment_context" deleted\="false" description\="Comment for setter method" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.settercomment" name\="settercomment">/**\n * @param ${param} the ${bare_field_name} to set\n */</template><template autoinsert\="true" context\="constructorcomment_context" deleted\="false" description\="Comment for created constructors" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorcomment" name\="constructorcomment">/**\n * ${tags}\n */</template><template autoinsert\="false" context\="filecomment_context" deleted\="false" description\="Comment for created Java files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.filecomment" name\="filecomment">/**\n * Distribution License\:\n * JSword is free software; you can redistribute it and/or modify it under\n * the terms of the GNU Lesser General Public License, version 2.1 as published by\n * the Free Software Foundation. This program is distributed in the hope\n * that it will be useful, but WITHOUT ANY WARRANTY; without even the\n * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n * See the GNU Lesser General Public License for more details.\n *\n * The License is available on the internet at\:\n * http\://www.gnu.org/copyleft/lgpl.html\n * or by writing to\:\n * Free Software Foundation, Inc.\n * 59 Temple Place - Suite 330\n * Boston, MA 02111-1307, USA\n *\n * Copyright\: ${year}\n * The copyright to this program is held by it's authors.\n *\n * ID\: $$Id\: org.eclipse.jdt.ui.prefs 1178 2006-11-06 12\:48\:02Z dmsmith $$\n */</template><template autoinsert\="false" context\="typecomment_context" deleted\="false" description\="Comment for created types" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.typecomment" name\="typecomment">/**\n *\n *\n * @see gnu.lgpl.License for license details.<br>\n * The copyright to this program is held by it's authors.\n * @author DM Smith [dmsmith555 at yahoo dot com]\n */</template><template autoinsert\="true" context\="fieldcomment_context" deleted\="false" description\="Comment for fields" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.fieldcomment" name\="fieldcomment">/**\n * \n */</template><template autoinsert\="true" context\="methodcomment_context" deleted\="false" description\="Comment for non-overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodcomment" name\="methodcomment">/**\n * ${tags}\n */</template><template autoinsert\="true" context\="overridecomment_context" deleted\="false" description\="Comment for overriding methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.overridecomment" name\="overridecomment">/* (non-Javadoc)\n * ${see_to_overridden}\n */</template><template autoinsert\="true" context\="delegatecomment_context" deleted\="false" description\="Comment for delegate methods" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.delegatecomment" name\="delegatecomment">/**\n * ${tags}\n * ${see_to_target}\n */</template><template autoinsert\="true" context\="newtype_context" deleted\="false" description\="Newly created files" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.newtype" name\="newtype">${filecomment}\n${package_declaration}\n\n${typecomment}\n${type_declaration}</template><template autoinsert\="true" context\="classbody_context" deleted\="false" description\="Code in new class type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.classbody" name\="classbody">\n</template><template autoinsert\="true" context\="interfacebody_context" deleted\="false" description\="Code in new interface type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.interfacebody" name\="interfacebody">\n</template><template autoinsert\="true" context\="enumbody_context" deleted\="false" description\="Code in new enum type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.enumbody" name\="enumbody">\n</template><template autoinsert\="true" context\="annotationbody_context" deleted\="false" description\="Code in new annotation type bodies" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.annotationbody" name\="annotationbody">\n</template><template autoinsert\="true" context\="catchblock_context" deleted\="false" description\="Code in new catch blocks" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.catchblock" name\="catchblock">// ${todo} Auto-generated catch block\n${exception_var}.printStackTrace();</template><template autoinsert\="true" context\="methodbody_context" deleted\="false" description\="Code in created method stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.methodbody" name\="methodbody">// ${todo} Auto-generated method stub\n${body_statement}</template><template autoinsert\="true" context\="constructorbody_context" deleted\="false" description\="Code in created constructor stubs" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.constructorbody" name\="constructorbody">${body_statement}\n// ${todo} Auto-generated constructor stub</template><template autoinsert\="true" context\="getterbody_context" deleted\="false" description\="Code in created getters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.getterbody" name\="getterbody">return ${field};</template><template autoinsert\="true" context\="setterbody_context" deleted\="false" description\="Code in created setters" enabled\="true" id\="org.eclipse.jdt.ui.text.codetemplates.setterbody" name\="setterbody">${field} \= ${param};</template></templates>
Modified: trunk/jsword/JSwordDictionary.txt
===================================================================
--- trunk/jsword/JSwordDictionary.txt 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/JSwordDictionary.txt 2012-01-26 21:28:02 UTC (rev 2223)
@@ -195,3 +195,4 @@
masoretic
nehemiah
charset
+luther
Modified: trunk/jsword/core.xml
===================================================================
--- trunk/jsword/core.xml 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/core.xml 2012-01-26 21:28:02 UTC (rev 2223)
@@ -334,6 +334,7 @@
<javac debug="on"
includes="**/*.java"
destdir="${target.classes}"
+ includeantruntime="false"
source="1.5">
<src refid="source.path"/>
<classpath refid="runtime.jarpath"/>
Modified: trunk/jsword/src/main/java/org/crosswire/common/util/Convert.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/Convert.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/Convert.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -46,11 +46,11 @@
*/
public static boolean string2Boolean(String data) {
return Boolean.valueOf(data).booleanValue()
- || data.equalsIgnoreCase("yes")
- || data.equalsIgnoreCase("ok")
- || data.equalsIgnoreCase("okay")
- || data.equalsIgnoreCase("on")
- || data.equals("1");
+ || "yes".equalsIgnoreCase(data)
+ || "ok".equalsIgnoreCase(data)
+ || "okay".equalsIgnoreCase(data)
+ || "on".equalsIgnoreCase(data)
+ || "1".equals(data);
}
/**
Modified: trunk/jsword/src/main/java/org/crosswire/common/util/EventListenerList.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/EventListenerList.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/EventListenerList.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -33,8 +33,8 @@
/**
* A class which holds a list of EventListeners. 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
+ * 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.
Modified: trunk/jsword/src/main/java/org/crosswire/common/util/MsgBase.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/MsgBase.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/MsgBase.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -34,7 +34,7 @@
* A base class for implementing type safe internationalization (i18n) that is
* easy for most cases. See {@link org.crosswire.common.util.Msg} for an example
* of how to inherit from here.
- *
+ *
* @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]
@@ -51,7 +51,7 @@
/**
* Get the internationalized text, but return key if key is unknown.
- *
+ *
* @param key
* @return the internationalized text
*/
@@ -63,7 +63,7 @@
//MessageFormat strips off all single apostrophes from the message so replace single quotes with two quotes
rawMessage = rawMessage.replaceAll("'", "''");
-
+
return shaper.shape(MessageFormat.format(rawMessage, params));
}
Modified: trunk/jsword/src/main/java/org/crosswire/common/util/Version.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/common/util/Version.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/common/util/Version.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -47,7 +47,7 @@
/**
* The default version "1.0".
*/
- public static final Version defaultVersion = new Version("1.0");
+ public static final Version DEFAULT_VERSION = new Version("1.0");
/**
* Created a version identifier from the specified string.
@@ -103,13 +103,18 @@
* @param object The <code>Version</code> object to be compared.
* @return true if the two objects are equal.
*/
- public boolean equals(Version object) {
- if (object == this) {
+ public boolean equals(Object object) {
+ if (!(object instanceof Version)) {
+ return false;
+ }
+
+ Version that = (Version) object;
+ if (that == this) {
return true;
}
for (int i = 0; i < parts.length; i++) {
- if (parts[i] != object.parts[i]) {
+ if (parts[i] != that.parts[i]) {
return false;
}
}
@@ -148,6 +153,6 @@
}
private final String original;
- private final int parts[];
+ private final int[] parts;
-}
\ No newline at end of file
+}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/SentenceUtil.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/SentenceUtil.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/SentenceUtil.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -91,7 +91,7 @@
pos = nextDDash + 2;
}
- if (temp != null && !temp.trim().equals("")) {
+ if (temp != null && !"".equals(temp.trim())) {
tokens.add(temp);
}
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/THMLFilter.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/THMLFilter.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/filter/thml/THMLFilter.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -43,14 +43,14 @@
/**
* Filter to convert THML to OSIS format.
- *
+ *
* <p>
* I used the THML ref page: <a
* href="http://www.ccel.org/ThML/ThML1.04.htm">http
* ://www.ccel.org/ThML/ThML1.04.htm</a> to work out what the tags meant.
- *
+ *
* LATER(joe): check nesting on these THML elements
- *
+ *
* @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]
@@ -155,7 +155,7 @@
} catch (RuntimeException e) {
// Catch everything else so that we handle the exception properly within a Sw*ng callback
ex = e;
- }
+ }
errorMessage = failMessage;
error = ex;
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/readings/ReadingsBook.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/readings/ReadingsBook.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/readings/ReadingsBook.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -136,8 +136,9 @@
}
try {
+ // AV11N(DMS): Is this right?
PassageKeyFactory keyf = PassageKeyFactory.instance();
- Passage ref = (Passage) keyf.getKey(Versifications.instance().getVersification("KJV"), readings);
+ Passage ref = (Passage) keyf.getKey(Versifications.instance().getDefaultVersification(), readings);
Element list = OSISUtil.factory().createList();
content.add(list);
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryTable.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -613,7 +613,7 @@
// At the moment only the KJV is supported.
String v11n = (String) getValue(ConfigEntryType.VERSIFICATION);
- if (! Versifications.instance().isDefined(v11n)) {
+ if (!Versifications.instance().isDefined(v11n)) {
supported = false;
return;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/ConfigEntryType.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -193,7 +193,8 @@
"OSISRedLetterWords",
"OSISLemma",
"OSISRuby"
- ) {
+ )
+ {
@Override
public boolean mayRepeat() {
return true;
@@ -267,7 +268,8 @@
OSIS_Q_TO_TICK("OSISqToTick", 0,
"true",
"false"
- ) {
+ )
+ {
@Override
public Object convert(String input) {
return Boolean.valueOf(input);
@@ -286,7 +288,8 @@
"DailyDevotion",
"Glossary",
"Images"
- ) {
+ )
+ {
@Override
public boolean mayRepeat() {
return true;
@@ -413,7 +416,8 @@
"Commentaries",
"Lexicons / Dictionaries",
"Generic Books"
- ) {
+ )
+ {
@Override
public Object convert(String input) {
return BookCategory.fromString(input);
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookPath.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookPath.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/book/sword/SwordBookPath.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -369,7 +369,7 @@
* The download directory that the user specifies.
*/
public static void setDownloadDir(File dlDir) {
- if (!dlDir.getPath().equals("")) {
+ if (!"".equals(dlDir.getPath())) {
overrideDownloadDir = dlDir;
log.debug("Setting sword download directory to: " + dlDir);
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/index/IndexStatus.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/index/IndexStatus.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/index/IndexStatus.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -68,7 +68,7 @@
* Lookup method to convert from a String
*/
public static IndexStatus fromString(String name) {
- for (IndexStatus o: IndexStatus.values()) {
+ for (IndexStatus o : IndexStatus.values()) {
if (o.name.equalsIgnoreCase(name)) {
return o;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/AbstractPassage.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -377,8 +377,8 @@
* @see org.crosswire.jsword.passage.Passage#versesInPassage(int, int)
*/
public int versesInPassage(BibleBook book, int chapter) throws NoSuchVerseException {
- if (book != null) {
- getVersification().validate(book, chapter == 0 ? 1 : chapter, 1);
+ if (book != null) {
+ getVersification().validate(book, chapter == 0 ? 1 : chapter, 1);
}
int verse_count = 0;
@@ -1012,6 +1012,7 @@
* @return The VerseRange
* @exception java.lang.ClassCastException
* If this is not a Verse or a VerseRange
+ * @deprecated use {@link #toVerseRange(Versification, String)} instead
*/
@Deprecated
protected static VerseRange toVerseRange(Object base) throws ClassCastException {
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/KeyUtil.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/KeyUtil.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/KeyUtil.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -73,7 +73,8 @@
return ref.getVerseAt(0);
}
- Versification v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ Versification v11n = Versifications.instance().getDefaultVersification();
try {
return VerseFactory.fromString(v11n, key.getName());
} catch (NoSuchVerseException ex) {
@@ -97,7 +98,8 @@
}
Key ref = null;
- Versification v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ Versification v11n = Versifications.instance().getDefaultVersification();
try {
ref = keyf.getKey(v11n, key.getName());
} catch (NoSuchKeyException ex) {
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageEvent.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageEvent.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageEvent.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -36,6 +36,9 @@
*/
public class PassageEvent extends EventObject {
+ /**
+ * Indicates what kind of change happened to a Passage.
+ */
public enum EventType {
/**
* Identifies one or more changes in the lists contents.
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageKeyFactory.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageKeyFactory.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageKeyFactory.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -241,7 +241,8 @@
* If the buffer is invalid
*/
static Passage fromBinaryRepresentation(byte[] buffer) throws NoSuchVerseException {
- Versification rs = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ Versification rs = Versifications.instance().getDefaultVersification();
int maxOrdinal = rs.maximumOrdinal();
Passage ref = (Passage) keyf.createEmptyKeyList(rs);
@@ -316,7 +317,8 @@
* if the data was not a valid passage
*/
public static Passage readPassage(Reader in) throws IOException, NoSuchVerseException {
- Versification rs = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ Versification rs = Versifications.instance().getDefaultVersification();
Passage ref = (Passage) keyf.createEmptyKeyList(rs);
ref.readDescription(in);
return ref;
@@ -547,10 +549,11 @@
static {
try {
- whole = new ReadOnlyPassage(defaultType.createPassage(Versifications.instance().getVersification("KJV"), "Gen 1:1-Rev 22:21"), true);
+ // AV11N(DMS): Is this right?
+ whole = new ReadOnlyPassage(defaultType.createPassage(Versifications.instance().getDefaultVersification(), "Gen 1:1-Rev 22:21"), true);
} catch (NoSuchKeyException ex) {
assert false : ex;
- whole = defaultType.createEmptyPassage(Versifications.instance().getVersification("KJV"));
+ whole = defaultType.createEmptyPassage(Versifications.instance().getDefaultVersification());
}
}
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageTally.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageTally.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/PassageTally.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -765,6 +765,9 @@
readObjectSupport(in);
}
+ /**
+ * Indicates how this PassageTally is to order it's Verses.
+ */
public enum Order {
/**
* Sort in Biblical order
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/RestrictionType.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/RestrictionType.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/RestrictionType.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -78,7 +78,7 @@
@Override
public VerseRange blur(Versification v11n, VerseRange range, int blurDown, int blurUp) {
- Versification rs = Versifications.instance().getVersification("KJV");
+ Versification rs = range.getVersification();
Verse start = range.getStart();
BibleBook startBook = start.getBook();
@@ -111,7 +111,8 @@
BibleBook book = verse.getBook();
int chapterNumber = verse.getChapter();
- int up = Math.min(verseNumber + blurUp, Versifications.instance().getVersification("KJV").getLastVerse(book, chapterNumber)) - verseNumber;
+ // AV11N(DMS): Is this right?
+ int up = Math.min(verseNumber + blurUp, Versifications.instance().getDefaultVersification().getLastVerse(book, chapterNumber)) - verseNumber;
Verse end = verse;
if (up > 0) {
end = verse.add(up);
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/Verse.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/Verse.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/Verse.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -304,7 +304,8 @@
* @return The new Verse
*/
public Verse subtract(int n) {
- return Versifications.instance().getVersification("KJV").subtract(this, n);
+ // AV11N(DMS): deprecate?
+ return Versifications.instance().getDefaultVersification().subtract(this, n);
}
/**
@@ -315,7 +316,8 @@
* @return The new verse
*/
public Verse add(int n) {
- return Versifications.instance().getVersification("KJV").add(this, n);
+ // AV11N(DMS): deprecate?
+ return Versifications.instance().getDefaultVersification().add(this, n);
}
/**
@@ -360,7 +362,8 @@
* @return true or false ...
*/
public boolean isEndOfChapter() {
- return Versifications.instance().getVersification("KJV").isEndOfChapter(this);
+ // AV11N(DMS): deprecate?
+ return Versifications.instance().getDefaultVersification().isEndOfChapter(this);
}
/**
@@ -378,7 +381,8 @@
* @return true or false ...
*/
public boolean isEndOfBook() {
- return Versifications.instance().getVersification("KJV").isEndOfBook(this);
+ // AV11N(DMS): deprecate?
+ return Versifications.instance().getDefaultVersification().isEndOfBook(this);
}
/**
@@ -410,7 +414,8 @@
* @return The verse number
*/
public int getOrdinal() {
- return Versifications.instance().getVersification("KJV").getOrdinal(this);
+ // AV11N(DMS): deprecate?
+ return Versifications.instance().getDefaultVersification().getOrdinal(this);
}
/**
@@ -487,7 +492,8 @@
*/
private String doGetName(Verse verseBase) {
// To cope with thing like Jude 2...
- if (Versifications.instance().getVersification("KJV").getLastChapter(book) == 1) {
+ // AV11N(DMS): move to Versification???
+ if (Versifications.instance().getDefaultVersification().getLastChapter(book) == 1) {
if (verseBase == null || verseBase.book != book) {
return book.getPreferredName() + Verse.VERSE_PREF_DELIM1 + verse;
}
@@ -537,7 +543,8 @@
* The verse to set
*/
private void setAndPatch(BibleBook book, int chapter, int verse) {
- Versification v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): deprecate?
+ Versification v11n = Versifications.instance().getDefaultVersification();
Verse patched = v11n.patch(book, chapter, verse);
this.book = patched.book;
@@ -569,7 +576,8 @@
* The ordinal of the verse
*/
private void set(int ordinal) {
- Versification v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): deprecate?
+ Versification v11n = Versifications.instance().getDefaultVersification();
Verse v = v11n.decodeOrdinal(ordinal);
book = v.book;
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseFactory.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseFactory.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseFactory.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -48,6 +48,7 @@
* @return the Verse representation of the string
* @exception NoSuchVerseException
* If the text can not be understood
+ * @deprecated use {@link #fromString(Versification, String)} instead
*/
@Deprecated
public static Verse fromString(String original) throws NoSuchVerseException {
@@ -75,6 +76,7 @@
* @return the verse representation of the string
* @exception NoSuchVerseException
* If the reference is illegal
+ * @deprecated use {@link #fromString(Versification, String, VerseRange)} instead
*/
@Deprecated
public static Verse fromString(String original, VerseRange verseRangeBasis) throws NoSuchVerseException {
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRange.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRange.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRange.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -51,6 +51,7 @@
* The default VerseRange is a single verse - Genesis 1:1. I didn't want to
* provide this constructor however, you are supposed to provide a default
* ctor for all beans. For this reason I suggest you don't use it.
+ * @deprecated use {@link #VerseRange(Versification)} instead
*/
@Deprecated
public VerseRange() {
@@ -63,12 +64,18 @@
*
* @param start
* The verse to start from
+ * @deprecated use {@link #VerseRange(Versification, Verse)} instead
*/
@Deprecated
public VerseRange(Verse start) {
this(null, null, start, start);
}
+ /**
+ * @param start
+ * @param end
+ * @deprecated use {@link #VerseRange(Versification, Verse, Verse)} instead
+ */
@Deprecated
public VerseRange(Verse start, Verse end) {
this(null, null, start, end);
@@ -107,6 +114,7 @@
* The verse to start from
* @param end
* The verse to end with
+ * @deprecated use {@link #VerseRange(Versification, String, Verse, Verse)} instead
*/
@Deprecated
/* package */VerseRange(String original, Verse start, Verse end) {
@@ -119,7 +127,7 @@
v11n = rs;
if (v11n == null) {
- v11n = Versifications.instance().getVersification("KJV");
+ v11n = Versifications.instance().getDefaultVersification();
}
this.originalName = original;
@@ -374,6 +382,7 @@
* How many chapters in this range
*
* @return The number of chapters. Always >= 1.
+ * @deprecated use {@link org.crosswire.jsword.versification.Versification#getChapterCount(Verse, Verse)} instead
*/
@Deprecated
public int getChapterCount() {
@@ -384,6 +393,7 @@
* How many books in this range
*
* @return The number of books. Always >= 1.
+ * @deprecated use {@link org.crosswire.jsword.versification.Versification#getBookCount(Verse, Verse)} instead
*/
@Deprecated
public int getBookCount() {
@@ -905,7 +915,8 @@
* @serialData Write the ordinal number of this verse
*/
private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException {
- Versification rs = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Is this right?
+ Versification rs = Versifications.instance().getDefaultVersification();
// Call even if there is no default serializable fields.
in.defaultReadObject();
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRangeFactory.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRangeFactory.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRangeFactory.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -50,6 +50,7 @@
* The textual representation
* @exception NoSuchVerseException
* If the text can not be understood
+ * @deprecated use {@link #fromString(Versification, String)} instead
*/
@Deprecated
public static VerseRange fromString(String orginal) throws NoSuchVerseException {
@@ -80,6 +81,7 @@
* original.
* @exception NoSuchVerseException
* If the reference is illegal
+ * @deprecated use {@link #fromString(Versification, String, VerseRange)} instead
*/
@Deprecated
public static VerseRange fromString(String original, VerseRange basis) throws NoSuchVerseException {
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBook.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBook.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBook.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -27,7 +27,11 @@
/**
* A BibleBook is a book of the Bible. It may or may not be canonical.
- * Note that the ordering of these books varies from one Versification to another.
+ * Note that the ordering of these books varies from one Versification to another.
+ *
+ * @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]
*/
public enum BibleBook {
// JSword introduction to the Bible
@@ -153,7 +157,7 @@
T12PATR_TISS("T12Patr.TIss"),
T12PATR_TJOS("T12Patr.TJos"),
T12PATR_TJUD("T12Patr.TJud"),
- T12PATR_TLEVI("T12Patr.TLevi"),
+ T12PATR_TLEVI("T12Patr.TLevi"),
T12PATR_TNAPH("T12Patr.TNaph"),
T12PATR_TREU("T12Patr.TReu"),
T12PATR_TSIM("T12Patr.TSim"),
@@ -170,8 +174,7 @@
// Other books
ADD_DAN("AddDan"),
ADD_PS("AddPs"),
- ESTH_GR("EsthGr"),
- ;
+ ESTH_GR("EsthGr");
BibleBook(String osis) {
this.osis = osis;
@@ -179,7 +182,7 @@
/**
* Get the OSIS representation of this BibleBook.
- *
+ *
* @return the OSIS name
*/
public String getOSIS() {
@@ -188,7 +191,7 @@
/**
* Get the OSIS representation of this BibleBook.
- *
+ *
* @return the OSIS name
*/
@Override
@@ -198,7 +201,7 @@
/**
* Case insensitive search for BibleBook for an OSIS name.
- *
+ *
* @param osis
* @return the matching BibleBook or null
*/
@@ -209,7 +212,7 @@
/**
* Get the BookName.
- *
+ *
* @param book
* The book of the Bible
* @return The requested BookName
@@ -221,7 +224,7 @@
/**
* Get the preferred name of a book. Altered by the case setting (see
* setBookCase() and isFullBookName())
- *
+ *
* @param book
* The book of the Bible
* @return The full name of the book
@@ -233,7 +236,7 @@
/**
* Get the full name of a book (e.g. "Genesis"). Altered by the case setting
* (see setBookCase())
- *
+ *
* @param book
* The book of the Bible
* @return The full name of the book
@@ -245,7 +248,7 @@
/**
* Get the short name of a book (e.g. "Gen"). Altered by the case setting
* (see setBookCase())
- *
+ *
* @param book
* The book of the Bible
* @return The short name of the book
@@ -256,7 +259,7 @@
/**
* Get a book from its name.
- *
+ *
* @param find
* The string to identify
* @return The BibleBook, On error null
@@ -280,7 +283,7 @@
/**
* Is the given string a valid book name. If this method returns true then
* getBook() will return a BibleBook and not null.
- *
+ *
* @param find
* The string to identify
* @return true when the book name is recognized
@@ -308,7 +311,7 @@
/**
* This is simply a convenience function to wrap Character.isLetter()
- *
+ *
* @param text
* The string to be parsed
* @return true if the string contains letters
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBookList.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBookList.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleBookList.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -45,7 +45,7 @@
/**
* Does this Versification contain the BibleBook.
- *
+ *
* @param book
* @return true if it is present.
*/
@@ -58,7 +58,7 @@
* The first book is 0, the next is 1 and so forth.
* If the BibleBook is not in this Reference System,
* then the return value of this routine is -1.
- *
+ *
* @param book
* return the ordinal value of the book or -1 if not present
*/
@@ -78,7 +78,7 @@
* Get the BibleBook by its position in this Versification.
* If the position is negative, return the first book.
* If the position is greater than the last, return the last book.
- *
+ *
* @param ordinal
* @return the indicated book
*/
@@ -95,13 +95,13 @@
/**
* Get the BibleBooks in this Versification.
- *
+ *
* @return an Iterator over the books
*/
public Iterator<BibleBook> iterator() {
return new Iterator<BibleBook>() {
- BibleBook nextBook = books[0];
+ private BibleBook nextBook = books[0];
@Override
public boolean hasNext() {
@@ -124,13 +124,13 @@
public void remove() {
throw new UnsupportedOperationException();
}
-
+
};
}
/**
* Return the first book in the list.
- *
+ *
* @return the first book in the list
*/
public BibleBook getFirstBook() {
@@ -139,7 +139,7 @@
/**
* Return the first book in the list.
- *
+ *
* @return the first book in the list
*/
public BibleBook getLastBook() {
@@ -186,7 +186,7 @@
for (BibleBook b : BibleBook.values()) {
bookMap[b.ordinal()] = -1;
}
-
+
// Fill in the position of the books into that list
for (int i = 0; i < books.length; i++) {
bookMap[books[i].ordinal()] = i;
@@ -194,9 +194,9 @@
}
private BibleBook[] books;
-
+
/** The bookMap maps from a BibleBook to the position that book has in <code>books</code>. */
- private int bookMap[];
+ private int[] bookMap;
/**
* Serialization ID
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleInfo.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -34,22 +34,27 @@
* of the KJV Bible. It is not true of other versifications such as Luther's.
* </p>
*
- * @deprecated Use Versifications.getVersification("KJV") instead.
+ * @deprecated Use Versifications.instance().getDefaultVersification() instead.
*
* @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]
*/
+ at Deprecated
public final class BibleInfo {
/**
* constant for the old testament
+ * @deprecated use {@link Testament#OLD} instead.
*/
+ @Deprecated
public static final int TESTAMENT_OLD = 0;
/**
* constant for the new testament
+ * @deprecated use {@link Testament#NEW} instead.
*/
+ @Deprecated
public static final int TESTAMENT_NEW = 1;
/**
@@ -62,7 +67,10 @@
* Get the immediately following book in the current versification.
* @param book
* @return the next book or null if no following book
+ * @deprecated use Versification.getBooks().getNextBook(BibleBook) instead
+ * see {@link Versification#getBooks()} and {@link BibleBookList#getNextBook(BibleBook)}.
*/
+ @Deprecated
public static BibleBook getNextBook(BibleBook book) {
return v11n.getBooks().getNextBook(book);
}
@@ -71,7 +79,10 @@
* Get the immediately prior book in the current versification.
* @param book
* @return the previous book or null if no previous book
+ * @deprecated use Versification.getBooks().getPreviousBook(BibleBook) instead
+ * see {@link Versification#getBooks()} and {@link BibleBookList#getPreviousBook(BibleBook)}.
*/
+ @Deprecated
public static BibleBook getPreviousBook(BibleBook book) {
return v11n.getBooks().getPreviousBook(book);
}
@@ -81,7 +92,9 @@
* This includes the 3 introductions.
*
* @return the array of books
+ * @deprecated use {@link Versification#getBooks()} instead
*/
+ @Deprecated
public static BibleBook[] getBooks() {
return BibleBook.getBooks();
}
@@ -92,7 +105,9 @@
* @param book
* The book part of the reference.
* @return The last valid chapter number for a book.
+ * @deprecated use {@link Versification#getLastChapter(BibleBook)} instead
*/
+ @Deprecated
public static int chaptersInBook(BibleBook book) {
return v11n.getLastChapter(book);
}
@@ -106,7 +121,9 @@
* The current chapter
* @return The last valid verse number for a chapter
* If the book or chapter number is not valid
+ * @deprecated use {@link Versification#getLastVerse(BibleBook, int)} instead
*/
+ @Deprecated
public static int versesInChapter(BibleBook book, int chapter) {
return v11n.getLastVerse(book, chapter);
}
@@ -115,7 +132,9 @@
* The maximum number of verses in the Bible, including module, testament, book and chapter introductions.
*
* @return the number of addressable verses in this versification.
+ * @deprecated use {@link Versification#maximumOrdinal()} instead
*/
+ @Deprecated
public static int maximumOrdinal() {
return v11n.maximumOrdinal();
}
@@ -145,7 +164,9 @@
* @param verse
* The verse to convert
* @return The ordinal number of verses
+ * @deprecated use {@link Versification#getOrdinal()} instead
*/
+ @Deprecated
public static int getOrdinal(Verse verse) {
return v11n.getOrdinal(verse);
}
@@ -175,14 +196,18 @@
* @param verse
* The verse to convert
* @return The ordinal number of verses
+ * @deprecated use {@link Versification#getTestamentOrdinal()} instead
*/
+ @Deprecated
public static int getTestamentOrdinal(int ordinal) {
return v11n.getTestamentOrdinal(ordinal);
}
/**
* Get the testament of a given verse
+ * @deprecated use {@link Versification#getTestament(int)} instead
*/
+ @Deprecated
public static Testament getTestament(int ordinal) {
return v11n.getTestament(ordinal);
}
@@ -192,7 +217,9 @@
*
* @param testament The testament to count. If null, then all testaments.
* @return the number of verses in the testament
+ * @deprecated use {@link Versification#getCount(Testament)} instead
*/
+ @Deprecated
public static int getCount(Testament testament) {
return v11n.getCount(testament);
}
@@ -205,7 +232,9 @@
* @return A Verse
* @exception NoSuchVerseException
* If the reference is illegal
+ * @deprecated use {@link Versification#decodeOrdinal(int)} instead
*/
+ @Deprecated
public static Verse decodeOrdinal(int ordinal) {
return v11n.decodeOrdinal(ordinal);
}
@@ -224,7 +253,9 @@
* The verse part of the reference.
* @exception NoSuchVerseException
* If the reference is illegal
+ * @deprecated use {@link Versification#validate(BibleBook, int, int)} instead
*/
+ @Deprecated
public static void validate(BibleBook book, int chapter, int verse) throws NoSuchVerseException {
v11n.validate(book, chapter, verse);
}
@@ -256,7 +287,9 @@
* @param chapter the supposed chapter
* @param verse the supposed verse
* @return The resultant verse.
+ * @deprecated use {@link Versification#patch(BibleBook, int, int)} instead
*/
+ @Deprecated
public static Verse patch(BibleBook book, int chapter, int verse) {
return v11n.patch(book, chapter, verse);
}
@@ -265,393 +298,16 @@
* Count the books in the Bible.
*
* @return The number of books in the Bible, including the three introductions
+ * @deprecated use {@link Versification#getBooks()} and {@link BibleBookList#getBookCount()} instead
*/
+ @Deprecated
public static int booksInBible() {
return v11n.getBooks().getBookCount();
}
- /** The OSIS name of the reference system. */
- public static String osisName = "KJV";
- public static Versification v11n = Versifications.instance().getVersification(osisName);
+ private static Versification v11n = Versifications.instance().getDefaultVersification();
/**
- * Constant for the ordinal number of the first verse in each chapter.
- */
- public static final int[][] kjvChapterStarts =
- {
- // Bible Introduction
- {
- 0,
- },
- // Old Testament Introduction
- {
- 1,
- },
- // Gen
- {
- 2, 3, 35, 61, 86, 113, 146, 169, 194, 217,
- 247, 280, 313, 334, 353, 378, 400, 417, 445, 479,
- 518, 537, 572, 597, 618, 686, 721, 757, 804, 827,
- 863, 907, 963, 996, 1017, 1049, 1079, 1123, 1160, 1191,
- 1215, 1239, 1297, 1336, 1371, 1406, 1435, 1470, 1502, 1525,
- 1559,
- },
- // Exod
- {
- 1586, 1587, 1610, 1636, 1659, 1691, 1715, 1746, 1772, 1805,
- 1841, 1871, 1882, 1934, 1957, 1989, 2017, 2054, 2071, 2099,
- 2125, 2152, 2189, 2221, 2255, 2274, 2315, 2353, 2375, 2419,
- 2466, 2505, 2524, 2560, 2584, 2620, 2656, 2695, 2725, 2757,
- 2801,
- },
- // Lev
- {
- 2840, 2841, 2859, 2876, 2894, 2930, 2950, 2981, 3020, 3057,
- 3082, 3103, 3151, 3160, 3220, 3278, 3312, 3347, 3364, 3395,
- 3433, 3461, 3486, 3520, 3565, 3589, 3645, 3692,
- },
- // Num
- {
- 3727, 3728, 3783, 3818, 3870, 3920, 3952, 3980, 4070, 4097,
- 4121, 4158, 4194, 4211, 4245, 4291, 4333, 4384, 4398, 4431,
- 4454, 4484, 4520, 4562, 4593, 4619, 4638, 4704, 4728, 4760,
- 4801, 4818, 4873, 4916, 4973, 5003, 5038,
- },
- // Deut
- {
- 5052, 5053, 5100, 5138, 5168, 5218, 5252, 5278, 5305, 5326,
- 5356, 5379, 5412, 5445, 5464, 5494, 5518, 5541, 5562, 5585,
- 5607, 5628, 5652, 5683, 5709, 5732, 5752, 5772, 5799, 5868,
- 5898, 5919, 5950, 6003, 6033,
- },
- // Josh
- {
- 6046, 6047, 6066, 6091, 6109, 6134, 6150, 6178, 6205, 6241,
- 6269, 6313, 6337, 6362, 6396, 6412, 6476, 6487, 6506, 6535,
- 6587, 6597, 6643, 6678, 6695,
- },
- // Judg
- {
- 6729, 6730, 6767, 6791, 6823, 6848, 6880, 6921, 6947, 6983,
- 7041, 7060, 7101, 7117, 7143, 7164, 7185, 7217, 7231, 7263,
- 7294, 7343,
- },
- // Ruth
- {
- 7369, 7370, 7393, 7417, 7436,
- },
- // 1Sam
- {
- 7459, 7460, 7489, 7526, 7548, 7571, 7584, 7606, 7624, 7647,
- 7675, 7703, 7719, 7745, 7769, 7822, 7858, 7882, 7941, 7972,
- 7997, 8040, 8056, 8080, 8110, 8133, 8178, 8204, 8217, 8243,
- 8255, 8287,
- },
- // 2Sam
- {
- 8301, 8302, 8330, 8363, 8403, 8416, 8442, 8466, 8496, 8515,
- 8529, 8549, 8577, 8609, 8649, 8683, 8721, 8745, 8775, 8809,
- 8853, 8880, 8903, 8955, 8995,
- },
- // 1Kgs
- {
- 9021, 9022, 9076, 9123, 9152, 9187, 9206, 9245, 9297, 9364,
- 9393, 9423, 9467, 9501, 9536, 9568, 9603, 9638, 9663, 9710,
- 9732, 9776, 9806,
- },
- // 2Kgs
- {
- 9860, 9861, 9880, 9906, 9934, 9979, 10007, 10041, 10062, 10092,
- 10130, 10167, 10189, 10211, 10237, 10267, 10306, 10327, 10369, 10407,
- 10445, 10467, 10494, 10515, 10553, 10574,
- },
- // 1Chr
- {
- 10605, 10606, 10661, 10717, 10742, 10786, 10813, 10895, 10936, 10977,
- 11022, 11037, 11085, 11126, 11141, 11159, 11189, 11233, 11261, 11279,
- 11299, 11308, 11339, 11359, 11392, 11424, 11456, 11489, 11524, 11546,
- },
- // 2Chr
- {
- 11577, 11578, 11596, 11615, 11633, 11656, 11671, 11714, 11737, 11756,
- 11788, 11808, 11832, 11849, 11872, 11888, 11908, 11923, 11943, 11978,
- 11990, 12028, 12049, 12062, 12084, 12112, 12141, 12165, 12175, 12203,
- 12240, 12268, 12290, 12324, 12350, 12384, 12412,
- },
- // Ezra
- {
- 12436, 12437, 12449, 12520, 12534, 12559, 12577, 12600, 12629, 12666,
- 12682,
- },
- // Neh
- {
- 12727, 12728, 12740, 12761, 12794, 12818, 12838, 12858, 12932, 12951,
- 12990, 13030, 13067, 13115,
- },
- // Esth
- {
- 13147, 13148, 13171, 13195, 13211, 13229, 13244, 13259, 13270, 13288,
- 13321,
- },
- // Job
- {
- 13325, 13326, 13349, 13363, 13390, 13412, 13440, 13471, 13493, 13516,
- 13552, 13575, 13596, 13622, 13651, 13674, 13710, 13733, 13750, 13772,
- 13802, 13832, 13867, 13898, 13916, 13942, 13949, 13964, 13988, 14017,
- 14043, 14075, 14116, 14139, 14173, 14211, 14228, 14262, 14287, 14329,
- 14360, 14385, 14420,
- },
- // Ps
- {
- 14438, 14439, 14446, 14459, 14468, 14477, 14490, 14501, 14519, 14529,
- 14550, 14569, 14577, 14586, 14593, 14601, 14607, 14619, 14635, 14686,
- 14701, 14711, 14725, 14757, 14764, 14775, 14798, 14811, 14826, 14836,
- 14848, 14861, 14886, 14898, 14921, 14944, 14973, 14986, 15027, 15050,
- 15064, 15082, 15096, 15108, 15114, 15141, 15159, 15171, 15181, 15196,
- 15217, 15241, 15261, 15271, 15278, 15286, 15310, 15324, 15336, 15348,
- 15366, 15379, 15388, 15401, 15413, 15424, 15438, 15459, 15467, 15503,
- 15540, 15546, 15571, 15592, 15621, 15645, 15656, 15669, 15690, 15763,
- 15777, 15797, 15814, 15823, 15842, 15855, 15869, 15887, 15895, 15914,
- 15967, 15985, 16002, 16018, 16024, 16048, 16060, 16074, 16087, 16097,
- 16107, 16113, 16122, 16151, 16174, 16210, 16256, 16305, 16349, 16363,
- 16395, 16403, 16414, 16425, 16435, 16444, 16463, 16483, 16486, 16516,
- 16693, 16701, 16710, 16720, 16725, 16734, 16740, 16747, 16753, 16760,
- 16769, 16778, 16782, 16801, 16805, 16809, 16831, 16858, 16868, 16877,
- 16902, 16916, 16927, 16935, 16948, 16964, 16986, 16997, 17018, 17033,
- 17043,
- },
- // Prov
- {
- 17050, 17051, 17085, 17108, 17144, 17172, 17196, 17232, 17260, 17297,
- 17316, 17349, 17381, 17410, 17436, 17472, 17506, 17540, 17569, 17594,
- 17624, 17655, 17687, 17717, 17753, 17788, 17817, 17846, 17874, 17903,
- 17931, 17965,
- },
- // Eccl
- {
- 17997, 17998, 18017, 18044, 18067, 18084, 18105, 18118, 18148, 18166,
- 18185, 18206, 18217,
- },
- // Song
- {
- 18232, 18233, 18251, 18269, 18281, 18298, 18315, 18329, 18343,
- },
- // Isa
- {
- 18358, 18359, 18391, 18414, 18441, 18448, 18479, 18493, 18519, 18542,
- 18564, 18599, 18616, 18623, 18646, 18679, 18689, 18704, 18719, 18727,
- 18753, 18760, 18778, 18804, 18823, 18847, 18860, 18882, 18896, 18926,
- 18951, 18985, 18995, 19016, 19041, 19059, 19070, 19093, 19132, 19155,
- 19164, 19196, 19226, 19252, 19281, 19310, 19336, 19350, 19366, 19389,
- 19416, 19428, 19452, 19468, 19481, 19499, 19513, 19526, 19548, 19563,
- 19585, 19608, 19620, 19633, 19653, 19666, 19692,
- },
- // Jer
- {
- 19717, 19718, 19738, 19776, 19802, 19834, 19866, 19897, 19932, 19955,
- 19982, 20008, 20032, 20050, 20078, 20101, 20123, 20145, 20173, 20197,
- 20213, 20232, 20247, 20278, 20319, 20330, 20369, 20394, 20417, 20435,
- 20468, 20493, 20534, 20579, 20606, 20629, 20649, 20682, 20704, 20733,
- 20752, 20769, 20788, 20811, 20825, 20856, 20862, 20891, 20899, 20947,
- 20987, 21034, 21099,
- },
- // Lam
- {
- 21134, 21135, 21158, 21181, 21248, 21271,
- },
- // Ezek
- {
- 21294, 21295, 21324, 21335, 21363, 21381, 21399, 21414, 21442, 21461,
- 21473, 21496, 21522, 21551, 21575, 21599, 21608, 21672, 21697, 21730,
- 21745, 21795, 21828, 21860, 21910, 21938, 21956, 21978, 22015, 22042,
- 22064, 22091, 22110, 22143, 22177, 22209, 22225, 22264, 22293, 22317,
- 22347, 22397, 22424, 22445, 22473, 22505, 22531, 22556, 22580,
- },
- // Dan
- {
- 22616, 22617, 22639, 22689, 22720, 22758, 22790, 22819, 22848, 22876,
- 22904, 22926, 22972,
- },
- // Hos
- {
- 22986, 22987, 22999, 23023, 23029, 23049, 23065, 23077, 23094, 23109,
- 23127, 23143, 23156, 23171, 23188,
- },
- // Joel
- {
- 23198, 23199, 23220, 23253,
- },
- // Amos
- {
- 23275, 23276, 23292, 23309, 23325, 23339, 23367, 23382, 23400, 23415,
- },
- // Obad
- {
- 23431, 23432,
- },
- // Jonah
- {
- 23454, 23455, 23473, 23484, 23495,
- },
- // Mic
- {
- 23507, 23508, 23525, 23539, 23552, 23566, 23582, 23599,
- },
- // Nah
- {
- 23620, 23621, 23637, 23651,
- },
- // Hab
- {
- 23671, 23672, 23690, 23711,
- },
- // Zeph
- {
- 23731, 23732, 23751, 23767,
- },
- // Hag
- {
- 23788, 23789, 23805,
- },
- // Zech
- {
- 23829, 23830, 23852, 23866, 23877, 23892, 23904, 23920, 23935, 23959,
- 23977, 23990, 24008, 24023, 24033,
- },
- // Mal
- {
- 24055, 24056, 24071, 24089, 24108,
- },
- // NT Testament Introduction
- {
- 24115,
- },
- // Matt
- {
- 24116, 24117, 24143, 24167, 24185, 24211, 24260, 24295, 24325, 24360,
- 24399, 24442, 24473, 24524, 24583, 24620, 24660, 24689, 24717, 24753,
- 24784, 24819, 24866, 24913, 24953, 25005, 25052, 25128, 25195,
- },
- // Mark
- {
- 25216, 25217, 25263, 25292, 25328, 25370, 25414, 25471, 25509, 25548,
- 25599, 25652, 25686, 25731, 25769, 25842, 25890,
- },
- // Luke
- {
- 25911, 25912, 25993, 26046, 26085, 26130, 26170, 26220, 26271, 26328,
- 26391, 26434, 26489, 26549, 26585, 26621, 26654, 26686, 26724, 26768,
- 26817, 26865, 26904, 26976, 27033,
- },
- // John
- {
- 27087, 27088, 27140, 27166, 27203, 27258, 27306, 27378, 27432, 27492,
- 27534, 27577, 27635, 27686, 27725, 27757, 27785, 27819, 27846, 27887,
- 27930, 27962,
- },
- // Acts
- {
- 27988, 27989, 28016, 28064, 28091, 28129, 28172, 28188, 28249, 28290,
- 28334, 28383, 28414, 28440, 28493, 28522, 28564, 28605, 28640, 28669,
- 28711, 28750, 28791, 28822, 28858, 28886, 28914, 28947, 28992,
- },
- // Rom
- {
- 29024, 29025, 29058, 29088, 29120, 29146, 29168, 29192, 29218, 29258,
- 29292, 29314, 29351, 29373, 29388, 29412, 29446,
- },
- // 1Cor
- {
- 29474, 29475, 29507, 29524, 29548, 29570, 29584, 29605, 29646, 29660,
- 29688, 29722, 29757, 29789, 29803, 29844, 29903,
- },
- // 2Cor
- {
- 29928, 29929, 29954, 29972, 29991, 30010, 30032, 30051, 30068, 30093,
- 30109, 30128, 30162, 30184,
- },
- // Gal
- {
- 30199, 30200, 30225, 30247, 30277, 30309, 30336,
- },
- // Eph
- {
- 30355, 30356, 30380, 30403, 30425, 30458, 30492,
- },
- // Phil
- {
- 30517, 30518, 30549, 30580, 30602,
- },
- // Col
- {
- 30626, 30627, 30657, 30681, 30707,
- },
- // 1Thess
- {
- 30726, 30727, 30738, 30759, 30773, 30792,
- },
- // 2Thess
- {
- 30821, 30822, 30835, 30853,
- },
- // 1Tim
- {
- 30872, 30873, 30894, 30910, 30927, 30944, 30970,
- },
- // 2Tim
- {
- 30992, 30993, 31012, 31039, 31057,
- },
- // Titus
- {
- 31080, 31081, 31098, 31114,
- },
- // Phlm
- {
- 31130, 31131,
- },
- // Heb
- {
- 31157, 31158, 31173, 31192, 31212, 31229, 31244, 31265, 31294, 31308,
- 31337, 31377, 31418, 31448,
- },
- // Jas
- {
- 31474, 31475, 31503, 31530, 31549, 31567,
- },
- // 1Pet
- {
- 31588, 31589, 31615, 31641, 31664, 31684,
- },
- // 2Pet
- {
- 31699, 31700, 31722, 31745,
- },
- // 1John
- {
- 31764, 31765, 31776, 31806, 31831, 31853,
- },
- // 2John
- {
- 31875, 31876,
- },
- // 3John
- {
- 31890, 31891,
- },
- // Jude
- {
- 31906, 31907,
- },
- // Rev
- {
- 31933, 31934, 31955, 31985, 32008, 32020, 32035, 32053, 32071, 32085,
- 32107, 32119, 32139, 32157, 32176, 32197, 32206, 32228, 32247, 32272,
- 32294, 32310, 32338,
- },
- };
-
- /**
* Get the BookName.
* This is merely a convenience function that validates that book is not null,
* throwing NoSuchVerseException if it is.
@@ -661,7 +317,7 @@
* @return The requested BookName
* @exception NoSuchVerseException
* If the book is not valid
- * @deprecated Use <code>book.getBookName()</code> instead.
+ * @deprecated Use {@link BibleBook#getBookName()} instead.
*/
@Deprecated
public static BookName getBookName(BibleBook book) throws NoSuchVerseException {
@@ -678,7 +334,7 @@
* @param find
* The string to identify
* @return The BibleBook, On error null
- * @deprecated use {@link #BibleBook.getBook(String)}
+ * @deprecated use {@link BibleBook#getBook(String)}
*/
@Deprecated
public static BibleBook getBook(String find) {
@@ -692,7 +348,7 @@
* @param find
* The string to identify
* @return true when the book name is recognized
- * @deprecated use {@link #BibleBook.isBook(String)}
+ * @deprecated use {@link BibleBook#isBook(String)}
*/
@Deprecated
public static boolean isBookName(String find) {
@@ -715,7 +371,7 @@
* Note: it used to exclude introductions.
*
* @return the number of addressable verses in this versification.
- * @deprecated use {@link #BibleInfo.maximumOrdinal()}
+ * @deprecated use {@link BibleInfo#maximumOrdinal()}
*/
@Deprecated
public static int versesInBible() {
@@ -733,7 +389,7 @@
* @return The full name of the book
* @exception NoSuchVerseException
* If the book is not valid
- * @deprecated Use <code>book.getPreferredName()</code> instead.
+ * @deprecated Use {@link BibleBook#getPreferredName()} instead.
*/
@Deprecated
public static String getPreferredBookName(BibleBook book) throws NoSuchVerseException {
@@ -755,7 +411,7 @@
* @return The full name of the book
* @exception NoSuchVerseException
* If the book is not valid
- * @deprecated Use <code>book.getLongName()</code> instead.
+ * @deprecated Use {@link BibleBook#getLongName()} instead.
*/
@Deprecated
public static String getLongBookName(BibleBook book) throws NoSuchVerseException {
@@ -777,7 +433,7 @@
* @return The short name of the book
* @exception NoSuchVerseException
* If the book is not valid
- * @deprecated Use <code>book.getShortName()</code> instead.
+ * @deprecated Use {@link BibleBook#getShortName()} instead.
*/
@Deprecated
public static String getShortBookName(BibleBook book) throws NoSuchVerseException {
@@ -798,7 +454,7 @@
* @return the OSIS defined short name for a book
* @exception NoSuchVerseException
* If the book is not valid
- * @deprecated Use <code>book.getOSIS()</code> instead.
+ * @deprecated Use {@link BibleBook#getOSIS()} instead.
*/
@Deprecated
public static String getOSISName(BibleBook book) throws NoSuchVerseException {
@@ -819,7 +475,7 @@
* @return the number of verses
* @exception NoSuchVerseException
* If either reference is illegal
- * @deprecated use <code>verse2.subtract(verse1) + 1</code> instead
+ * @deprecated Use {@link Versification#subtract(Verse, Verse)} instead.
*/
@Deprecated
public static int verseCount(Verse verse1, Verse verse2) throws NoSuchVerseException {
@@ -834,7 +490,7 @@
* @exception IllegalArgumentException
* If the case is not between 0 and 2
* @see #getCase()
- * @deprecated use {@link #BookName.setCase(int)}
+ * @deprecated use {@link BookName#setCase(int)}
*/
@Deprecated
public static void setCase(int bookCase) {
@@ -846,7 +502,7 @@
*
* @return The current case setting
* @see #setCase(CaseType)
- * @deprecated use {@link #BookName.getCase()}
+ * @deprecated use {@link BookName#getCase()}
*/
@Deprecated
public static int getCase() {
@@ -865,7 +521,7 @@
* @exception IllegalArgumentException
* If the case is not between 0 and 2
* @see #getCase()
- * @deprecated use {@link #BookName.setCase(CaseType)}
+ * @deprecated use {@link BookName#setCase(CaseType)}
*/
@Deprecated
public static void setCase(CaseType newBookCase) {
@@ -877,7 +533,7 @@
*
* @return Whether the name is long or short. Default is Full (true).
* @see #setFullBookName(boolean)
- * @deprecated use {@link #BookName.isFullBookName()}
+ * @deprecated use {@link BookName#isFullBookName()}
*/
@Deprecated
public static boolean isFullBookName() {
@@ -890,7 +546,7 @@
* @param fullName
* The new case to use for reporting book names
* @see #isFullBookName()
- * @deprecated use {@link #BookName.setFullBookName(boolean)}
+ * @deprecated use {@link BookName#setFullBookName(boolean)}
*/
@Deprecated
public static void setFullBookName(boolean fullName) {
@@ -902,7 +558,7 @@
*
* @return The current case setting
* @see #setCase(int)
- * @deprecated use {@link #BookName.getDefaultCase()}
+ * @deprecated use {@link BookName#getDefaultCase()}
*/
@Deprecated
public static CaseType getDefaultCase() {
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleNames.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleNames.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/BibleNames.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -33,7 +33,7 @@
/**
* BibleNames deals with locale sensitive BibleBook name lookup conversions.
- *
+ *
* @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]
@@ -55,7 +55,7 @@
/**
* Get the preferred name of a book. Altered by the case setting (see
* setBookCase() and isFullBookName())
- *
+ *
* @param book
* The book of the Bible
* @return The full name of the book
@@ -67,7 +67,7 @@
/**
* Get the full name of a book (e.g. "Genesis"). Altered by the case setting
* (see setBookCase())
- *
+ *
* @param book
* The book of the Bible
* @return The full name of the book
@@ -79,7 +79,7 @@
/**
* Get the short name of a book (e.g. "Gen"). Altered by the case setting
* (see setBookCase())
- *
+ *
* @param book
* The book of the Bible
* @return The short name of the book
@@ -90,7 +90,7 @@
/**
* Get number of a book from its name.
- *
+ *
* @param find
* The string to identify
* @return The BibleBook, On error null
@@ -126,7 +126,7 @@
/**
* Is the given string a valid book name. If this method returns true then
* getBook() will return a BibleBook and not null.
- *
+ *
* @param find
* The string to identify
* @return true if the book name is known
@@ -154,7 +154,7 @@
String shortClassName = ClassUtil.getShortClassName(className);
ResourceBundle resources = ResourceBundle.getBundle(shortClassName, locale, CWClassLoader.instance(BibleNames.class));
- for (BibleBook book: BibleBook.values()) {
+ for (BibleBook book : BibleBook.values()) {
String osisName = book.getOSIS();
String fullBook = getString(resources, osisName + FULL_KEY);
@@ -172,7 +172,7 @@
fullBooksMap.put(bookName.getNormalizedLongName(), bookName);
shortBooksMap.put(bookName.getNormalizedShortName(), bookName);
-
+
String[] alternates = StringUtil.split(BookName.normalize(altBook, locale), ',');
for (int j = 0; j < alternates.length; j++) {
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/DivisionName.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/DivisionName.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/DivisionName.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -14,7 +14,7 @@
* 59 Temple Place - Suite 330
* Boston, MA 02111-1307, USA
*
- * Copyright: 2005
+ * Copyright: 2005 - 2012
* The copyright to this program is held by it's authors.
*
* ID: $Id$
@@ -36,13 +36,15 @@
BIBLE {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum >= BibleBook.GEN.ordinal() && bookNum <= BibleBook.REV.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 66;
}
@Override
@@ -53,6 +55,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Gen-Rev";
}
@@ -61,13 +64,15 @@
OLD_TESTAMENT {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum >= BibleBook.GEN.ordinal() && bookNum <= BibleBook.MAL.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 39;
}
@Override
@@ -78,6 +83,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Gen-Mal";
}
},
@@ -85,13 +91,15 @@
PENTATEUCH {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum >= BibleBook.GEN.ordinal() && bookNum <= BibleBook.DEUT.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 5;
}
@Override
@@ -102,6 +110,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Gen-Deu";
}
},
@@ -109,13 +118,15 @@
HISTORY {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum >= BibleBook.JOSH.ordinal() && bookNum <= BibleBook.ESTH.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 12;
}
@Override
@@ -126,6 +137,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Jos-Est";
}
},
@@ -133,13 +145,15 @@
POETRY {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum >= BibleBook.JOB.ordinal() && bookNum <= BibleBook.SONG.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 5;
}
@Override
@@ -151,6 +165,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Job-Song";
}
},
@@ -158,13 +173,15 @@
PROPHECY {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum == BibleBook.REV.ordinal() || bookNum >= BibleBook.ISA.ordinal() && bookNum <= BibleBook.MAL.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 18;
}
@Override
@@ -180,6 +197,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Deu 28,Isa-Mal,Rev";
}
},
@@ -187,13 +205,15 @@
MAJOR_PROPHETS {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum >= BibleBook.ISA.ordinal() && bookNum <= BibleBook.DAN.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 5;
}
@Override
@@ -205,6 +225,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Isa-Dan";
}
},
@@ -212,13 +233,15 @@
MINOR_PROPHETS {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum >= BibleBook.HOS.ordinal() && bookNum <= BibleBook.MAL.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 12;
}
@Override
@@ -231,6 +254,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Hos-Mal";
}
},
@@ -238,13 +262,15 @@
NEW_TESTAMENT {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum >= BibleBook.GEN.ordinal() && bookNum <= BibleBook.REV.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 27;
}
@Override
@@ -255,6 +281,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Mat-Rev";
}
},
@@ -262,13 +289,15 @@
GOSPELS_AND_ACTS {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum >= BibleBook.MATT.ordinal() && bookNum <= BibleBook.ACTS.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 5;
}
@Override
@@ -280,6 +309,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Mat-Acts";
}
},
@@ -287,13 +317,15 @@
LETTERS {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum >= BibleBook.ROM.ordinal() && bookNum <= BibleBook.JUDE.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 21;
}
@Override
@@ -307,6 +339,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Rom-Jud";
}
},
@@ -314,13 +347,15 @@
PAULINE_LETTERS {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum >= BibleBook.ROM.ordinal() && bookNum <= BibleBook.JUDE.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 14;
}
@Override
@@ -333,6 +368,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Rom-Heb";
}
},
@@ -340,13 +376,15 @@
GENERAL_LETTERS {
@Override
public boolean contains(BibleBook book) {
+ // AV11N(DMS): Is this right?
int bookNum = book.ordinal();
return bookNum >= BibleBook.ROM.ordinal() && bookNum <= BibleBook.JUDE.ordinal();
}
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 7;
}
@Override
@@ -358,6 +396,7 @@
@Override
public String getRange() {
+ // AV11N(DMS): Is this right?
return "Jas-Jud";
}
},
@@ -370,7 +409,8 @@
@Override
public int getSize() {
- return 66; //BibleNames.REVELATION - BibleNames.GENESIS + 1;
+ // AV11N(DMS): Is this right?
+ return 1;
}
@Override
@@ -451,7 +491,7 @@
return MAJOR_PROPHETS;
}
- // AV11N(DMS): might not be true
+ // AAV11N(DMS): might not be true
return REVELATION;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/SectionNames.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/SectionNames.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/SectionNames.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -30,7 +30,9 @@
* 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]
+ * @deprecated Use {@link DivisonName} instead.
*/
+ at Deprecated
public enum SectionNames {
/** BIBLE consists of the entire/whole Bible (Gen - Rev) **/
BIBLE {
@@ -451,7 +453,7 @@
return MAJOR_PROPHETS;
}
- // AV11N(DMS): might not be true
+ // AAV11N(DMS): might not be true
return REVELATION;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/Versification.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/Versification.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/Versification.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -79,7 +79,7 @@
if (booksNT.length > 0) {
bookCount += booksNT.length + 1; // All of the NT books and INTRO_NT
}
- BibleBook[] books= new BibleBook[bookCount];
+ BibleBook[] books = new BibleBook[bookCount];
books[0] = BibleBook.INTRO_BIBLE;
if (booksOT.length > 0) {
books[1] = BibleBook.INTRO_OT;
@@ -100,7 +100,7 @@
int bookIndex = 0;
// Add in the bible introduction
- int chapters[] = new int[1];
+ int[] chapters = new int[1];
chapters[0] = 0;
this.lastVerse[bookIndex++] = chapters;
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/scraps.jpage
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/scraps.jpage (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/scraps.jpage 2012-01-26 21:28:02 UTC (rev 2223)
@@ -0,0 +1,25 @@
+java.util.regex.Pattern regexp = java.util.regex.Pattern.compile("^(\\d+)(?:.(\\d+))?(?:.(\\d+))?(?:.(\\d+))?$");
+
+java.util.regex.Matcher matcher = regexp.matcher("19.23.0.1.5");
+if (matcher.matches()) {
+ System.out.println(matcher.group(1));
+ if (matcher.groupCount() >= 2) {
+ System.out.println(matcher.group(2));
+ }
+ if (matcher.groupCount() >= 3) {
+ System.out.println(matcher.group(3));
+ }
+ if (matcher.groupCount() >= 4) {
+ System.out.println(matcher.group(4));
+ }
+} else {
+ System.out.println("invalid");
+}
+
+new org.crosswire.jsword.versification.ReferenceSystem(
+ "KJV",
+ org.crosswire.jsword.versification.system.SystemKJV.booksOT,
+ org.crosswire.jsword.versification.system.SystemKJV.booksNT,
+ org.crosswire.jsword.versification.system.SystemKJV.lastVerseOT,
+ org.crosswire.jsword.versification.system.SystemKJV.lastVerseNT);
+
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -36,14 +36,14 @@
/**
* Build the "Catholic" Versification.
*/
- public SystemCatholic() {
- super(name, booksOT, booksNT, lastVerseOT, lastVerseNT);
+ /* protected */ SystemCatholic() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_OT, LAST_VERSE_NT);
}
- public static String name = "Catholic";
+ public static final String V11N_NAME = "Catholic";
- public static BibleBook[] booksNT = SystemDefault.booksNT;
- public static int lastVerseNT[][] =
+ /* protected */ static final BibleBook[] BOOKS_NT = SystemDefault.BOOKS_NT;
+ /* protected */ static final int[][] LAST_VERSE_NT =
{
// Matthew
{
@@ -169,7 +169,7 @@
},
};
- public static BibleBook[] booksOT =
+ /* protected */ static final BibleBook[] BOOKS_OT =
{
BibleBook.GEN,
BibleBook.EXOD,
@@ -219,7 +219,7 @@
BibleBook.MAL,
};
- public static int lastVerseOT[][] =
+ /* protected */ static final int[][] LAST_VERSE_OT =
{
// Gen
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic2.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic2.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemCatholic2.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -37,16 +37,16 @@
/**
* Build the "Catholic2" Versification.
*/
- public SystemCatholic2() {
- super(name, booksOT, booksNT, lastVerseOT, lastVerseNT);
+ /* protected */ SystemCatholic2() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_OT, LAST_VERSE_NT);
}
- public static String name = "Catholic2";
- public static BibleBook[] booksNT = SystemDefault.booksNT;
- public static int[][] lastVerseNT = SystemCatholic.lastVerseNT;
+ public static final String V11N_NAME = "Catholic2";
+ /* protected */ static final BibleBook[] BOOKS_NT = SystemDefault.BOOKS_NT;
+ /* protected */ static final int[][] LAST_VERSE_NT = SystemCatholic.LAST_VERSE_NT;
- public static BibleBook[] booksOT = SystemCatholic.booksOT;
- public static int lastVerseOT[][] =
+ /* protected */ static final BibleBook[] BOOKS_OT = SystemCatholic.BOOKS_OT;
+ /* protected */ static final int[][] LAST_VERSE_OT =
{
// Gen
{
@@ -162,7 +162,7 @@
// Esther
{
22, 23, 15, 17, 14, 14, 10, 17, 32,
- 13, 12, 6, 18, 19, 19, 24,
+ 13, 12, 6, 18, 19, 19, 24,
},
// I Maccabees
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemDefault.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemDefault.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemDefault.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -33,15 +33,15 @@
* @author DM Smith [dmsmith555 at yahoo dot com]
*/
public class SystemDefault extends Versification {
- public static String name = "";
+ public static final String V11N_NAME = "";
// Default for other Testament in single Testament Bibles
- public static BibleBook[] booksNone =
+ /* protected */ static final BibleBook[] BOOKS_NONE =
{
};
// Default NT list is the most common
- public static BibleBook[] booksNT =
+ /* protected */ static final BibleBook[] BOOKS_NT =
{
BibleBook.MATT,
BibleBook.MARK,
@@ -72,7 +72,7 @@
BibleBook.REV,
};
- public static BibleBook[] booksOT =
+ /* protected */ static final BibleBook[] BOOKS_OT =
{
BibleBook.GEN,
BibleBook.EXOD,
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemGerman.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemGerman.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemGerman.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -35,56 +35,56 @@
/**
* Build the "German" Versification.
*/
- public SystemGerman() {
- super(name, booksOT, booksNT, lastVerseOT, lastVerseNT);
+ /* protected */ SystemGerman() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_OT, LAST_VERSE_NT);
}
- public static String name = "German";
- public static BibleBook[] booksNT = SystemDefault.booksNT;
- public static int[][] lastVerseNT =
+ public static final String V11N_NAME = "German";
+ /* protected */ static final BibleBook[] BOOKS_NT = SystemDefault.BOOKS_NT;
+ /* protected */ static final int[][] LAST_VERSE_NT =
{
// Matthew
{
- 25, 23, 17, 25, 48, 34, 29, 34, 38,
- 42, 30, 50, 58, 36, 39, 28, 27, 35, 30,
+ 25, 23, 17, 25, 48, 34, 29, 34, 38,
+ 42, 30, 50, 58, 36, 39, 28, 27, 35, 30,
34, 46, 46, 39, 51, 46, 75, 66, 20,
},
// Mark
{
- 45, 28, 35, 41, 43, 56, 37, 38, 50,
+ 45, 28, 35, 41, 43, 56, 37, 38, 50,
52, 33, 44, 37, 72, 47, 20,
},
// Luke
{
- 80, 52, 38, 44, 39, 49, 50, 56, 62,
- 42, 54, 59, 35, 35, 32, 31, 37, 43, 48,
+ 80, 52, 38, 44, 39, 49, 50, 56, 62,
+ 42, 54, 59, 35, 35, 32, 31, 37, 43, 48,
47, 38, 71, 56, 53,
},
// John
{
- 51, 25, 36, 54, 47, 71, 53, 59, 41,
- 42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
+ 51, 25, 36, 54, 47, 71, 53, 59, 41,
+ 42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
31, 25,
},
// Acts
{
- 26, 47, 26, 37, 42, 15, 60, 40, 43,
- 48, 30, 25, 52, 28, 41, 40, 34, 28, 40,
+ 26, 47, 26, 37, 42, 15, 60, 40, 43,
+ 48, 30, 25, 52, 28, 41, 40, 34, 28, 40,
38, 40, 30, 35, 27, 27, 32, 44, 31,
},
// Romans
{
- 32, 29, 31, 25, 21, 23, 25, 39, 33,
+ 32, 29, 31, 25, 21, 23, 25, 39, 33,
21, 36, 21, 14, 23, 33, 27,
},
// I Corinthians
{
- 31, 16, 23, 21, 13, 20, 40, 13, 27,
+ 31, 16, 23, 21, 13, 20, 40, 13, 27,
33, 34, 31, 13, 40, 58, 24,
},
// II Corinthians
{
- 24, 17, 18, 18, 21, 18, 16, 24, 15,
+ 24, 17, 18, 18, 21, 18, 16, 24, 15,
18, 33, 21, 13,
},
// Galatians
@@ -129,7 +129,7 @@
},
// Hebrews
{
- 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 14, 18, 19, 16, 14, 20, 28, 13, 28,
39, 40, 29, 25,
},
// James
@@ -162,61 +162,62 @@
},
// Revelation of John
{
- 20, 29, 22, 11, 14, 17, 17, 13, 21,
- 11, 19, 18, 18, 20, 8, 21, 18, 24, 21,
+ 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 11, 19, 18, 18, 20, 8, 21, 18, 24, 21,
15, 27, 21,
},
};
- public static BibleBook[] booksOT = SystemDefault.booksOT;
- public static int[][] lastVerseOT =
+
+ /* protected */ static final BibleBook[] BOOKS_OT = SystemDefault.BOOKS_OT;
+ /* protected */ static final int[][] LAST_VERSE_OT =
{
// Genesis
{
- 31, 25, 24, 26, 32, 22, 24, 22, 29,
- 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
- 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
- 43, 54, 33, 20, 31, 29, 43, 36, 30, 23,
- 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
+ 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
+ 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
+ 43, 54, 33, 20, 31, 29, 43, 36, 30, 23,
+ 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
26,
},
// Exodus
{
- 22, 25, 22, 31, 23, 30, 29, 28, 35,
- 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
- 26, 37, 30, 33, 18, 40, 37, 21, 43, 46,
- 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
+ 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
+ 26, 37, 30, 33, 18, 40, 37, 21, 43, 46,
+ 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
38,
},
// Leviticus
{
- 17, 16, 17, 35, 26, 23, 38, 36, 24,
- 20, 47, 8, 59, 57, 33, 34, 16, 30, 37,
+ 17, 16, 17, 35, 26, 23, 38, 36, 24,
+ 20, 47, 8, 59, 57, 33, 34, 16, 30, 37,
27, 24, 33, 44, 23, 55, 46, 34,
},
// Numbers
{
- 54, 34, 51, 49, 31, 27, 89, 26, 23,
- 36, 35, 16, 33, 45, 41, 35, 28, 32, 22,
- 29, 35, 41, 30, 25, 19, 65, 23, 31, 39,
+ 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 36, 35, 16, 33, 45, 41, 35, 28, 32, 22,
+ 29, 35, 41, 30, 25, 19, 65, 23, 31, 39,
17, 54, 42, 56, 29, 34, 13,
},
// Deuteronomy
{
- 46, 37, 29, 49, 33, 25, 26, 20, 29,
- 22, 32, 31, 19, 29, 23, 22, 20, 22, 21,
- 20, 23, 29, 26, 22, 19, 19, 26, 69, 28,
+ 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 22, 32, 31, 19, 29, 23, 22, 20, 22, 21,
+ 20, 23, 29, 26, 22, 19, 19, 26, 69, 28,
20, 30, 52, 29, 12,
},
// Joshua
{
- 18, 24, 17, 24, 15, 27, 26, 35, 27,
- 43, 23, 24, 33, 15, 63, 10, 18, 28, 51,
+ 18, 24, 17, 24, 15, 27, 26, 35, 27,
+ 43, 23, 24, 33, 15, 63, 10, 18, 28, 51,
9, 45, 34, 16, 33,
},
// Judges
{
- 36, 23, 31, 24, 31, 40, 25, 35, 57,
- 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
+ 36, 23, 31, 24, 31, 40, 25, 35, 57,
+ 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// Ruth
@@ -225,90 +226,90 @@
},
// I Samuel
{
- 28, 36, 21, 22, 12, 21, 17, 22, 27,
- 27, 15, 25, 23, 52, 35, 23, 58, 30, 24,
- 42, 16, 23, 28, 23, 44, 25, 12, 25, 11,
+ 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 27, 15, 25, 23, 52, 35, 23, 58, 30, 24,
+ 42, 16, 23, 28, 23, 44, 25, 12, 25, 11,
31,
13,
},
// II Samuel
{
- 27, 32, 39, 12, 25, 23, 29, 18, 13,
- 19, 27, 31, 39, 33, 37, 23, 29, 32, 44,
+ 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 19, 27, 31, 39, 33, 37, 23, 29, 32, 44,
26, 22, 51, 39, 25,
},
// I Kings
{
- 53, 46, 28, 20, 32, 38, 51, 66, 28,
- 29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
+ 53, 46, 28, 20, 32, 38, 51, 66, 28,
+ 29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 54,
},
// II Kings
{
- 18, 25, 27, 44, 27, 33, 20, 29, 37,
- 36, 20, 22, 25, 29, 39, 20, 41, 37, 37,
+ 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 36, 20, 22, 25, 29, 39, 20, 41, 37, 37,
21, 26, 20, 37, 20, 30,
},
// I Chronicles
{
- 54, 55, 24, 43, 41, 66, 40, 40, 44,
- 14, 47, 41, 14, 17, 29, 43, 27, 17, 19,
+ 54, 55, 24, 43, 41, 66, 40, 40, 44,
+ 14, 47, 41, 14, 17, 29, 43, 27, 17, 19,
8, 30, 19, 32, 31, 31, 32, 34, 21, 30,
},
// II Chronicles
{
- 18, 17, 17, 22, 14, 42, 22, 18, 31,
- 19, 23, 16, 23, 14, 19, 14, 19, 34, 11,
- 37, 20, 12, 21, 27, 28, 23, 9, 27, 36,
+ 18, 17, 17, 22, 14, 42, 22, 18, 31,
+ 19, 23, 16, 23, 14, 19, 14, 19, 34, 11,
+ 37, 20, 12, 21, 27, 28, 23, 9, 27, 36,
27, 21, 33, 25, 33, 27, 23,
},
// Ezra
{
- 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Nehemiah
{
- 11, 20, 38, 17, 19, 19, 73, 18, 37,
+ 11, 20, 38, 17, 19, 19, 73, 18, 37,
40, 36, 47, 31,
},
// Esther
{
- 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
3,
},
// Job
{
- 22, 13, 26, 21, 27, 30, 21, 22, 35,
- 22, 20, 25, 28, 22, 35, 22, 16, 21, 29,
- 29, 34, 30, 17, 25, 6, 14, 23, 28, 25,
- 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
+ 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 22, 20, 25, 28, 22, 35, 22, 16, 21, 29,
+ 29, 34, 30, 17, 25, 6, 14, 23, 28, 25,
+ 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
32, 26, 17,
},
// Psalms
{
- 6, 12, 9, 9, 13, 11, 18, 10, 21,
- 18, 7, 9, 6, 7, 5, 11, 15, 51, 15,
- 10, 14, 32, 6, 10, 22, 12, 14, 9, 11,
- 13, 25, 11, 22, 23, 28, 13, 40, 23, 14,
- 18, 14, 12, 5, 27, 18, 12, 10, 15, 21,
- 23, 21, 11, 7, 9, 24, 14, 12, 12, 18,
- 14, 9, 13, 12, 11, 14, 20, 8, 36, 37,
- 6, 24, 20, 28, 23, 11, 13, 21, 72, 13,
- 20, 17, 8, 19, 13, 14, 17, 7, 19, 53,
- 17, 16, 16, 5, 23, 11, 13, 12, 9, 9,
- 5, 8, 29, 22, 35, 45, 48, 43, 14, 31,
- 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
- 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
- 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
- 14, 10, 8, 12, 15, 21, 10, 20, 14, 9,
+ 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 18, 7, 9, 6, 7, 5, 11, 15, 51, 15,
+ 10, 14, 32, 6, 10, 22, 12, 14, 9, 11,
+ 13, 25, 11, 22, 23, 28, 13, 40, 23, 14,
+ 18, 14, 12, 5, 27, 18, 12, 10, 15, 21,
+ 23, 21, 11, 7, 9, 24, 14, 12, 12, 18,
+ 14, 9, 13, 12, 11, 14, 20, 8, 36, 37,
+ 6, 24, 20, 28, 23, 11, 13, 21, 72, 13,
+ 20, 17, 8, 19, 13, 14, 17, 7, 19, 53,
+ 17, 16, 16, 5, 23, 11, 13, 12, 9, 9,
+ 5, 8, 29, 22, 35, 45, 48, 43, 14, 31,
+ 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
+ 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
+ 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
+ 14, 10, 8, 12, 15, 21, 10, 20, 14, 9,
6,
},
// Proverbs
{
- 33, 22, 35, 27, 23, 35, 27, 36, 18,
- 32, 31, 28, 25, 35, 33, 33, 28, 24, 29,
- 30, 31, 29, 35, 34, 28, 28, 27, 28, 27,
+ 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 32, 31, 28, 25, 35, 33, 33, 28, 24, 29,
+ 30, 31, 29, 35, 34, 28, 28, 27, 28, 27,
33, 31,
},
// Ecclesiastes
@@ -322,21 +323,21 @@
},
// Isaiah
{
- 31, 22, 26, 6, 30, 13, 25, 23, 20,
- 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
- 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
- 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
- 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
- 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
+ 31, 22, 26, 6, 30, 13, 25, 23, 20,
+ 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
+ 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
+ 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
+ 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
+ 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
22, 11, 12, 19, 11, 25, 24,
},
// Jeremiah
{
- 19, 37, 25, 31, 31, 30, 34, 23, 25,
- 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
- 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
- 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
- 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
+ 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
+ 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
+ 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
+ 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
46, 64, 34,
},
// Lamentations
@@ -345,20 +346,20 @@
},
// Ezekiel
{
- 28, 10, 27, 17, 17, 14, 27, 18, 11,
- 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
- 44, 37, 31, 49, 27, 17, 21, 36, 26, 21,
- 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
+ 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
+ 44, 37, 31, 49, 27, 17, 21, 36, 26, 21,
+ 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
49, 26, 20, 27, 31, 25, 24, 23, 35,
},
// Daniel
{
- 21, 49, 33, 34, 30, 29, 28, 27, 27,
+ 21, 49, 33, 34, 30, 29, 28, 27, 27,
21, 45, 13,
},
// Hosea
{
- 9, 25, 5, 19, 15, 11, 16, 14, 17,
+ 9, 25, 5, 19, 15, 11, 16, 14, 17,
15, 11, 15, 15, 10,
},
// Joel
@@ -399,7 +400,7 @@
},
// Zechariah
{
- 17, 17, 10, 14, 11, 15, 14, 23, 17,
+ 17, 17, 10, 14, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Malachi
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJV.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -36,14 +36,14 @@
/**
* Build the "KJV" Versification.
*/
- public SystemKJV() {
- super(name, booksOT, booksNT, lastVerseOT, lastVerseNT);
+ /* protected */ SystemKJV() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_OT, LAST_VERSE_NT);
}
- public static String name = "KJV";
- public static BibleBook[] booksNT = SystemDefault.booksNT;
+ public static final String V11N_NAME = "KJV";
+ /* protected */ static final BibleBook[] BOOKS_NT = SystemDefault.BOOKS_NT;
- public static int[][] lastVerseNT =
+ /* protected */ static final int[][] LAST_VERSE_NT =
{
// Matt
{
@@ -170,10 +170,10 @@
},
};
- public static BibleBook[] booksOT = SystemDefault.booksOT;
+ /* protected */ static final BibleBook[] BOOKS_OT = SystemDefault.BOOKS_OT;
/** Constant for the max verse number in each chapter */
- public static final int[][] lastVerseOT =
+ /* protected */ static final int[][] LAST_VERSE_OT =
{
// Gen
{
@@ -415,7 +415,7 @@
/**
* Constant for the ordinal number of the first verse in each chapter.
*/
- public static final int[][] kjvChapterStarts =
+ /* protected */ static final int[][] CHAPTER_STARTS =
{
// Bible Introduction
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJVA.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJVA.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemKJVA.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -35,18 +35,18 @@
/**
* Build the "KJVA" Versification.
*/
- public SystemKJVA() {
- super(name, booksOT, booksNT, lastVerseOT, lastVerseNT);
+ /* protected */ SystemKJVA() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_OT, LAST_VERSE_NT);
}
- public static String name = "KJVA";
+ public static final String V11N_NAME = "KJVA";
- public static BibleBook[] booksNT = SystemDefault.booksNT;
- public static int[][] lastVerseNT = SystemKJV.lastVerseNT;
+ /* protected */ static final BibleBook[] BOOKS_NT = SystemDefault.BOOKS_NT;
+ /* protected */ static final int[][] LAST_VERSE_NT = SystemKJV.LAST_VERSE_NT;
// SystemDefault.booksOT followed by
// deuterocanonical books
- public static BibleBook[] booksOT =
+ /* protected */ static final BibleBook[] BOOKS_OT =
{
BibleBook.GEN,
BibleBook.EXOD,
@@ -103,7 +103,7 @@
BibleBook.MACC2,
};
- public static final int[][] lastVerseOT =
+ /* protected */ static final int[][] LAST_VERSE_OT =
{
// Gen
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLeningrad.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLeningrad.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLeningrad.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -39,15 +39,15 @@
/**
* Build the "Leningrad" Versification.
*/
- public SystemLeningrad() {
- super(name, booksOT, booksNT, lastVerseOT, null);
+ /* protected */ SystemLeningrad() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_OT, null);
}
- public static String name = "Leningrad";
+ public static final String V11N_NAME = "Leningrad";
- public static BibleBook[] booksNT = SystemDefault.booksNone;
+ /* protected */ static final BibleBook[] BOOKS_NT = SystemDefault.BOOKS_NONE;
- public static BibleBook[] booksOT =
+ /* protected */ static final BibleBook[] BOOKS_OT =
{
BibleBook.GEN,
BibleBook.EXOD,
@@ -89,7 +89,8 @@
BibleBook.EZRA,
BibleBook.NEH,
};
- public static int lastVerseOT[][] =
+
+ /* protected */ static final int[][] LAST_VERSE_OT =
{
// Genesis
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLuther.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLuther.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemLuther.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -35,14 +35,14 @@
/**
* Build the "Luther" Versification.
*/
- public SystemLuther() {
- super(name, booksOT, booksNT, lastVerseOT, lastVerseNT);
+ /* protected */ SystemLuther() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_OT, LAST_VERSE_NT);
}
- public static String name = "Luther";
+ public static final String V11N_NAME = "Luther";
// Different ordering of SystemDefault.booksNT
- public static BibleBook[] booksNT =
+ /* protected */ static final BibleBook[] BOOKS_NT =
{
BibleBook.MATT,
BibleBook.MARK,
@@ -73,50 +73,50 @@
BibleBook.REV,
};
- public static int[][] lastVerseNT =
+ /* protected */ static final int[][] LAST_VERSE_NT =
{
// Matthew
{
- 25, 23, 17, 25, 48, 34, 29, 34, 38,
- 42, 30, 50, 58, 36, 39, 28, 27, 35, 30,
+ 25, 23, 17, 25, 48, 34, 29, 34, 38,
+ 42, 30, 50, 58, 36, 39, 28, 27, 35, 30,
34, 46, 46, 39, 51, 46, 75, 66, 20,
},
// Mark
{
- 45, 28, 35, 41, 43, 56, 37, 38, 50,
+ 45, 28, 35, 41, 43, 56, 37, 38, 50,
52, 33, 44, 37, 72, 47, 20,
},
// Luke
{
- 80, 52, 38, 44, 39, 49, 50, 56, 62,
- 42, 54, 59, 35, 35, 32, 31, 37, 43, 48,
+ 80, 52, 38, 44, 39, 49, 50, 56, 62,
+ 42, 54, 59, 35, 35, 32, 31, 37, 43, 48,
47, 38, 71, 56, 53,
},
// John
{
- 51, 25, 36, 54, 47, 71, 53, 59, 41,
- 42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
+ 51, 25, 36, 54, 47, 71, 53, 59, 41,
+ 42, 57, 50, 38, 31, 27, 33, 26, 40, 42,
31, 25,
},
// Acts
{
- 26, 47, 26, 37, 42, 15, 60, 40, 43,
- 48, 30, 25, 52, 28, 41, 40, 34, 28, 40,
+ 26, 47, 26, 37, 42, 15, 60, 40, 43,
+ 48, 30, 25, 52, 28, 41, 40, 34, 28, 40,
38, 40, 30, 35, 27, 27, 32, 44, 31,
},
// Romans
{
- 32, 29, 31, 25, 21, 23, 25, 39, 33,
+ 32, 29, 31, 25, 21, 23, 25, 39, 33,
21, 36, 21, 14, 23, 33, 27,
},
// I Corinthians
{
- 31, 16, 23, 21, 13, 20, 40, 13, 27,
+ 31, 16, 23, 21, 13, 20, 40, 13, 27,
33, 34, 31, 13, 40, 58, 24,
},
// II Corinthians
{
- 24, 17, 18, 18, 21, 18, 16, 24, 15,
+ 24, 17, 18, 18, 21, 18, 16, 24, 15,
18, 33, 21, 13,
},
// Galatians
@@ -181,7 +181,7 @@
},
// Hebrews
{
- 14, 18, 19, 16, 14, 20, 28, 13, 28,
+ 14, 18, 19, 16, 14, 20, 28, 13, 28,
39, 40, 29, 25,
},
// James
@@ -194,15 +194,15 @@
},
// Revelation of John
{
- 20, 29, 22, 11, 14, 17, 17, 13, 21,
- 11, 19, 18, 18, 20, 8, 21, 18, 24, 21,
+ 20, 29, 22, 11, 14, 17, 17, 13, 21,
+ 11, 19, 18, 18, 20, 8, 21, 18, 24, 21,
15, 27, 21,
},
};
// Different ordering of SystemDefault.booksOT
// followed by deuterocanonical books
- public static BibleBook[] booksOT =
+ /* protected */ static final BibleBook[] BOOKS_OT =
{
BibleBook.GEN,
BibleBook.EXOD,
@@ -254,55 +254,56 @@
BibleBook.ADD_DAN,
BibleBook.PR_MAN,
};
- public static int[][] lastVerseOT =
+
+ /* protected */ static final int[][] LAST_VERSE_OT =
{
// Genesis
{
- 31, 25, 24, 26, 32, 22, 24, 22, 29,
- 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
- 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
- 43, 54, 33, 20, 31, 29, 43, 36, 30, 23,
- 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
+ 31, 25, 24, 26, 32, 22, 24, 22, 29,
+ 32, 32, 20, 18, 24, 21, 16, 27, 33, 38,
+ 18, 34, 24, 20, 67, 34, 35, 46, 22, 35,
+ 43, 54, 33, 20, 31, 29, 43, 36, 30, 23,
+ 23, 57, 38, 34, 34, 28, 34, 31, 22, 33,
26,
},
// Exodus
{
- 22, 25, 22, 31, 23, 30, 29, 28, 35,
- 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
- 26, 37, 30, 33, 18, 40, 37, 21, 43, 46,
- 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
+ 22, 25, 22, 31, 23, 30, 29, 28, 35,
+ 29, 10, 51, 22, 31, 27, 36, 16, 27, 25,
+ 26, 37, 30, 33, 18, 40, 37, 21, 43, 46,
+ 38, 18, 35, 23, 35, 35, 38, 29, 31, 43,
38,
},
// Leviticus
{
- 17, 16, 17, 35, 26, 23, 38, 36, 24,
- 20, 47, 8, 59, 57, 33, 34, 16, 30, 37,
+ 17, 16, 17, 35, 26, 23, 38, 36, 24,
+ 20, 47, 8, 59, 57, 33, 34, 16, 30, 37,
27, 24, 33, 44, 23, 55, 46, 34,
},
// Numbers
{
- 54, 34, 51, 49, 31, 27, 89, 26, 23,
- 36, 35, 16, 33, 45, 41, 35, 28, 32, 22,
- 29, 35, 41, 30, 25, 19, 65, 23, 31, 39,
+ 54, 34, 51, 49, 31, 27, 89, 26, 23,
+ 36, 35, 16, 33, 45, 41, 35, 28, 32, 22,
+ 29, 35, 41, 30, 25, 19, 65, 23, 31, 39,
17, 54, 42, 56, 29, 34, 13,
},
// Deuteronomy
{
- 46, 37, 29, 49, 33, 25, 26, 20, 29,
- 22, 32, 31, 19, 29, 23, 22, 20, 22, 21,
- 20, 23, 29, 26, 22, 19, 19, 26, 69, 28,
+ 46, 37, 29, 49, 33, 25, 26, 20, 29,
+ 22, 32, 31, 19, 29, 23, 22, 20, 22, 21,
+ 20, 23, 29, 26, 22, 19, 19, 26, 69, 28,
20, 30, 52, 29, 12,
},
// Joshua
{
- 18, 24, 17, 24, 15, 27, 26, 35, 27,
- 43, 23, 24, 33, 15, 63, 10, 18, 28, 51,
+ 18, 24, 17, 24, 15, 27, 26, 35, 27,
+ 43, 23, 24, 33, 15, 63, 10, 18, 28, 51,
9, 45, 34, 16, 33,
},
// Judges
{
- 36, 23, 31, 24, 31, 40, 25, 35, 57,
- 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
+ 36, 23, 31, 24, 31, 40, 25, 35, 57,
+ 18, 40, 15, 25, 20, 20, 31, 13, 31, 30,
48, 25,
},
// Ruth
@@ -311,90 +312,90 @@
},
// I Samuel
{
- 28, 36, 21, 22, 12, 21, 17, 22, 27,
- 27, 15, 25, 23, 52, 35, 23, 58, 30, 24,
- 42, 16, 23, 28, 23, 44, 25, 12, 25, 11,
+ 28, 36, 21, 22, 12, 21, 17, 22, 27,
+ 27, 15, 25, 23, 52, 35, 23, 58, 30, 24,
+ 42, 16, 23, 28, 23, 44, 25, 12, 25, 11,
31,
13,
},
// II Samuel
{
- 27, 32, 39, 12, 25, 23, 29, 18, 13,
- 19, 27, 31, 39, 33, 37, 23, 29, 32, 44,
+ 27, 32, 39, 12, 25, 23, 29, 18, 13,
+ 19, 27, 31, 39, 33, 37, 23, 29, 32, 44,
26, 22, 51, 39, 25,
},
// I Kings
{
- 53, 46, 28, 20, 32, 38, 51, 66, 28,
- 29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
+ 53, 46, 28, 20, 32, 38, 51, 66, 28,
+ 29, 43, 33, 34, 31, 34, 34, 24, 46, 21,
43, 29, 54,
},
// II Kings
{
- 18, 25, 27, 44, 27, 33, 20, 29, 37,
- 36, 20, 22, 25, 29, 39, 20, 41, 37, 37,
+ 18, 25, 27, 44, 27, 33, 20, 29, 37,
+ 36, 20, 22, 25, 29, 39, 20, 41, 37, 37,
21, 26, 20, 37, 20, 30,
},
// I Chronicles
{
- 54, 55, 24, 43, 41, 66, 40, 40, 44,
- 14, 47, 41, 14, 17, 29, 43, 27, 17, 19,
+ 54, 55, 24, 43, 41, 66, 40, 40, 44,
+ 14, 47, 41, 14, 17, 29, 43, 27, 17, 19,
8, 30, 19, 32, 31, 31, 32, 34, 21, 30,
},
// II Chronicles
{
- 18, 17, 17, 22, 14, 42, 22, 18, 31,
- 19, 23, 16, 23, 14, 19, 14, 19, 34, 11,
- 37, 20, 12, 21, 27, 28, 23, 9, 27, 36,
+ 18, 17, 17, 22, 14, 42, 22, 18, 31,
+ 19, 23, 16, 23, 14, 19, 14, 19, 34, 11,
+ 37, 20, 12, 21, 27, 28, 23, 9, 27, 36,
27, 21, 33, 25, 33, 27, 23,
},
// Ezra
{
- 11, 70, 13, 24, 17, 22, 28, 36, 15,
+ 11, 70, 13, 24, 17, 22, 28, 36, 15,
44,
},
// Nehemiah
{
- 11, 20, 38, 17, 19, 19, 73, 18, 37,
+ 11, 20, 38, 17, 19, 19, 73, 18, 37,
40, 36, 47, 31,
},
// Esther
{
- 22, 23, 15, 17, 14, 14, 10, 17, 32,
+ 22, 23, 15, 17, 14, 14, 10, 17, 32,
3,
},
// Job
{
- 22, 13, 26, 21, 27, 30, 21, 22, 35,
- 22, 20, 25, 28, 22, 35, 22, 16, 21, 29,
- 29, 34, 30, 17, 25, 6, 14, 23, 28, 25,
- 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
+ 22, 13, 26, 21, 27, 30, 21, 22, 35,
+ 22, 20, 25, 28, 22, 35, 22, 16, 21, 29,
+ 29, 34, 30, 17, 25, 6, 14, 23, 28, 25,
+ 31, 40, 22, 33, 37, 16, 33, 24, 41, 30,
32, 26, 17,
},
// Psalms
{
- 6, 12, 9, 9, 13, 11, 18, 10, 21,
- 18, 7, 9, 6, 7, 5, 11, 15, 51, 15,
- 10, 14, 32, 6, 10, 22, 12, 14, 9, 11,
- 13, 25, 11, 22, 23, 28, 13, 40, 23, 14,
- 18, 14, 12, 5, 27, 18, 12, 10, 15, 21,
- 23, 21, 11, 7, 9, 24, 14, 12, 12, 18,
- 14, 9, 13, 12, 11, 14, 20, 8, 36, 37,
- 6, 24, 20, 28, 23, 11, 13, 21, 72, 13,
- 20, 17, 8, 19, 13, 14, 17, 7, 19, 53,
- 17, 16, 16, 5, 23, 11, 13, 12, 9, 9,
- 5, 8, 29, 22, 35, 45, 48, 43, 14, 31,
- 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
- 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
- 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
- 14, 10, 8, 12, 15, 21, 10, 20, 14, 9,
+ 6, 12, 9, 9, 13, 11, 18, 10, 21,
+ 18, 7, 9, 6, 7, 5, 11, 15, 51, 15,
+ 10, 14, 32, 6, 10, 22, 12, 14, 9, 11,
+ 13, 25, 11, 22, 23, 28, 13, 40, 23, 14,
+ 18, 14, 12, 5, 27, 18, 12, 10, 15, 21,
+ 23, 21, 11, 7, 9, 24, 14, 12, 12, 18,
+ 14, 9, 13, 12, 11, 14, 20, 8, 36, 37,
+ 6, 24, 20, 28, 23, 11, 13, 21, 72, 13,
+ 20, 17, 8, 19, 13, 14, 17, 7, 19, 53,
+ 17, 16, 16, 5, 23, 11, 13, 12, 9, 9,
+ 5, 8, 29, 22, 35, 45, 48, 43, 14, 31,
+ 7, 10, 10, 9, 8, 18, 19, 2, 29, 176,
+ 7, 8, 9, 4, 8, 5, 6, 5, 6, 8,
+ 8, 3, 18, 3, 3, 21, 26, 9, 8, 24,
+ 14, 10, 8, 12, 15, 21, 10, 20, 14, 9,
6,
},
// Proverbs
{
- 33, 22, 35, 27, 23, 35, 27, 36, 18,
- 32, 31, 28, 25, 35, 33, 33, 28, 24, 29,
- 30, 31, 29, 35, 34, 28, 28, 27, 28, 27,
+ 33, 22, 35, 27, 23, 35, 27, 36, 18,
+ 32, 31, 28, 25, 35, 33, 33, 28, 24, 29,
+ 30, 31, 29, 35, 34, 28, 28, 27, 28, 27,
33, 31,
},
// Ecclesiastes
@@ -408,21 +409,21 @@
},
// Isaiah
{
- 31, 22, 26, 6, 30, 13, 25, 23, 20,
- 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
- 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
- 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
- 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
- 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
+ 31, 22, 26, 6, 30, 13, 25, 23, 20,
+ 34, 16, 6, 22, 32, 9, 14, 14, 7, 25,
+ 6, 17, 25, 18, 23, 12, 21, 13, 29, 24,
+ 33, 9, 20, 24, 17, 10, 22, 38, 22, 8,
+ 31, 29, 25, 28, 28, 25, 13, 15, 22, 26,
+ 11, 23, 15, 12, 17, 13, 12, 21, 14, 21,
22, 11, 12, 19, 11, 25, 24,
},
// Jeremiah
{
- 19, 37, 25, 31, 31, 30, 34, 23, 25,
- 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
- 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
- 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
- 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
+ 19, 37, 25, 31, 31, 30, 34, 23, 25,
+ 25, 23, 17, 27, 22, 21, 21, 27, 23, 15,
+ 18, 14, 30, 40, 10, 38, 24, 22, 17, 32,
+ 24, 40, 44, 26, 22, 19, 32, 21, 28, 18,
+ 16, 18, 22, 13, 30, 5, 28, 7, 47, 39,
46, 64, 34,
},
// Lamentations
@@ -431,20 +432,20 @@
},
// Ezekiel
{
- 28, 10, 27, 17, 17, 14, 27, 18, 11,
- 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
- 44, 37, 31, 49, 27, 17, 21, 36, 26, 21,
- 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
+ 28, 10, 27, 17, 17, 14, 27, 18, 11,
+ 22, 25, 28, 23, 23, 8, 63, 24, 32, 14,
+ 44, 37, 31, 49, 27, 17, 21, 36, 26, 21,
+ 26, 18, 32, 33, 31, 15, 38, 28, 23, 29,
49, 26, 20, 27, 31, 25, 24, 23, 35,
},
// Daniel
{
- 21, 49, 33, 34, 30, 29, 28, 27, 27,
+ 21, 49, 33, 34, 30, 29, 28, 27, 27,
21, 45, 13,
},
// Hosea
{
- 9, 25, 5, 19, 15, 11, 16, 14, 17,
+ 9, 25, 5, 19, 15, 11, 16, 14, 17,
15, 11, 15, 15, 10,
},
// Joel
@@ -485,7 +486,7 @@
},
// Zechariah
{
- 17, 17, 10, 14, 11, 15, 14, 23, 17,
+ 17, 17, 10, 14, 11, 15, 14, 23, 17,
12, 17, 14, 9, 21,
},
// Malachi
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemMT.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemMT.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemMT.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -39,16 +39,16 @@
/**
* Build the "MT" Versification.
*/
- public SystemMT() {
- super(name, booksOT, booksNT, lastVerseOT, null);
+ /* protected */ SystemMT() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_NT, null);
}
- public static String name = "MT";
+ public static final String V11N_NAME = "MT";
- public static BibleBook[] booksNT = SystemDefault.booksNone;
+ /* protected */ static final BibleBook[] BOOKS_NT = SystemDefault.BOOKS_NONE;
// Different ordering of SystemDefault.booksOT
- public static BibleBook[] booksOT =
+ /* protected */ static final BibleBook[] BOOKS_OT =
{
BibleBook.GEN,
BibleBook.EXOD,
@@ -91,7 +91,7 @@
BibleBook.CHR2,
};
- public static int lastVerseOT[][] =
+ /* protected */ static final int[][] LAST_VERSE_NT =
{
// Genesis
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSV.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSV.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSV.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -37,14 +37,14 @@
/**
* Build the "NRSV" Versification.
*/
- public SystemNRSV() {
- super(name, booksOT, booksNT, lastVerseOT, lastVerseNT);
+ /* protected */ SystemNRSV() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_OT, LAST_VERSE_NT);
}
- public static String name = "NRSV";
- public static BibleBook[] booksNT = SystemDefault.booksNT;
+ public static final String V11N_NAME = "NRSV";
+ /* protected */ static final BibleBook[] BOOKS_NT = SystemDefault.BOOKS_NT;
- public static int[][] lastVerseNT =
+ /* protected */ static final int[][] LAST_VERSE_NT =
{
// Matt
{
@@ -171,10 +171,9 @@
},
};
+ /* protected */ static final BibleBook[] BOOKS_OT = SystemDefault.BOOKS_OT;
+ /* protected */ static final int[][] LAST_VERSE_OT = SystemKJV.LAST_VERSE_OT;
- public static BibleBook[] booksOT = SystemDefault.booksOT;
- public static int[][] lastVerseOT = SystemKJV.lastVerseOT;
-
/**
* Serialization ID
*/
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSVA.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSVA.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemNRSVA.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -33,25 +33,20 @@
*/
public class SystemNRSVA extends Versification {
/**
- *
- */
- private static final long serialVersionUID = -1915001343269114316L;
-
- /**
* Build the "NRSVA" Versification.
*/
- public SystemNRSVA() {
- super(name, booksOT, booksNT, lastVerseOT, lastVerseNT);
+ /* protected */ SystemNRSVA() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_OT, LAST_VERSE_NT);
}
- public static String name = "NRSVA";
+ public static final String V11N_NAME = "NRSVA";
- public static BibleBook[] booksNT = SystemDefault.booksNT;
- public static int[][] lastVerseNT = SystemNRSV.lastVerseNT;
+ /* protected */ static final BibleBook[] BOOKS_NT = SystemDefault.BOOKS_NT;
+ /* protected */ static final int[][] LAST_VERSE_NT = SystemNRSV.LAST_VERSE_NT;
// SystemDefault.booksOT followed by
// deuterocanonical books
- public static BibleBook[] booksOT =
+ /* protected */ static final BibleBook[] BOOKS_OT =
{
BibleBook.GEN,
BibleBook.EXOD,
@@ -111,7 +106,7 @@
BibleBook.MACC4,
};
- public static final int[][] lastVerseOT =
+ /* protected */ static final int[][] LAST_VERSE_OT =
{
// Gen
{
@@ -430,4 +425,9 @@
21, 27, 19, 27, 20, 32, 25, 24, 24,
},
};
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -1915001343269114316L;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodal.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodal.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodal.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -36,7 +36,7 @@
* has some errors in verse numbers). In select instances, printed editions of a
* Polish translation and an OCS Bible, which employ very similar
* versifications, were also consulted.
- *
+ *
* Some details that may not be immediately obvious: <br/>
* The Prologue to Sirach is neither a separate book nor a separate chapter of
* Sirach. It should be placed within the introduction of Sirach (Sir.0.0). <br/>
@@ -50,29 +50,25 @@
* in the eastern & western Churches and the standard naming conventions
* proscribed by the SBL (which BTG & OSIS follow). <br/>
* The Epistle of Jeremiah and Baruch are two separate books.
- *
- *
+ *
+ *
* @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]
*/
public class SystemSynodal extends Versification {
/**
- *
- */
- private static final long serialVersionUID = -6281906491023123413L;
- /**
* Build the "Synodal" Versification.
*/
- public SystemSynodal() {
- super(name, booksOT, booksNT, lastVerseOT, lastVerseNT);
+ /* protected */ SystemSynodal() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_OT, LAST_VERSE_NT);
}
- public static String name = "Synodal";
+ public static final String V11N_NAME = "Synodal";
- // The books are the SystemDefault.booksNT
+ // The books are the SystemDefault.BOOKS_NT
// in a different order
- public static BibleBook[] booksNT =
+ /* protected */ static final BibleBook[] BOOKS_NT =
{
BibleBook.MATT,
BibleBook.MARK,
@@ -102,7 +98,8 @@
BibleBook.HEB,
BibleBook.REV,
};
- public static final int[][] lastVerseNT =
+
+ /* protected */ static final int[][] LAST_VERSE_NT =
{
// Matthew
{
@@ -230,7 +227,7 @@
};
// Contains deuterocanonical books
- public static BibleBook[] booksOT =
+ /* protected */ static final BibleBook[] BOOKS_OT =
{
BibleBook.GEN,
BibleBook.EXOD,
@@ -284,7 +281,8 @@
BibleBook.MACC3,
BibleBook.ESD2,
};
- public static final int[][] lastVerseOT =
+
+ /* protected */ static final int[][] LAST_VERSE_OT =
{
// Genesis
{
@@ -581,4 +579,9 @@
60, 46, 51, 58, 48, 63, 78,
},
};
+
+ /**
+ * Serialization ID
+ */
+ private static final long serialVersionUID = -6281906491023123413L;
}
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodalP.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodalP.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemSynodalP.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -28,8 +28,8 @@
* The SynodalP versification is essentially the KJV v11n, using its book order
* and chapter counts,
* but merged with verse counts similar to those of the Synodal v11n
- *
- *
+ *
+ *
* @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]
@@ -38,13 +38,15 @@
/**
* Build the "SynodalP" Versification.
*/
- public SystemSynodalP() {
- super(name, booksOT, booksNT, lastVerseOT, lastVerseNT);
+ /* protected */ SystemSynodalP() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_OT, LAST_VERSE_NT);
}
- public static String name = "SynodalP";
- public static BibleBook[] booksNT = SystemDefault.booksNT;
- public static final int[][] lastVerseNT =
+ public static final String V11N_NAME = "SynodalP";
+
+ /* protected */ static final BibleBook[] BOOKS_NT = SystemDefault.BOOKS_NT;
+
+ /* protected */ static final int[][] LAST_VERSE_NT =
{
// Matthew
{
@@ -171,8 +173,8 @@
}
};
- public static BibleBook[] booksOT = SystemDefault.booksOT;
- public static final int[][] lastVerseOT =
+ /* protected */ static final BibleBook[] BOOKS_OT = SystemDefault.BOOKS_OT;
+ /* protected */ static final int[][] LAST_VERSE_OT =
{
// Gen
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemVulg.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemVulg.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/SystemVulg.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -35,15 +35,15 @@
/**
* Build the "Vulg" Versification.
*/
- public SystemVulg() {
- super(name, booksOT, booksNT, lastVerseOT, lastVerseNT);
+ /* protected */ SystemVulg() {
+ super(V11N_NAME, BOOKS_OT, BOOKS_NT, LAST_VERSE_OT, LAST_VERSE_NT);
}
- public static String name = "Vulg";
+ public static final String V11N_NAME = "Vulg";
// Start with SystemDefault.booksNT
// and follow with additional deuterocanonical books
- public static BibleBook[] booksNT =
+ /* protected */ static final BibleBook[] BOOKS_NT =
{
BibleBook.MATT,
BibleBook.MARK,
@@ -79,7 +79,8 @@
BibleBook.ADD_PS,
BibleBook.EP_LAO,
};
- public static int[][] lastVerseNT =
+
+ /* protected */ static final int[][] LAST_VERSE_NT =
{
// Matthew
{
@@ -230,7 +231,7 @@
// Has all the SystemDefault.booksOT
// with deuterocanonical books mixed into
// a very distinctive order
- public static BibleBook[] booksOT =
+ /* protected */ static final BibleBook[] BOOKS_OT =
{
BibleBook.GEN,
BibleBook.EXOD,
@@ -280,7 +281,7 @@
BibleBook.MACC2,
};
- public static int[][] lastVerseOT =
+ /* protected */ static final int[][] LAST_VERSE_OT =
{
// Genesis
{
Modified: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/Versifications.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/Versifications.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/Versifications.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -39,8 +39,14 @@
public class Versifications {
/**
+ * The default Versification for JSword is the KJV.
+ * This is subject to change at any time.
+ */
+ public static final String DEFAULT_V11N = SystemKJV.V11N_NAME;
+
+ /**
* Get the singleton instance of Versifications.
- *
+ *
* @return the singleton
*/
public static Versifications instance() {
@@ -48,15 +54,24 @@
}
/**
+ * Get the default Versification.
+ *
+ * @return the default Versification.
+ */
+ public synchronized Versification getDefaultVersification() {
+ return getVersification(DEFAULT_V11N);
+ }
+
+ /**
* Get the Versification by its name. If name is null then return the default Versification.
- *
+ *
* @param name the name of the Versification
* @return the Versification or null if it is not known.
*/
public synchronized Versification getVersification(String name) {
String actual = name;
if (actual == null) {
- actual = DEFAULT_REFERENCE_SYSTEM;
+ actual = DEFAULT_V11N;
}
// This class delays the building of a Versification to when it is
@@ -74,7 +89,7 @@
/**
* Determine whether the named Versification is known.
- *
+ *
* @param name the name of the Versification
* @return true when the Versification is available for use
*/
@@ -83,40 +98,40 @@
}
private Versification fluff(String name) {
- if (SystemKJV.name.equals(name)) {
+ if (SystemKJV.V11N_NAME.equals(name)) {
return new SystemKJV();
}
- if (SystemCatholic.name.equals(name)) {
+ if (SystemCatholic.V11N_NAME.equals(name)) {
return new SystemCatholic();
}
- if (SystemCatholic2.name.equals(name)) {
+ if (SystemCatholic2.V11N_NAME.equals(name)) {
return new SystemCatholic2();
}
- if (SystemKJVA.name.equals(name)) {
+ if (SystemKJVA.V11N_NAME.equals(name)) {
return new SystemKJVA();
}
- if (SystemGerman.name.equals(name)) {
+ if (SystemGerman.V11N_NAME.equals(name)) {
return new SystemGerman();
}
- if (SystemLeningrad.name.equals(name)) {
+ if (SystemLeningrad.V11N_NAME.equals(name)) {
return new SystemLeningrad();
}
- if (SystemLuther.name.equals(name)) {
+ if (SystemLuther.V11N_NAME.equals(name)) {
return new SystemLuther();
}
- if (SystemMT.name.equals(name)) {
+ if (SystemMT.V11N_NAME.equals(name)) {
return new SystemMT();
}
- if (SystemNRSV.name.equals(name)) {
+ if (SystemNRSV.V11N_NAME.equals(name)) {
return new SystemNRSV();
}
- if (SystemNRSVA.name.equals(name)) {
+ if (SystemNRSVA.V11N_NAME.equals(name)) {
return new SystemNRSVA();
}
- if (SystemSynodal.name.equals(name)) {
+ if (SystemSynodal.V11N_NAME.equals(name)) {
return new SystemSynodal();
}
- if (SystemSynodalP.name.equals(name)) {
+ if (SystemSynodalP.V11N_NAME.equals(name)) {
return new SystemSynodalP();
}
return null;
@@ -124,7 +139,7 @@
/**
* Add a Versification that is not predefined by JSword.
- *
+ *
* @param rs the Versification to register
*/
public synchronized void register(Versification rs) {
@@ -137,29 +152,23 @@
*/
private Versifications() {
known = new HashSet<String>();
- known.add(SystemCatholic.name);
- known.add(SystemCatholic2.name);
- known.add(SystemKJV.name);
- known.add(SystemGerman.name);
- known.add(SystemKJVA.name);
- known.add(SystemLeningrad.name);
- known.add(SystemLuther.name);
- known.add(SystemMT.name);
- known.add(SystemNRSV.name);
- known.add(SystemNRSVA.name);
- known.add(SystemSynodal.name);
- known.add(SystemSynodalP.name);
- known.add(SystemVulg.name);
+ known.add(SystemCatholic.V11N_NAME);
+ known.add(SystemCatholic2.V11N_NAME);
+ known.add(SystemKJV.V11N_NAME);
+ known.add(SystemGerman.V11N_NAME);
+ known.add(SystemKJVA.V11N_NAME);
+ known.add(SystemLeningrad.V11N_NAME);
+ known.add(SystemLuther.V11N_NAME);
+ known.add(SystemMT.V11N_NAME);
+ known.add(SystemNRSV.V11N_NAME);
+ known.add(SystemNRSVA.V11N_NAME);
+ known.add(SystemSynodal.V11N_NAME);
+ known.add(SystemSynodalP.V11N_NAME);
+ known.add(SystemVulg.V11N_NAME);
fluffed = new HashMap<String, Versification>();
}
/**
- * The default Versification for JSword is the KJV.
- * This is subject to change at any time.
- */
- private final String DEFAULT_REFERENCE_SYSTEM = "KJV";
-
- /**
* The set of v11n names.
*/
private Set<String> known;
Added: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/package.html
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/package.html (rev 0)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/package.html 2012-01-26 21:28:02 UTC (rev 2223)
@@ -0,0 +1,21 @@
+<html>
+<body>
+
+<p>
+ The System package defines each of the known Versifications.
+ The only useful class is Versifications.
+</p>
+
+<p>
+ Each Versification consists of 5 static fields:
+ <ol>
+ <li><strong>V11N_NAME</strong> - The name of the Versification</li>
+ <li><strong>BOOKS_OT</strong> - An ordered list of Old Testament Bible Books.</li>
+ <li><strong>BOOKS_NT</strong> - An ordered list of New Testament Bible Books.</li>
+ <li><strong>LAST_VERSE_OT</strong> - The highest verse number given by Old Testament book and chapter.</li>
+ <li><strong>LAST_VERSE_NT</strong> - The highest verse number given by New Testament book and chapter.</li>
+ </ol>
+</p>
+
+</body>
+</html>
Property changes on: trunk/jsword/src/main/java/org/crosswire/jsword/versification/system/package.html
___________________________________________________________________
Added: svn:mime-type
+ text/html
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/book/sword/RawFileBackendTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/book/sword/RawFileBackendTest.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/book/sword/RawFileBackendTest.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -30,7 +30,8 @@
@Override
protected void setUp() throws Exception {
- v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Update test to test all V11Ns
+ v11n = Versifications.instance().getDefaultVersification();
ConfigEntryTable table = new ConfigEntryTable(modName);
table.add(ConfigEntryType.LANG, "de");
table.add(ConfigEntryType.INITIALS, modName);
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/passage/AccuracyTypeTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/passage/AccuracyTypeTest.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/passage/AccuracyTypeTest.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -16,7 +16,8 @@
@Override
protected void setUp() throws Exception {
- rs = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Update test to test all V11Ns
+ rs = Versifications.instance().getDefaultVersification();
}
public void testFromText_onePartInvalidBook() {
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/passage/PassageParentTst.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/passage/PassageParentTst.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/passage/PassageParentTst.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -109,7 +109,8 @@
BookName.setCase(CaseType.SENTENCE);
fullName = BookName.isFullBookName();
BookName.setFullBookName(false);
- v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Update test to test all V11Ns
+ v11n = Versifications.instance().getDefaultVersification();
start = System.currentTimeMillis();
gen1_135 = (Passage) keyf.getKey(v11n, "Gen 1:1, Gen 1:3, Gen 1:5");
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/passage/PassageTally2Test.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/passage/PassageTally2Test.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/passage/PassageTally2Test.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -77,8 +77,9 @@
Passage gen123_1 = null;
Passage gen1_157 = null;
- PassageTally tally = new PassageTally(Versifications.instance().getVersification("KJV"));
- PassageTally empty = new PassageTally(Versifications.instance().getVersification("KJV"));
+ // AV11N(DMS): Update test to test all V11Ns
+ PassageTally tally = new PassageTally(Versifications.instance().getDefaultVersification());
+ PassageTally empty = new PassageTally(Versifications.instance().getDefaultVersification());
PassageTally temp = null;
@Override
@@ -87,7 +88,8 @@
BookName.setCase(CaseType.SENTENCE);
fullName = BookName.isFullBookName();
BookName.setFullBookName(false);
- v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Update test to test all V11Ns
+ v11n = Versifications.instance().getDefaultVersification();
gen11_1 = RestrictionType.NONE.toRange(v11n, new Verse(BibleBook.GEN, 1, 1), 1);
gen11_2 = RestrictionType.NONE.toRange(v11n, new Verse(BibleBook.GEN, 1, 1), 2);
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/passage/PassageUtilTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/passage/PassageUtilTest.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/passage/PassageUtilTest.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -51,7 +51,8 @@
*/
@Override
protected void setUp() throws Exception {
- v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Update test to test all V11Ns
+ v11n = Versifications.instance().getDefaultVersification();
}
/*
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/passage/VerseRangeTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/passage/VerseRangeTest.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/passage/VerseRangeTest.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -73,7 +73,8 @@
*/
@Override
protected void setUp() throws Exception {
- v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Update test to test all V11Ns
+ v11n = Versifications.instance().getDefaultVersification();
gen11_1 = RestrictionType.NONE.toRange(v11n, new Verse(BibleBook.GEN, 1, 1), 1);
gen11_2 = RestrictionType.NONE.toRange(v11n, new Verse(BibleBook.GEN, 1, 1), 2);
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/passage/VerseTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/passage/VerseTest.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/passage/VerseTest.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -69,7 +69,8 @@
@Override
protected void setUp() throws Exception {
BookName.setFullBookName(false);
- v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Update test to test all V11Ns
+ v11n = Versifications.instance().getDefaultVersification();
gen00 = new Verse(BibleBook.GEN, 0, 0);
gen10 = new Verse(BibleBook.GEN, 1, 0);
Modified: trunk/jsword/src/test/java/org/crosswire/jsword/versification/VersificationTest.java
===================================================================
--- trunk/jsword/src/test/java/org/crosswire/jsword/versification/VersificationTest.java 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/src/test/java/org/crosswire/jsword/versification/VersificationTest.java 2012-01-26 21:28:02 UTC (rev 2223)
@@ -48,7 +48,8 @@
@Override
protected void setUp() {
storedCase = BookName.getDefaultCase();
- v11n = Versifications.instance().getVersification("KJV");
+ // AV11N(DMS): Update test to test all V11Ns
+ v11n = Versifications.instance().getDefaultVersification();
}
@Override
@@ -234,6 +235,7 @@
}
public void testNames() {
+ // AV11N(DMS): Is this right?
assertEquals(2, BibleBook.GEN.ordinal());
assertEquals(68, BibleBook.REV.ordinal());
}
Modified: trunk/jsword/tags.txt
===================================================================
--- trunk/jsword/tags.txt 2012-01-25 22:11:28 UTC (rev 2222)
+++ trunk/jsword/tags.txt 2012-01-26 21:28:02 UTC (rev 2223)
@@ -15,3 +15,4 @@
PARANOIA: code that shouldn't need to be there and perhaps could be removed to make things faster
BORROWED: This code is copied from somewhere else, maybe we need to keep the 2 in sync
SERIALUID: for where we have added a hacked up serialversionuid
+AV11N: This needs to be considered when a different Versification is used than the KJV
\ No newline at end of file
More information about the jsword-svn
mailing list