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

[jswordcvs at crosswire.org]

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

Modified Files:
	DefaultBookMetaData.java AbstractBookMetaData.java 
Log Message:
Fixed the display of the conf (BD-16, 17 & 18)

Index: AbstractBookMetaData.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/AbstractBookMetaData.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** AbstractBookMetaData.java	25 Jan 2005 00:02:32 -0000	1.17
--- AbstractBookMetaData.java	28 Feb 2005 02:21:40 -0000	1.18
***************
*** 18,21 ****
--- 18,22 ----
  import org.crosswire.jsword.book.BookMetaData;
  import org.crosswire.jsword.book.IndexStatus;
+ import org.jdom.Document;
  
  /**
***************
*** 170,173 ****
--- 171,182 ----
      }
  
+     /* (non-Javadoc)
+      * @see org.crosswire.jsword.book.BookMetaData#toOSIS()
+      */
+     public Document toOSIS()
+     {
+         throw new UnsupportedOperationException("If you want to use this, implement it."); //$NON-NLS-1$
+     }
+ 
      /**
       * @param book The book to set.
***************
*** 192,201 ****
       * @return the name of the language
       */
!     protected String getLanguage(String ident, String iso639Code)
      {
          String lookup = iso639Code;
          if (lookup == null || lookup.length() == 0)
          {
-             log.warn("Book " + ident + " named " + getName() + " has no language specified. Assuming English."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
              return getLanguage(ident, DEFAULT_LANG_CODE);
          }
--- 201,209 ----
       * @return the name of the language
       */
!     public static String getLanguage(String ident, String iso639Code)
      {
          String lookup = iso639Code;
          if (lookup == null || lookup.length() == 0)
          {
              return getLanguage(ident, DEFAULT_LANG_CODE);
          }
***************
*** 352,356 ****
      private static final Logger log = Logger.getLogger(AbstractBookMetaData.class);
  
!     private static final String DEFAULT_LANG_CODE = "en"; //$NON-NLS-1$
      private static final String UNKNOWN_LANG_CODE = "und"; //$NON-NLS-1$
  
--- 360,364 ----
      private static final Logger log = Logger.getLogger(AbstractBookMetaData.class);
  
!     public static final String DEFAULT_LANG_CODE = "en"; //$NON-NLS-1$
      private static final String UNKNOWN_LANG_CODE = "und"; //$NON-NLS-1$
  

Index: DefaultBookMetaData.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/basic/DefaultBookMetaData.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DefaultBookMetaData.java	25 Jan 2005 00:02:32 -0000	1.15
--- DefaultBookMetaData.java	28 Feb 2005 02:21:40 -0000	1.16
***************
*** 174,178 ****
          this.type = type;
  
!         putProperty(KEY_TYPE, type == null ? "" : type.toString()); //$NON-NLS-1$
      }
  
--- 174,178 ----
          this.type = type;
  
!         putProperty(KEY_TYPE, type.toString());
      }