You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by le...@locus.apache.org on 2000/11/01 23:39:44 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl XMLScanner.java XMLDocumentScanner.java
lehors 00/11/01 14:39:44
Modified: java/src/org/apache/xerces/impl Tag: xerces_j_2
XMLScanner.java XMLDocumentScanner.java
Log:
fixed a couple of bugs in the new scanAttributeValue method
Revision Changes Path
No revision
No revision
1.1.2.25 +11 -11 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLScanner.java
Index: XMLScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLScanner.java,v
retrieving revision 1.1.2.24
retrieving revision 1.1.2.25
diff -u -r1.1.2.24 -r1.1.2.25
--- XMLScanner.java 2000/11/01 02:02:55 1.1.2.24
+++ XMLScanner.java 2000/11/01 22:39:41 1.1.2.25
@@ -93,7 +93,7 @@
* @author Andy Clark, IBM
* @author Arnaud Le Hors, IBM
*
- * @version $Id: XMLScanner.java,v 1.1.2.24 2000/11/01 02:02:55 lehors Exp $
+ * @version $Id: XMLScanner.java,v 1.1.2.25 2000/11/01 22:39:41 lehors Exp $
*/
public abstract class XMLScanner
implements XMLComponent {
@@ -568,8 +568,8 @@
* @param attributes The attributes list for the scanned attribute.
* @param attrIndex The index of the attribute to use from the list.
*
- * <strong>Note:</strong> This method uses fString and fStringBuffer2,
- * anything in it at the time of calling is lost.
+ * <strong>Note:</strong> This method uses fStringBuffer2, anything in it
+ * at the time of calling is lost.
**/
protected void scanAttributeValue(XMLString value, String atName,
XMLAttributes attributes, int attrIndex)
@@ -584,7 +584,7 @@
fEntityScanner.scanChar();
int entityDepth = fEntityDepth;
- int c = fEntityScanner.scanLiteral(quote, fString);
+ int c = fEntityScanner.scanLiteral(quote, value);
if (c != quote) {
fScanningAttribute = true;
if (DEBUG_ATTR_ENTITIES) {
@@ -597,8 +597,8 @@
}
fStringBuffer2.clear();
do {
- fStringBuffer2.append(fString);
- fAttributeOffset += fString.length;
+ fStringBuffer2.append(value);
+ fAttributeOffset += value.length;
if (DEBUG_ATTR_ENTITIES) {
System.out.println("*** increment attribute offset: "+fAttributeOffset);
}
@@ -684,17 +684,17 @@
fEntityScanner.scanChar();
}
while (true) {
- c = fEntityScanner.scanLiteral(quote, fString);
+ c = fEntityScanner.scanLiteral(quote, value);
if (c != quote || entityDepth == fEntityDepth) {
break;
}
- fStringBuffer2.append(fString);
+ fStringBuffer2.append(value);
fStringBuffer2.append((char)fEntityScanner.scanChar());
}
} while (c != quote);
- fAttributeOffset += fString.length;
- fStringBuffer2.append(fString);
- value = fStringBuffer2;
+ fAttributeOffset += value.length;
+ fStringBuffer2.append(value);
+ value.setValues(fStringBuffer2);
int attrEntityCount = fAttributeEntityStack.size();
if (DEBUG_ATTR_ENTITIES) {
System.out.println("*** add remaining attribute entities: "+attrEntityCount);
1.1.2.57 +3 -5 xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDocumentScanner.java
Index: XMLDocumentScanner.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/Attic/XMLDocumentScanner.java,v
retrieving revision 1.1.2.56
retrieving revision 1.1.2.57
diff -u -r1.1.2.56 -r1.1.2.57
--- XMLDocumentScanner.java 2000/11/01 02:02:55 1.1.2.56
+++ XMLDocumentScanner.java 2000/11/01 22:39:42 1.1.2.57
@@ -102,7 +102,7 @@
* @author Andy Clark, IBM
* @author Arnaud Le Hors, IBM
*
- * @version $Id: XMLDocumentScanner.java,v 1.1.2.56 2000/11/01 02:02:55 lehors Exp $
+ * @version $Id: XMLDocumentScanner.java,v 1.1.2.57 2000/11/01 22:39:42 lehors Exp $
*/
public class XMLDocumentScanner
extends XMLScanner
@@ -261,8 +261,6 @@
/** Pseudo-attribute values. */
private String[] fPseudoAttributeValues = new String[3];
- private XMLString fLiteral = new XMLString();
-
// symbols
/** Symbol: "CDATA". */
@@ -861,10 +859,10 @@
// content
attributes.addAttribute(fAttributeQName, fCDATASymbol, null);
- scanAttributeValue(fLiteral, fAttributeQName.rawname,
+ scanAttributeValue(fString, fAttributeQName.rawname,
attributes, attributes.getLength() - 1);
- attributes.setValue(attributes.getLength() - 1, fLiteral.toString());
+ attributes.setValue(attributes.getLength() - 1, fString.toString());
if (DEBUG_CONTENT_SCANNING) System.out.println("<<< scanAttribute()");
} // scanAttribute(XMLAttributes)