xerces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mrgla...@apache.org
Subject cvs commit: xml-xerces/java/src/org/apache/xerces/impl XMLScanner.java XMLDTDScannerImpl.java XML11NSDocumentScannerImpl.java XMLNSDocumentScannerImpl.java XMLDocumentFragmentScannerImpl.java XML11DocumentScannerImpl.java
Date Wed, 11 Feb 2004 18:55:21 GMT
mrglavas    2004/02/11 10:55:21

  Modified:    java/src/org/apache/xerces/impl XMLScanner.java
                        XMLDTDScannerImpl.java
                        XML11NSDocumentScannerImpl.java
                        XMLNSDocumentScannerImpl.java
                        XMLDocumentFragmentScannerImpl.java
                        XML11DocumentScannerImpl.java
  Log:
  Some cleanup.
  
  Removing some unused parameters from the method
  signature of scanAttributeValue.
  
  Revision  Changes    Path
  1.45      +2 -4      xml-xerces/java/src/org/apache/xerces/impl/XMLScanner.java
  
  Index: XMLScanner.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLScanner.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- XMLScanner.java	26 Jan 2004 19:37:35 -0000	1.44
  +++ XMLScanner.java	11 Feb 2004 18:55:20 -0000	1.45
  @@ -783,10 +783,9 @@
        * @param nonNormalizedValue The XMLString to fill in with the 
        *                           non-normalized value.
        * @param atName The name of the attribute being parsed (for error msgs).
  -     * @param attributes The attributes list for the scanned attribute.
  -     * @param attrIndex The index of the attribute to use from the list.
        * @param checkEntities true if undeclared entities should be reported as VC violation,
 
        *                      false if undeclared entities should be reported as WFC violation.
  +     * @param eleName The name of element to which this attribute belongs.
        *
        * <strong>Note:</strong> This method uses fStringBuffer2, anything in
it
        * at the time of calling is lost.
  @@ -794,7 +793,6 @@
       protected void scanAttributeValue(XMLString value, 
                                         XMLString nonNormalizedValue,
                                         String atName,
  -                                      XMLAttributes attributes, int attrIndex,
                                         boolean checkEntities,String eleName)
           throws IOException, XNIException
       {
  
  
  
  1.47      +2 -3      xml-xerces/java/src/org/apache/xerces/impl/XMLDTDScannerImpl.java
  
  Index: XMLDTDScannerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLDTDScannerImpl.java,v
  retrieving revision 1.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- XMLDTDScannerImpl.java	5 Jan 2004 21:54:17 -0000	1.46
  +++ XMLDTDScannerImpl.java	11 Feb 2004 18:55:20 -0000	1.47
  @@ -1388,8 +1388,7 @@
               }
               // AttValue 
               boolean isVC = !fStandalone  &&  (fSeenExternalDTD || fSeenExternalPE)
;
  -            scanAttributeValue(defaultVal, nonNormalizedDefaultVal, atName,
  -                               fAttributes, 0, isVC,elName);
  +            scanAttributeValue(defaultVal, nonNormalizedDefaultVal, atName, isVC, elName);
           }
           return defaultType;
   
  
  
  
  1.7       +1 -3      xml-xerces/java/src/org/apache/xerces/impl/XML11NSDocumentScannerImpl.java
  
  Index: XML11NSDocumentScannerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XML11NSDocumentScannerImpl.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- XML11NSDocumentScannerImpl.java	23 Jan 2004 15:17:40 -0000	1.6
  +++ XML11NSDocumentScannerImpl.java	11 Feb 2004 18:55:20 -0000	1.7
  @@ -415,8 +415,6 @@
               this.fTempString,
               fTempString2,
               fAttributeQName.rawname,
  -            attributes,
  -            attrIndex,
               isVC,
               fCurrentElement.rawname);
           String value = fTempString.toString();
  
  
  
  1.19      +3 -4      xml-xerces/java/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java
  
  Index: XMLNSDocumentScannerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLNSDocumentScannerImpl.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- XMLNSDocumentScannerImpl.java	22 Oct 2003 18:33:43 -0000	1.18
  +++ XMLNSDocumentScannerImpl.java	11 Feb 2004 18:55:20 -0000	1.19
  @@ -408,10 +408,9 @@
           //REVISIT: one more case needs to be included: external PE and standalone is no
           boolean isVC =  fHasExternalDTD && !fStandalone;
   
  -        // REVISIT: it seems that this function should not take attributes, and length
           scanAttributeValue(this.fTempString, fTempString2,
  -                           fAttributeQName.rawname, attributes,
  -                           attrIndex, isVC,fCurrentElement.rawname);
  +                           fAttributeQName.rawname, isVC, 
  +                           fCurrentElement.rawname);
           String value = fTempString.toString();
           attributes.setValue(attrIndex, value);
           attributes.setNonNormalizedValue(attrIndex, fTempString2.toString());
  
  
  
  1.45      +3 -3      xml-xerces/java/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java
  
  Index: XMLDocumentFragmentScannerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XMLDocumentFragmentScannerImpl.java,v
  retrieving revision 1.44
  retrieving revision 1.45
  diff -u -r1.44 -r1.45
  --- XMLDocumentFragmentScannerImpl.java	26 Jan 2004 17:28:12 -0000	1.44
  +++ XMLDocumentFragmentScannerImpl.java	11 Feb 2004 18:55:20 -0000	1.45
  @@ -873,8 +873,8 @@
           //REVISIT: one more case needs to be included: external PE and standalone is no
           boolean isVC =  fHasExternalDTD && !fStandalone;        
           scanAttributeValue(fTempString, fTempString2,
  -                           fAttributeQName.rawname, attributes,
  -                           attrIndex, isVC,fCurrentElement.rawname);
  +                           fAttributeQName.rawname, isVC, 
  +                           fCurrentElement.rawname);
           attributes.setValue(attrIndex, fTempString.toString());
           attributes.setNonNormalizedValue(attrIndex, fTempString2.toString());
           attributes.setSpecified(attrIndex, true);
  
  
  
  1.17      +2 -4      xml-xerces/java/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java
  
  Index: XML11DocumentScannerImpl.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/XML11DocumentScannerImpl.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- XML11DocumentScannerImpl.java	26 Jan 2004 19:37:35 -0000	1.16
  +++ XML11DocumentScannerImpl.java	11 Feb 2004 18:55:20 -0000	1.17
  @@ -185,10 +185,9 @@
        * @param nonNormalizedValue The XMLString to fill in with the 
        *                           non-normalized value.
        * @param atName The name of the attribute being parsed (for error msgs).
  -     * @param attributes The attributes list for the scanned attribute.
  -     * @param attrIndex The index of the attribute to use from the list.
        * @param checkEntities true if undeclared entities should be reported as VC violation,
 
        *                      false if undeclared entities should be reported as WFC violation.
  +     * @param eleName The name of element to which this attribute belongs.
        *
        * <strong>Note:</strong> This method uses fStringBuffer2, anything in
it
        * at the time of calling is lost.
  @@ -196,7 +195,6 @@
       protected void scanAttributeValue(XMLString value, 
                                         XMLString nonNormalizedValue,
                                         String atName,
  -                                      XMLAttributes attributes, int attrIndex,
                                         boolean checkEntities,String eleName)
           throws IOException, XNIException
       {
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org


Mime
View raw message