[jsword-svn] r1940 - in trunk: jsword/src/main/java/org/crosswire/jsword/passage jsword-web

[dmsmith at crosswire.org]

Author: dmsmith
Date: 2009-03-23 05:01:01 -0700 (Mon, 23 Mar 2009)
New Revision: 1940

Modified:
   trunk/jsword-web/build.xml
   trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRange.java
Log:
Added ot and nt ranges to VerseRange.
Commented out java2html in the build.

Modified: trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRange.java
===================================================================
--- trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRange.java	2009-03-21 16:09:14 UTC (rev 1939)
+++ trunk/jsword/src/main/java/org/crosswire/jsword/passage/VerseRange.java	2009-03-23 12:01:01 UTC (rev 1940)
@@ -869,6 +869,16 @@
         return whole;
     }
 
+    public static VerseRange getOldTestamentVerseRange()
+    {
+        return otRange;
+    }
+
+    public static VerseRange getNewTestamentVerseRange()
+    {
+        return ntRange;
+    }
+
     private String doGetName(Key base) throws NoSuchVerseException
     {
         // Cache these we're going to be using them a lot.
@@ -1249,6 +1259,17 @@
      * The whole Bible VerseRange
      */
     private static transient VerseRange whole;
+
+    /**
+     * The Old Testament VerseRange
+     */
+    private static transient VerseRange otRange;
+
+    /**
+     * The New Testament VerseRange
+     */
+    private static transient VerseRange ntRange;
+
     static
     {
         try
@@ -1260,6 +1281,26 @@
             assert false : ex;
             whole = new VerseRange();
         }
+
+        try
+        {
+            otRange = new VerseRange(new Verse(1, 1, 1), new Verse(39, 4, 6));
+        }
+        catch (NoSuchVerseException ex)
+        {
+            assert false : ex;
+            otRange = new VerseRange();
+        }
+
+        try
+        {
+            ntRange = new VerseRange(new Verse(40, 1, 1), new Verse(66, 22, 21));
+        }
+        catch (NoSuchVerseException ex)
+        {
+            assert false : ex;
+            ntRange = new VerseRange();
+        }
     }
 
 

Modified: trunk/jsword-web/build.xml
===================================================================
--- trunk/jsword-web/build.xml	2009-03-21 16:09:14 UTC (rev 1939)
+++ trunk/jsword-web/build.xml	2009-03-23 12:01:01 UTC (rev 1940)
@@ -78,8 +78,10 @@
     </javadoc>
   </target>
 
-  <!--=======================================================================-->
-  <target name="tools" depends="java2html,checkstyle,javancss,findbugs,pmd,cpd,jdepend"/>
+  <!--=======================================================================
+  Note: java is dumping in native code while executing java2html
+  <target name="tools" depends="java2html,checkstyle,javancss,findbugs,pmd,cpd,jdepend"/> -->
+  <target name="tools" depends="checkstyle,javancss,findbugs,pmd,cpd,jdepend"/>
 
   <!--=======================================================================-->
   <target name="install"