santiagopg 02/05/14 12:50:21
Modified: java/src/org/apache/xalan/xsltc TransletOutputHandler.java
java/src/org/apache/xalan/xsltc/compiler Text.java
java/src/org/apache/xalan/xsltc/runtime SAXAdapter.java
StringValueHandler.java TextOutput.java
TransletOutputBase.java
Log:
Added characters(String) to TextOutputHandler.
Revision Changes Path
1.8 +2 -1
xml-xalan/java/src/org/apache/xalan/xsltc/TransletOutputHandler.java
Index: TransletOutputHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/TransletOutputHandler.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TransletOutputHandler.java 27 Aug 2001 12:38:32 -0000 1.7
+++ TransletOutputHandler.java 14 May 2002 19:50:21 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TransletOutputHandler.java,v 1.7 2001/08/27 12:38:32 morten Exp $
+ * @(#)$Id: TransletOutputHandler.java,v 1.8 2002/05/14 19:50:21 santiagopg
Exp $
*
* The Apache Software License, Version 1.1
*
@@ -73,6 +73,7 @@
public void endDocument() throws TransletException;
public void startElement(String elementName) throws TransletException;
public void endElement(String elementName) throws TransletException;
+ public void characters(String characters) throws TransletException;
public void characters(char[] characters, int offset, int length)
throws TransletException;
public void attribute(String attributeName, String attributeValue)
1.11 +3 -8
xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Text.java
Index: Text.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/compiler/Text.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Text.java 11 May 2002 14:22:49 -0000 1.10
+++ Text.java 14 May 2002 19:50:21 -0000 1.11
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: Text.java,v 1.10 2002/05/11 14:22:49 santiagopg Exp $
+ * @(#)$Id: Text.java,v 1.11 2002/05/14 19:50:21 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -168,17 +168,12 @@
il.append(new INVOKEINTERFACE(esc, 2));
}
- final int toCharArr = cpg.addMethodref("java/lang/String",
- "toCharArray", "()[C");
final int characters = cpg.addInterfaceMethodref(OUTPUT_HANDLER,
"characters",
- "([CII)V");
+ "(" + STRING_SIG +
")V");
il.append(methodGen.loadHandler());
il.append(new PUSH(cpg, _text));
- il.append(new INVOKEVIRTUAL(toCharArr));
- il.append(new ICONST(0));
- il.append(new PUSH(cpg, _text.length()));
- il.append(new INVOKEINTERFACE(characters, 4));
+ il.append(new INVOKEINTERFACE(characters, 2));
// Restore character escaping setting to whatever it was.
// Note: setEscaping(bool) returns the original (old) value
1.12 +5 -1
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/SAXAdapter.java
Index: SAXAdapter.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/SAXAdapter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SAXAdapter.java 24 Apr 2002 17:03:16 -0000 1.11
+++ SAXAdapter.java 14 May 2002 19:50:21 -0000 1.12
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: SAXAdapter.java,v 1.11 2002/04/24 17:03:16 santiagopg Exp $
+ * @(#)$Id: SAXAdapter.java,v 1.12 2002/05/14 19:50:21 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -106,6 +106,10 @@
}
}
+ public void characters(String characters) throws TransletException {
+ characters(characters.toCharArray(), 0, characters.length());
+ }
+
public void characters(char[] characters, int offset, int length)
throws TransletException {
try {
1.5 +8 -2
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/StringValueHandler.java
Index: StringValueHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/StringValueHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- StringValueHandler.java 24 Apr 2002 17:03:16 -0000 1.4
+++ StringValueHandler.java 14 May 2002 19:50:21 -0000 1.5
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: StringValueHandler.java,v 1.4 2002/04/24 17:03:16 santiagopg Exp
$
+ * @(#)$Id: StringValueHandler.java,v 1.5 2002/05/14 19:50:21 santiagopg Exp
$
*
* The Apache Software License, Version 1.1
*
@@ -71,7 +71,9 @@
private char[] _buffer = new char[32];
private int _free = 0;
- public void characters(char[] ch, int off, int len) {
+ public void characters(char[] ch, int off, int len)
+ throws TransletException
+ {
if (_free + len >= _buffer.length) {
char[] newBuffer = new char[_free + len + 32];
System.arraycopy(_buffer, 0, newBuffer, 0, _free);
@@ -85,6 +87,10 @@
final int length = _free;
_free = 0; // getValue resets
return new String(_buffer, 0, length);
+ }
+
+ public void characters(String characters) throws TransletException {
+ characters(characters.toCharArray(), 0, characters.length());
}
/**
1.56 +8 -7
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TextOutput.java
Index: TextOutput.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TextOutput.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- TextOutput.java 24 Apr 2002 17:03:16 -0000 1.55
+++ TextOutput.java 14 May 2002 19:50:21 -0000 1.56
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TextOutput.java,v 1.55 2002/04/24 17:03:16 santiagopg Exp $
+ * @(#)$Id: TextOutput.java,v 1.56 2002/05/14 19:50:21 santiagopg Exp $
*
* The Apache Software License, Version 1.1
*
@@ -335,12 +335,13 @@
}
}
- /**
- * Utility method - pass a string to the SAX handler's characters()
method
- */
- private void characters(String str) throws SAXException {
- final char[] ch = str.toCharArray();
- characters(ch, 0, ch.length);
+ public void characters(String str) throws TransletException {
+ try {
+ characters(str.toCharArray(), 0, str.length());
+ }
+ catch (SAXException e) {
+ throw new TransletException(e);
+ }
}
/**
1.8 +2 -1
xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TransletOutputBase.java
Index: TransletOutputBase.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/xsltc/runtime/TransletOutputBase.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TransletOutputBase.java 27 Aug 2001 12:38:32 -0000 1.7
+++ TransletOutputBase.java 14 May 2002 19:50:21 -0000 1.8
@@ -1,5 +1,5 @@
/*
- * @(#)$Id: TransletOutputBase.java,v 1.7 2001/08/27 12:38:32 morten Exp $
+ * @(#)$Id: TransletOutputBase.java,v 1.8 2002/05/14 19:50:21 santiagopg Exp
$
*
* The Apache Software License, Version 1.1
*
@@ -71,6 +71,7 @@
public class TransletOutputBase implements TransletOutputHandler {
public void startDocument() throws TransletException {}
public void endDocument() throws TransletException {}
+ public void characters(String characters) throws TransletException {}
public void characters(char[] characters, int offset, int length)
throws TransletException {}
public void startElement(String elementName) throws TransletException {}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
