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

[jswordcvs at crosswire.org]

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

Modified Files:
	THMLFilter.java 
Log Message:
Improved error reporting when parsing modules. Specifically, I added Key as a n argument to toOSIS in Filter and its derivatives. On entry into the routine, I called DataPolice.setKey(key) and on exit, DataPolice.setKey(null)

Index: THMLFilter.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/thml/THMLFilter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** THMLFilter.java	19 Aug 2004 16:54:49 -0000	1.12
--- THMLFilter.java	5 Mar 2005 22:08:05 -0000	1.13
***************
*** 16,19 ****
--- 16,20 ----
  import org.crosswire.jsword.book.filter.Filter;
  import org.crosswire.jsword.book.filter.FilterUtil;
+ import org.crosswire.jsword.passage.Key;
  import org.jdom.Element;
  import org.xml.sax.InputSource;
***************
*** 55,60 ****
       * @see org.crosswire.jsword.book.filter.Filter#toOSIS(org.crosswire.jsword.book.filter.BookDataListener, java.lang.String)
       */
!     public List toOSIS(String plain)
      {
          Element ele = null;
          try
--- 56,62 ----
       * @see org.crosswire.jsword.book.filter.Filter#toOSIS(org.crosswire.jsword.book.filter.BookDataListener, java.lang.String)
       */
!     public List toOSIS(Key key, String plain)
      {
+         DataPolice.setKey(key);
          Element ele = null;
          try
***************
*** 105,108 ****
--- 107,114 ----
              }
          }
+         finally
+         {
+             DataPolice.setKey(null);
+         }
          return ele.removeContent();
      }