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

[jswordcvs at crosswire.org]

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

Modified Files:
	GBFFilter.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: GBFFilter.java
===================================================================
RCS file: /cvs/jsword/jsword/java/jsword/org/crosswire/jsword/book/filter/gbf/GBFFilter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GBFFilter.java	30 Aug 2004 09:27:07 -0000	1.7
--- GBFFilter.java	5 Mar 2005 22:08:05 -0000	1.8
***************
*** 10,13 ****
--- 10,14 ----
  import org.crosswire.jsword.book.filter.Filter;
  import org.crosswire.jsword.book.filter.FilterException;
+ import org.crosswire.jsword.passage.Key;
  import org.jdom.Element;
  
***************
*** 44,49 ****
       * @see org.crosswire.jsword.book.filter.Filter#toOSIS(org.crosswire.jsword.book.filter.BookDataListener, java.lang.String)
       */
!     public List toOSIS(String plain) throws FilterException
      {
          Element ele = OSISUtil.factory().createDiv();
          LinkedList stack = new LinkedList();
--- 45,51 ----
       * @see org.crosswire.jsword.book.filter.Filter#toOSIS(org.crosswire.jsword.book.filter.BookDataListener, java.lang.String)
       */
!     public List toOSIS(Key key, String plain) throws FilterException
      {
+         DataPolice.setKey(key);
          Element ele = OSISUtil.factory().createDiv();
          LinkedList stack = new LinkedList();
***************
*** 63,66 ****
--- 65,69 ----
  
          stack.removeFirst();
+         DataPolice.setKey(null);
          return ele.removeContent();
      }