[jsword-svn] common/java/core/org/crosswire/common/xml s

[jswordcvs at crosswire.org]

Update of /cvs/jsword/common/java/core/org/crosswire/common/xml
In directory www.crosswire.org:/tmp/cvs-serv27112/java/core/org/crosswire/common/xml

Modified Files:
	PrettySerializingContentHandler.java 
Log Message:
Fixed two display problems: 1) <tag/> not displaying properly and verse on separate lines had verse number on a preceding line.

Index: PrettySerializingContentHandler.java
===================================================================
RCS file: /cvs/jsword/common/java/core/org/crosswire/common/xml/PrettySerializingContentHandler.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PrettySerializingContentHandler.java	20 Mar 2005 02:34:52 -0000	1.3
--- PrettySerializingContentHandler.java	23 Mar 2005 02:50:52 -0000	1.4
***************
*** 147,169 ****
      {
          depth--;
!         if (pendingEndTag)
!         {
!             if (formatting.isAnalytic() && depth > 0)
!             {
!                 emitWhitespace(depth - 1);
!             }
! 
!             // Hack alert JTextPane cannot handle <br/>
!             if (localname.equalsIgnoreCase("br")) //$NON-NLS-1$
!             {
!                 write(getTagEnd());
!             }
!             else
!             {
!                 write(getEmptyTagEnd());
!             }
!         }
!         else
!         {
              if (formatting.isClassic())
              {
--- 147,170 ----
      {
          depth--;
! //      Java cannot display empty tags <tag/>
! //        if (pendingEndTag)
! //        {
! //            if (formatting.isAnalytic() && depth > 0)
! //            {
! //                emitWhitespace(depth - 1);
! //            }
! //
! //            // Hack alert JTextPane cannot handle <br/>
! //            if (localname.equalsIgnoreCase("br")) //$NON-NLS-1$
! //            {
! //                write(getTagEnd());
! //            }
! //            else
! //            {
! //                write(getEmptyTagEnd());
! //            }
! //        }
! //        else
! //        {
              if (formatting.isClassic())
              {
***************
*** 181,185 ****
  
              write(getTagEnd());
!         }
          pendingEndTag = false;
          lookingForChars = false;
--- 182,186 ----
  
              write(getTagEnd());
! //        }
          pendingEndTag = false;
          lookingForChars = false;