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

jswordcvs at crosswire.org jswordcvs at crosswire.org
Sun Nov 28 14:36:33 MST 2004


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

Modified Files:
	SAXEventProviderXMLReader.java 
	TransformingSAXEventProvider.java XMLUtil.java 
	SerializingContentHandler.java 
Log Message:
intellij refactor - safe

Index: SAXEventProviderXMLReader.java
===================================================================
RCS file: /cvs/jsword/common/java/core/org/crosswire/common/xml/SAXEventProviderXMLReader.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** SAXEventProviderXMLReader.java	20 Apr 2004 21:16:08 -0000	1.1
--- SAXEventProviderXMLReader.java	28 Nov 2004 21:36:31 -0000	1.2
***************
*** 11,15 ****
  /**
   * A helper to aid people working with a SAXEventProvider.
!  * 
   * <p><table border='1' cellPadding='3' cellSpacing='0'>
   * <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 11,15 ----
  /**
   * A helper to aid people working with a SAXEventProvider.
!  *
   * <p><table border='1' cellPadding='3' cellSpacing='0'>
   * <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 38,44 ****
       * Constructor SAXEventProviderXMLReader.
       */
!     public SAXEventProviderXMLReader(SAXEventProvider doc_in)
      {
!         this.doc_in = doc_in;
      }
  
--- 38,44 ----
       * Constructor SAXEventProviderXMLReader.
       */
!     public SAXEventProviderXMLReader(SAXEventProvider docIn)
      {
!         this.docIn = docIn;
      }
  
***************
*** 147,151 ****
          }
  
!         doc_in.provideSAXEvents(getContentHandler());
      }
  
--- 147,151 ----
          }
  
!         docIn.provideSAXEvents(getContentHandler());
      }
  
***************
*** 158,165 ****
      }
  
!     private SAXEventProvider doc_in;
!     private ErrorHandler errors;
!     private ContentHandler content;
!     private DTDHandler dtds;
!     private EntityResolver entities;
  }
--- 158,165 ----
      }
  
!     private SAXEventProvider docIn = null;
!     private ErrorHandler errors = null;
!     private ContentHandler content = null;
!     private DTDHandler dtds = null;
!     private EntityResolver entities = null;
  }

Index: SerializingContentHandler.java
===================================================================
RCS file: /cvs/jsword/common/java/core/org/crosswire/common/xml/SerializingContentHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SerializingContentHandler.java	16 Aug 2004 22:07:36 -0000	1.2
--- SerializingContentHandler.java	28 Nov 2004 21:36:31 -0000	1.3
***************
*** 71,75 ****
          if (newlines)
          {
!             buffer.append("\n"); //$NON-NLS-1$
          }
      }
--- 71,75 ----
          if (newlines)
          {
!             buffer.append('\n');
          }
      }
***************
*** 101,105 ****
      public void startElement(String uri, String localname, String qname, Attributes attrs)
      {
!         buffer.append("<"); //$NON-NLS-1$
          if (qname != null)
          {
--- 101,105 ----
      public void startElement(String uri, String localname, String qname, Attributes attrs)
      {
!         buffer.append('<');
          if (qname != null)
          {
***************
*** 113,128 ****
          for (int i = 0; i < attrs.getLength(); i++)
          {
!             buffer.append(" "); //$NON-NLS-1$
              buffer.append(attrs.getLocalName(i));
              buffer.append("=\""); //$NON-NLS-1$
              buffer.append(attrs.getValue(i));
!             buffer.append("\""); //$NON-NLS-1$
          }
  
!         buffer.append(">"); //$NON-NLS-1$
  
          if (newlines)
          {
!             buffer.append("\n"); //$NON-NLS-1$
          }
      }
--- 113,128 ----
          for (int i = 0; i < attrs.getLength(); i++)
          {
!             buffer.append(' ');
              buffer.append(attrs.getLocalName(i));
              buffer.append("=\""); //$NON-NLS-1$
              buffer.append(attrs.getValue(i));
!             buffer.append('\"');
          }
  
!         buffer.append('>');
  
          if (newlines)
          {
!             buffer.append('\n');
          }
      }
***************
*** 143,151 ****
          }
  
!         buffer.append(">"); //$NON-NLS-1$
  
          if (newlines)
          {
!             buffer.append("\n"); //$NON-NLS-1$
          }
      }
--- 143,151 ----
          }
  
!         buffer.append('>');
  
          if (newlines)
          {
!             buffer.append('\n');
          }
      }
***************
*** 176,180 ****
          buffer.append("<!"); //$NON-NLS-1$
          buffer.append(target);
!         buffer.append(" "); //$NON-NLS-1$
          buffer.append(data);
          buffer.append("!>"); //$NON-NLS-1$
--- 176,180 ----
          buffer.append("<!"); //$NON-NLS-1$
          buffer.append(target);
!         buffer.append(' ');
          buffer.append(data);
          buffer.append("!>"); //$NON-NLS-1$
***************
*** 182,186 ****
          if (newlines)
          {
!             buffer.append("\n"); //$NON-NLS-1$
          }
      }
--- 182,186 ----
          if (newlines)
          {
!             buffer.append('\n');
          }
      }

Index: TransformingSAXEventProvider.java
===================================================================
RCS file: /cvs/jsword/common/java/core/org/crosswire/common/xml/TransformingSAXEventProvider.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TransformingSAXEventProvider.java	8 Sep 2004 19:54:24 -0000	1.3
--- TransformingSAXEventProvider.java	28 Nov 2004 21:36:31 -0000	1.4
***************
*** 29,33 ****
   * A SAXEventProvider that gets its output data from an XSL stylesheet and
   * another SAXEventProvider (supplying input XML).
!  * 
   * <p><table border='1' cellPadding='3' cellSpacing='0'>
   * <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 29,33 ----
   * A SAXEventProvider that gets its output data from an XSL stylesheet and
   * another SAXEventProvider (supplying input XML).
!  *
   * <p><table border='1' cellPadding='3' cellSpacing='0'>
   * <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 296,300 ****
          public TemplateInfo(Templates templates, long modtime)
          {
-             super();
              this.templates = templates;
              this.modtime = modtime;
--- 296,299 ----

Index: XMLUtil.java
===================================================================
RCS file: /cvs/jsword/common/java/core/org/crosswire/common/xml/XMLUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** XMLUtil.java	30 Aug 2004 09:27:28 -0000	1.6
--- XMLUtil.java	28 Nov 2004 21:36:31 -0000	1.7
***************
*** 15,19 ****
  /**
   * Utilities for working with SAX XML parsing.
!  * 
   * <p><table border='1' cellPadding='3' cellSpacing='0'>
   * <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
--- 15,19 ----
  /**
   * Utilities for working with SAX XML parsing.
!  *
   * <p><table border='1' cellPadding='3' cellSpacing='0'>
   * <tr><td bgColor='white' class='TableRowColor'><font size='-7'>
***************
*** 83,87 ****
          for (int i = 0; i < attrs.getLength(); i++)
          {
!             log.debug("attr[" + i + "]: " + attrs.getQName(i) + "=" + attrs.getValue(i)); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
          }
      }
--- 83,87 ----
          for (int i = 0; i < attrs.getLength(); i++)
          {
!             log.debug("attr[" + i + "]: " + attrs.getQName(i) + '=' + attrs.getValue(i)); //$NON-NLS-1$ //$NON-NLS-2$
          }
      }
***************
*** 174,178 ****
              broken = broken.substring(0, broken.length() - 1);
          }
!         if (broken.startsWith("&")) //$NON-NLS-1$
          {
              broken = broken.substring(1);
--- 174,178 ----
              broken = broken.substring(0, broken.length() - 1);
          }
!         if (broken.charAt(0) == '&')
          {
              broken = broken.substring(1);



More information about the jsword-svn mailing list