[jsword-svn] jsword/java/jsword/org/crosswire/jsword/book s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book
In directory www.crosswire.org:/tmp/cvs-serv32246/java/jsword/org/crosswire/jsword/book

Modified Files:
	CaseType.java 
Log Message:
Made full book names a configurable default and used it.
Fixed the name of Readings.

Index: CaseType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/CaseType.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CaseType.java	17 May 2005 00:43:16 -0000	1.7
--- CaseType.java	12 Jun 2005 02:39:28 -0000	1.8
***************
*** 97,118 ****
      };
  
-     public static final CaseType MIXED = new CaseType("MIXED") //$NON-NLS-1$
-     {
-         public String setCase(String word)
-         {
-             if (word.equalsIgnoreCase("lord's")) //$NON-NLS-1$
-             {
-                 return "LORD's"; //$NON-NLS-1$
-             }
-             // This should not happen
-             throw new IllegalArgumentException(Msg.ERROR_MIXED.toString());
-         }
- 
-         /**
-          * Serialization ID
-          */
-         private static final long serialVersionUID = 3546925766555547956L;
-     };
- 
      public abstract String setCase(String word);
  
--- 97,100 ----
***************
*** 178,195 ****
          }
  
-         // If initial is lower then it must be mixed
-         if (Character.isLowerCase(word.charAt(0)))
-         {
-             return MIXED;
-         }
- 
-         // Hack the only real caseMixed is LORD's
-         // And we don't want to bother sorting out Tubal-Cain
-         // as SENTENCE, so for now ...
-         if (word.equals("LORD's")) //$NON-NLS-1$
-         {
-             return MIXED;
-         }
- 
          // So ...
          return SENTENCE;
--- 160,163 ----
***************
*** 284,288 ****
          SENTENCE,
          UPPER,
-         MIXED,
      };
  }
--- 252,255 ----