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

[jswordcvs at crosswire.org]

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

Modified Files:
	CompressionType.java SwordConstants.java 
	SwordBookMetaData.java ModuleType.java 
Log Message:
Improvments on reading SwordBookMetaData

Index: SwordBookMetaData.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/SwordBookMetaData.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** SwordBookMetaData.java	21 Sep 2004 17:46:23 -0000	1.31
--- SwordBookMetaData.java	5 Oct 2004 22:03:09 -0000	1.32
***************
*** 10,15 ****
  import java.net.URL;
  import java.util.ArrayList;
! import java.util.Collections;
! import java.util.Date;
  import java.util.Iterator;
  import java.util.LinkedHashMap;
--- 10,14 ----
  import java.net.URL;
  import java.util.ArrayList;
! import java.util.HashSet;
[...1104 lines suppressed...]
!     private Openness openness = Openness.UNKNOWN;
!     private URL licence;
!     private boolean leftToRight = true;
      private StringBuffer data = new StringBuffer();
      private String readahead;
! }
--- 1058,1069 ----
      private Book book;
      private BookDriver driver;
      private String fullName;
      private String displayName;
      private String initials = ""; //$NON-NLS-1$
!     private boolean supported;
      private StringBuffer data = new StringBuffer();
      private String readahead;
!     private static Histogram histogram = new Histogram();
!     private List warnings = new ArrayList();
! 
! }
\ No newline at end of file

Index: CompressionType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/CompressionType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** CompressionType.java	8 Sep 2004 19:55:07 -0000	1.2
--- CompressionType.java	5 Oct 2004 22:03:09 -0000	1.3
***************
*** 43,47 ****
          protected Backend getBackend(SwordBookMetaData sbmd, String path) throws BookException
          {
!             BlockType blockType = BlockType.fromString(sbmd.getFirstValue(ConfigEntry.BLOCK_TYPE));
              return new GZIPBackend(path, blockType);
          }
--- 43,47 ----
          protected Backend getBackend(SwordBookMetaData sbmd, String path) throws BookException
          {
!             BlockType blockType = BlockType.fromString(sbmd.getProperty(ConfigEntry.BLOCK_TYPE));
              return new GZIPBackend(path, blockType);
          }

Index: SwordConstants.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/SwordConstants.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** SwordConstants.java	30 Aug 2004 09:27:07 -0000	1.26
--- SwordConstants.java	5 Oct 2004 22:03:09 -0000	1.27
***************
*** 226,230 ****
          "Glossary", //$NON-NLS-1$
      };
! 
      /**
       * public domain
--- 226,230 ----
          "Glossary", //$NON-NLS-1$
      };
!     
      /**
       * public domain

Index: ModuleType.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/sword/ModuleType.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ModuleType.java	8 Sep 2004 19:55:07 -0000	1.9
--- ModuleType.java	5 Oct 2004 22:03:09 -0000	1.10
***************
*** 277,281 ****
      public Book createBook(SwordBookMetaData sbmd, File progdir) throws BookException
      {
!         String dataPath = sbmd.getFirstValue(ConfigEntry.DATA_PATH);
          File baseurl = new File(progdir, dataPath);
          String path = baseurl.getAbsolutePath();
--- 277,281 ----
      public Book createBook(SwordBookMetaData sbmd, File progdir) throws BookException
      {
!         String dataPath = sbmd.getProperty(ConfigEntry.DATA_PATH);
          File baseurl = new File(progdir, dataPath);
          String path = baseurl.getAbsolutePath();
***************
*** 301,305 ****
      protected static Backend getCompressedBackend(SwordBookMetaData sbmd, String path) throws BookException
      {
!         String cStr = sbmd.getFirstValue(ConfigEntry.COMPRESS_TYPE);
          if (cStr != null)
          {
--- 301,305 ----
      protected static Backend getCompressedBackend(SwordBookMetaData sbmd, String path) throws BookException
      {
!         String cStr = sbmd.getProperty(ConfigEntry.COMPRESS_TYPE);
          if (cStr != null)
          {
***************
*** 314,318 ****
      protected static boolean isCompressedBackendSupported(SwordBookMetaData sbmd)
      {
!         String cStr = sbmd.getFirstValue(ConfigEntry.COMPRESS_TYPE);
          if (cStr != null)
          {
--- 314,318 ----
      protected static boolean isCompressedBackendSupported(SwordBookMetaData sbmd)
      {
!         String cStr = sbmd.getProperty(ConfigEntry.COMPRESS_TYPE);
          if (cStr != null)
          {