You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@apache.org on 2001/01/02 04:36:55 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/xslt package.html
sboag 01/01/01 19:36:55
Modified: java/src/org/apache/xalan/client XSLTProcessorApplet.java
package.html
java/src/org/apache/xalan/extensions ExtensionHandler.java
ExtensionHandlerGeneral.java
ExtensionHandlerJavaClass.java
ExtensionHandlerJavaPackage.java
ExtensionsTable.java MethodResolver.java
package.html
java/src/org/apache/xalan/lib package.html
java/src/org/apache/xalan/lib/sql ColumnAttribute.java
package.html
java/src/org/apache/xalan/processor
CompiledStylesheetBundle.java
CompilingStylesheetHandler.java
CompilingStylesheetProcessor.java
ProcessorOutputElem.java
TransformerFactoryImpl.java
XSLProcessorVersion.java XSLTAttributeDef.java
package.html
java/src/org/apache/xalan/res XSLTErrorResources.java
XSLTInfo.properties package.html
java/src/org/apache/xalan/stree CDATASectionImpl.java
CommentImpl.java DocumentTypeImpl.java
ElementImpl.java Parent.java
ProcessingInstructionImpl.java
SaxEventDispatch.java SourceTreeHandler.java
TextImpl.java package.html
java/src/org/apache/xalan/templates AVT.java
AVTPartSimple.java AVTPartXPath.java
DecimalFormatProperties.java
ElemApplyTemplates.java ElemAttribute.java
ElemAttributeSet.java ElemCallTemplate.java
ElemCopyOf.java ElemElement.java
ElemExtensionCall.java ElemExtensionDecl.java
ElemExtensionScript.java ElemForEach.java
ElemIf.java ElemLiteralResult.java ElemMessage.java
ElemNumber.java ElemPI.java ElemSort.java
ElemTemplate.java ElemTemplateElement.java
ElemText.java ElemTextLiteral.java ElemUse.java
ElemValueOf.java ElemVariable.java ElemWhen.java
ElemWithParam.java FuncDocument.java
FuncFormatNumb.java KeyDeclaration.java
NamespaceAlias.java OutputProperties.java
Stylesheet.java StylesheetComposed.java
StylesheetRoot.java TemplateList.java
WhiteSpaceInfo.java XMLNSDecl.java
XUnresolvedVariable.java output_html.properties
output_text.properties output_xml.properties
package.html
java/src/org/apache/xalan/trace GenerateEvent.java
PrintTraceListener.java TraceListener.java
package.html
java/src/org/apache/xalan/transformer CountersTable.java
DecimalToRoman.java KeyIterator.java
KeyManager.java KeyRefIterator.java KeyWalker.java
MsgMgr.java NumeratorFormatter.java
ResultTreeHandler.java TrAXFilter.java
TransformerImpl.java package.html
java/src/org/apache/xalan/xslt package.html
Log:
Javadoc work
Revision Changes Path
1.15 +10 -5 xml-xalan/java/src/org/apache/xalan/client/XSLTProcessorApplet.java
Index: XSLTProcessorApplet.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/client/XSLTProcessorApplet.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSLTProcessorApplet.java 2000/12/19 17:45:06 1.14
+++ XSLTProcessorApplet.java 2001/01/02 03:36:32 1.15
@@ -102,7 +102,8 @@
{
/**
- * The stylesheet processor
+ * The stylesheet processor.
+ * @serial
*/
TransformerFactory m_tfactory = null;
@@ -150,10 +151,14 @@
*/
private URL m_codeBase = null;
+ /**
+ * @serial
+ */
private String m_treeURL = null;
/**
- * DocumentBase URL
+ * DocumentBase URL
+ * @serial
*/
private URL m_documentBase = null;
@@ -585,7 +590,7 @@
* XML itself, not for rendering of HTML by the browser.
*
* @return XML source document as a string.
- * @exception Exception thrown if tree can not be converted.
+ * @throws Exception thrown if tree can not be converted.
*/
public String getSourceTreeAsText() throws Exception
{
@@ -598,7 +603,7 @@
* XML itself, not for rendering of HTML by the browser.
*
* @return The XSL stylesheet as a string.
- * @exception Exception thrown if tree can not be converted.
+ * @throws Exception thrown if tree can not be converted.
*/
public String getStyleTreeAsText() throws Exception
{
@@ -611,7 +616,7 @@
* XML itself, not for rendering of HTML by the browser.
*
* @return Transformation result as unmarked text.
- * @exception Exception thrown if tree can not be converted.
+ * @throws Exception thrown if tree can not be converted.
*/
public String getResultTreeAsText() throws Exception
{
1.3 +0 -4 xml-xalan/java/src/org/apache/xalan/client/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/client/package.html,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- package.html 2000/10/17 12:53:28 1.2
+++ package.html 2001/01/02 03:36:33 1.3
@@ -2,10 +2,6 @@
<title>Xalan Client Package.</title>
<body>
<p>Implementation of Xalan applet.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
</html>
1.12 +6 -6 xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandler.java
Index: ExtensionHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ExtensionHandler.java 2000/12/21 06:22:19 1.11
+++ ExtensionHandler.java 2001/01/02 03:36:33 1.12
@@ -188,7 +188,7 @@
*
* @return the return value of the function evaluation.
*
- * @exception TransformerException if parsing trouble
+ * @throws TransformerException if parsing trouble
*/
public abstract Object callFunction(
String funcName, Vector args, Object methodKey,
@@ -208,12 +208,12 @@
* @param sourceNode The current context node.
* @param methodKey A key that uniquely identifies this class and method call.
*
- * @exception XSLProcessorException thrown if something goes wrong
+ * @throws XSLProcessorException thrown if something goes wrong
* while running the extension handler.
- * @exception MalformedURLException if loading trouble
- * @exception FileNotFoundException if loading trouble
- * @exception IOException if loading trouble
- * @exception TransformerException if parsing trouble
+ * @throws MalformedURLException if loading trouble
+ * @throws FileNotFoundException if loading trouble
+ * @throws IOException if loading trouble
+ * @throws TransformerException if parsing trouble
*/
public abstract void processElement(
String localPart, Element element, TransformerImpl transformer,
1.10 +6 -11 xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java
Index: ExtensionHandlerGeneral.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerGeneral.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ExtensionHandlerGeneral.java 2000/12/14 16:57:25 1.9
+++ ExtensionHandlerGeneral.java 2001/01/02 03:36:33 1.10
@@ -274,12 +274,7 @@
*
* @return the return value of the function evaluation.
*
- * @exception XSLProcessorException thrown if something goes wrong
- * while running the extension handler.
- * @exception MalformedURLException if loading trouble
- * @exception FileNotFoundException if loading trouble
- * @exception IOException if loading trouble
- * @exception TransformerException if parsing trouble
+ * @throws TransformerException if parsing trouble
*/
public Object callFunction(
String funcName, Vector args, Object methodKey, ExpressionContext exprContext)
@@ -342,12 +337,12 @@
* @param sourceNode The current context node.
* @param methodKey A key that uniquely identifies this class and method call.
*
- * @exception XSLProcessorException thrown if something goes wrong
+ * @throws XSLProcessorException thrown if something goes wrong
* while running the extension handler.
- * @exception MalformedURLException if loading trouble
- * @exception FileNotFoundException if loading trouble
- * @exception IOException if loading trouble
- * @exception TransformerException if parsing trouble
+ * @throws MalformedURLException if loading trouble
+ * @throws FileNotFoundException if loading trouble
+ * @throws IOException if loading trouble
+ * @throws TransformerException if parsing trouble
*/
public void processElement(
String localPart, Element element, TransformerImpl transformer, Stylesheet stylesheetTree, Node sourceTree, Node sourceNode, QName mode, Object methodKey)
1.9 +3 -3 xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java
Index: ExtensionHandlerJavaClass.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaClass.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExtensionHandlerJavaClass.java 2000/12/03 21:12:35 1.8
+++ ExtensionHandlerJavaClass.java 2001/01/02 03:36:34 1.9
@@ -213,7 +213,7 @@
* @param methodKey A key that uniquely identifies this class and method call.
* @param exprContext The context in which this expression is being executed.
* @return the return value of the function evaluation.
- * @exception TransformerException
+ * @throws TransformerException
*/
public Object callFunction (String funcName,
@@ -374,8 +374,8 @@
* @param sourceNode The current context node.
* @param mode The current mode.
* @param methodKey A key that uniquely identifies this element call.
- * @exception IOException if loading trouble
- * @exception TransformerException if parsing trouble
+ * @throws IOException if loading trouble
+ * @throws TransformerException if parsing trouble
*/
public void processElement(String localPart,
1.9 +3 -8 xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java
Index: ExtensionHandlerJavaPackage.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionHandlerJavaPackage.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ExtensionHandlerJavaPackage.java 2000/12/03 21:12:35 1.8
+++ ExtensionHandlerJavaPackage.java 2001/01/02 03:36:34 1.9
@@ -231,12 +231,7 @@
*
* @return the return value of the function evaluation.
*
- * @exception XSLProcessorException thrown if something goes wrong
- * while running the extension handler.
- * @exception MalformedURLException if loading trouble
- * @exception FileNotFoundException if loading trouble
- * @exception IOException if loading trouble
- * @exception TransformerException if parsing trouble
+ * @throws TransformerException if parsing trouble
*/
public Object callFunction (String funcName,
@@ -411,8 +406,8 @@
* @param sourceNode The current context node.
* @param mode The current mode.
* @param methodKey A key that uniquely identifies this element call.
- * @exception IOException if loading trouble
- * @exception TransformerException if parsing trouble
+ * @throws IOException if loading trouble
+ * @throws TransformerException if parsing trouble
*/
public void processElement (String localPart,
1.13 +0 -1 xml-xalan/java/src/org/apache/xalan/extensions/ExtensionsTable.java
Index: ExtensionsTable.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/ExtensionsTable.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ExtensionsTable.java 2000/12/14 16:57:27 1.12
+++ ExtensionsTable.java 2001/01/02 03:36:34 1.13
@@ -74,7 +74,6 @@
* Table of extensions that may be called from the expression language
* via the call(name, ...) function. Objects are keyed on the call
* name.
- * @see extensions.html.
*/
public Hashtable m_extensionFunctionNamespaces = new Hashtable();
1.18 +5 -5 xml-xalan/java/src/org/apache/xalan/extensions/MethodResolver.java
Index: MethodResolver.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/MethodResolver.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- MethodResolver.java 2000/11/13 16:26:36 1.17
+++ MethodResolver.java 2001/01/02 03:36:34 1.18
@@ -110,7 +110,7 @@
* @param argsOut An array of the exact size as argsIn, which will be
* populated with converted arguments if a suitable method is found.
* @return A constructor that will work with the argsOut array.
- * @exception TransformerException may be thrown for Xalan conversion
+ * @throws TransformerException may be thrown for Xalan conversion
* exceptions.
*/
public static Constructor getConstructor(Class classObj,
@@ -202,7 +202,7 @@
* @param argsOut An array of the exact size as argsIn, which will be
* populated with converted arguments if a suitable method is found.
* @return A method that will work with the argsOut array.
- * @exception TransformerException may be thrown for Xalan conversion
+ * @throws TransformerException may be thrown for Xalan conversion
* exceptions.
*/
public static Method getMethod(Class classObj,
@@ -324,7 +324,7 @@
* @param classObj The Class of the object that should have the method.
* @param name The name of the method to be invoked.
* @return A method that will work to be called as an element.
- * @exception TransformerException may be thrown for Xalan conversion
+ * @throws TransformerException may be thrown for Xalan conversion
* exceptions.
*/
public static Method getElementMethod(Class classObj,
@@ -398,7 +398,7 @@
* populated with converted arguments.
* @param paramTypes An array of class objects, of the exact same
* size as argsIn and argsOut.
- * @exception TransformerException may be thrown for Xalan conversion
+ * @throws TransformerException may be thrown for Xalan conversion
* exceptions.
*/
public static void convertParams(Object[] argsIn,
@@ -662,7 +662,7 @@
* @param javaClass The type of object to convert to.
* @returns An object suitable for passing to the Method.invoke
* function in the args array, which may be null in some cases.
- * @exception TransformerException may be thrown for Xalan conversion
+ * @throws TransformerException may be thrown for Xalan conversion
* exceptions.
*/
static Object convert(Object xsltObj, Class javaClass)
1.2 +2 -6 xml-xalan/java/src/org/apache/xalan/extensions/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/extensions/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/06 02:28:02 1.1
+++ package.html 2001/01/02 03:36:34 1.2
@@ -1,12 +1,8 @@
<html>
<title>Xalan Extension Mechanism Package.</title>
<body>
- <p>Implementation of Xalan Extension Mechanism,
- which uses the Bean Scripting Framework.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
+ <p>Implementation of Xalan Extension Mechanism.<p>
+ </body>
</html>
1.4 +2 -6 xml-xalan/java/src/org/apache/xalan/lib/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/package.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- package.html 2000/10/16 19:04:30 1.3
+++ package.html 2001/01/02 03:36:37 1.4
@@ -1,13 +1,9 @@
<html>
<title>Xalan Extensions.</title>
<body>
- <p>Extension elements and functions shipped with Xalan-Java</p>
+ <p>Extension elements and functions shipped with Xalan-Java</p>
<p>We are adding extensions to this package.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
- </body>
+ </body>
</html>
1.5 +1 -1 xml-xalan/java/src/org/apache/xalan/lib/sql/ColumnAttribute.java
Index: ColumnAttribute.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/ColumnAttribute.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ColumnAttribute.java 2000/12/14 19:06:05 1.4
+++ ColumnAttribute.java 2001/01/02 03:36:38 1.5
@@ -92,7 +92,7 @@
* <li>writable</li>
* <li>searchable</li>
* </ul>
- * @see org.apache.xalan.lib.sql.ColumnHeader.
+ * @see org.apache.xalan.lib.sql.ColumnHeader
*/
public class ColumnAttribute extends StreamableNode implements Attr
{
1.2 +0 -4 xml-xalan/java/src/org/apache/xalan/lib/sql/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/sql/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/09/22 19:46:29 1.1
+++ package.html 2001/01/02 03:36:39 1.2
@@ -68,9 +68,5 @@
</xsl:stylesheet>
</pre>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, September 23, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
</html>
1.12 +2 -2 xml-xalan/java/src/org/apache/xalan/processor/CompiledStylesheetBundle.java
Index: CompiledStylesheetBundle.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/CompiledStylesheetBundle.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- CompiledStylesheetBundle.java 2000/11/23 04:57:22 1.11
+++ CompiledStylesheetBundle.java 2001/01/02 03:36:41 1.12
@@ -284,9 +284,9 @@
*
* @param String filename Filesystem name of the bundle file to be loaded.
* @return Stylesheet as loaded.
- * @exception java.io.IOException if there are any problems reading the
+ * @throws java.io.IOException if there are any problems reading the
* bundle file
- * @exception java.lang.ClassNotFoundException if a class used in
+ * @throws java.lang.ClassNotFoundException if a class used in
* serializing the Stylesheet can't be resolved. This could be a glitch
* in the bundle, but is more likely to be incompatable versions if the
* Xalan code was changed between when the bundle was created and when it
1.23 +2 -2 xml-xalan/java/src/org/apache/xalan/processor/CompilingStylesheetHandler.java
Index: CompilingStylesheetHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/CompilingStylesheetHandler.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- CompilingStylesheetHandler.java 2000/12/18 23:56:47 1.22
+++ CompilingStylesheetHandler.java 2001/01/02 03:36:41 1.23
@@ -116,7 +116,7 @@
/**
* Create a StylesheetHandler object, creating a root stylesheet
* as the target.
- * @exception May throw TransformerConfigurationException if a StylesheetRoot
+ * @throws May throw TransformerConfigurationException if a StylesheetRoot
* can not be constructed for some reason.
*/
public CompilingStylesheetHandler(TransformerFactoryImpl processor)
@@ -130,7 +130,7 @@
* Run standard cleanup of the internal representation,
* then start trying to replace that rep with custom code.
*
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
+ * @throws org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
* @see org.xml.sax.ContentHandler#endDocument
*/
1.6 +1 -1 xml-xalan/java/src/org/apache/xalan/processor/CompilingStylesheetProcessor.java
Index: CompilingStylesheetProcessor.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/CompilingStylesheetProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CompilingStylesheetProcessor.java 2000/11/13 16:26:42 1.5
+++ CompilingStylesheetProcessor.java 2001/01/02 03:36:42 1.6
@@ -91,7 +91,7 @@
* the TransformerFactory class simply derive from org.xml.sax.ContentHandler?</dd>
* </dl>
* @return A TemplatesBuilder object, or null if not supported.
- * @exception May throw a TransformerConfigurationException if a StylesheetHandler can
+ * @throws May throw a TransformerConfigurationException if a StylesheetHandler can
* not be constructed for some reason.
*
* @throws TransformerConfigurationException
1.12 +10 -10 xml-xalan/java/src/org/apache/xalan/processor/ProcessorOutputElem.java
Index: ProcessorOutputElem.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/ProcessorOutputElem.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ProcessorOutputElem.java 2000/12/08 22:48:01 1.11
+++ ProcessorOutputElem.java 2001/01/02 03:36:42 1.12
@@ -87,7 +87,7 @@
/**
* Set the cdata-section-elements property from the attribute value.
- * @see {@link javax.xml.transform.OutputKeys#CDATA_SECTION_ELEMENTS}
+ * @see javax.xml.transform.OutputKeys#CDATA_SECTION_ELEMENTS
* @param newValue non-null reference to processed attribute value.
*/
public void setCdataSectionElements(java.util.Vector newValue)
@@ -97,7 +97,7 @@
/**
* Set the doctype-public property from the attribute value.
- * @see {@link javax.xml.transform.OutputKeys#DOCTYPE_PUBLIC}
+ * @see javax.xml.transform.OutputKeys#DOCTYPE_PUBLIC
* @param newValue non-null reference to processed attribute value.
*/
public void setDoctypePublic(String newValue)
@@ -107,7 +107,7 @@
/**
* Set the doctype-system property from the attribute value.
- * @see {@link javax.xml.transform.OutputKeys#DOCTYPE_SYSTEM}
+ * @see javax.xml.transform.OutputKeys#DOCTYPE_SYSTEM
* @param newValue non-null reference to processed attribute value.
*/
public void setDoctypeSystem(String newValue)
@@ -117,7 +117,7 @@
/**
* Set the encoding property from the attribute value.
- * @see {@link javax.xml.transform.OutputKeys#ENCODING}
+ * @see javax.xml.transform.OutputKeys#ENCODING
* @param newValue non-null reference to processed attribute value.
*/
public void setEncoding(String newValue)
@@ -127,7 +127,7 @@
/**
* Set the indent property from the attribute value.
- * @see {@link javax.xml.transform.OutputKeys#INDENT}
+ * @see javax.xml.transform.OutputKeys#INDENT
* @param newValue non-null reference to processed attribute value.
*/
public void setIndent(boolean newValue)
@@ -137,7 +137,7 @@
/**
* Set the media type property from the attribute value.
- * @see {@link javax.xml.transform.OutputKeys#MEDIA_TYPE}
+ * @see javax.xml.transform.OutputKeys#MEDIA_TYPE
* @param newValue non-null reference to processed attribute value.
*/
public void setMediaType(String newValue)
@@ -147,7 +147,7 @@
/**
* Set the method property from the attribute value.
- * @see {@link javax.xml.transform.OutputKeys#METHOD}
+ * @see javax.xml.transform.OutputKeys#METHOD
* @param newValue non-null reference to processed attribute value.
*/
public void setMethod(org.apache.xml.utils.QName newValue)
@@ -157,7 +157,7 @@
/**
* Set the omit-xml-declaration property from the attribute value.
- * @see {@link javax.xml.transform.OutputKeys#OMIT_XML_DECLARATION}
+ * @see javax.xml.transform.OutputKeys#OMIT_XML_DECLARATION
* @param newValue processed attribute value.
*/
public void setOmitXmlDeclaration(boolean newValue)
@@ -167,7 +167,7 @@
/**
* Set the standalone property from the attribute value.
- * @see {@link javax.xml.transform.OutputKeys#STANDALONE}
+ * @see javax.xml.transform.OutputKeys#STANDALONE
* @param newValue processed attribute value.
*/
public void setStandalone(boolean newValue)
@@ -177,7 +177,7 @@
/**
* Set the version property from the attribute value.
- * @see {@link javax.xml.transform.OutputKeys#VERSION}
+ * @see javax.xml.transform.OutputKeys#VERSION
* @param newValue non-null reference to processed attribute value.
*/
public void setVersion(String newValue)
1.18 +6 -39 xml-xalan/java/src/org/apache/xalan/processor/TransformerFactoryImpl.java
Index: TransformerFactoryImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/TransformerFactoryImpl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- TransformerFactoryImpl.java 2000/12/31 09:33:14 1.17
+++ TransformerFactoryImpl.java 2001/01/02 03:36:42 1.18
@@ -381,7 +381,7 @@
* @return A Transformer object that may be used to perform a transformation
* in a single thread, never null.
*
- * @exception TransformerConfigurationException May throw this during
+ * @throws TransformerConfigurationException May throw this during
* the parse when it is constructing the
* Templates object and fails.
*/
@@ -436,7 +436,7 @@
* @param name The name of the attribute.
* @param value The value of the attribute.
*
- * @exception IllegalArgumentException thrown if the underlying
+ * @throws IllegalArgumentException thrown if the underlying
* implementation doesn't recognize the attribute.
*/
public void setAttribute(String name, Object value)
@@ -452,7 +452,7 @@
* @param name The name of the attribute.
* @return value The value of the attribute.
*
- * @exception IllegalArgumentException thrown if the underlying
+ * @throws IllegalArgumentException thrown if the underlying
* implementation doesn't recognize the attribute.
*/
public Object getAttribute(String name) throws IllegalArgumentException
@@ -589,7 +589,7 @@
* @return A Transformer object capable of
* being used for transformation purposes in a single thread.
*
- * @exception TransformerConfigurationException May throw this during the parse when it
+ * @throws TransformerConfigurationException May throw this during the parse when it
* is constructing the Templates object and fails.
*/
public Transformer newTransformer(Source source)
@@ -608,7 +608,7 @@
* @return A Transformer object capable of
* being used for transformation purposes in a single thread.
*
- * @exception TransformerConfigurationException May throw this during
+ * @throws TransformerConfigurationException May throw this during
* the parse when it is constructing the
* Templates object and it fails.
*/
@@ -642,7 +642,7 @@
* @param source An object that holds a URL, input stream, etc.
* @return A Templates object capable of being used for transformation purposes.
*
- * @exception TransformerConfigurationException May throw this during the parse when it
+ * @throws TransformerConfigurationException May throw this during the parse when it
* is constructing the Templates object and fails.
*/
public Templates newTemplates(Source source)
@@ -740,39 +740,6 @@
}
return builder.getTemplates();
- }
-
- /**
- * Method setProperty
- *
- * @param name
- * @param value
- *
- * @throws TransformerConfigurationException
- */
- public void setProperty(String name, Object value)
- throws TransformerConfigurationException
- {
-
- // No action at the moment
- return;
- }
-
- /**
- * Method getProperty
- *
- * @param name
- *
- * @return
- *
- * @throws TransformerConfigurationException
- */
- public Object getProperty(String name)
- throws TransformerConfigurationException
- {
-
- // No action at the moment
- return null;
}
/**
1.11 +1 -1 xml-xalan/java/src/org/apache/xalan/processor/XSLProcessorVersion.java
Index: XSLProcessorVersion.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLProcessorVersion.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- XSLProcessorVersion.java 2000/12/20 13:35:23 1.10
+++ XSLProcessorVersion.java 2001/01/02 03:36:42 1.11
@@ -79,7 +79,7 @@
* Version String like <CODE>"<B>Xalan</B>i v.r[.dd| <B>D</B>nn]"</CODE>.
* <P>Semantics of the version string are identical to the Xerces project.</P>
*/
- public static String S_VERSION = "2.0_D05";
+ public static String S_VERSION = "2.0_D06";
/**
* Constant name of product.
1.16 +1 -1 xml-xalan/java/src/org/apache/xalan/processor/XSLTAttributeDef.java
Index: XSLTAttributeDef.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTAttributeDef.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XSLTAttributeDef.java 2000/12/19 22:01:09 1.15
+++ XSLTAttributeDef.java 2001/01/02 03:36:42 1.16
@@ -330,7 +330,7 @@
* @param key The XSLT attribute value.
*
* @return The integer representation of the enumerated value for this attribute.
- * @exception Throws NullPointerException if m_enums is null.
+ * @throws Throws NullPointerException if m_enums is null.
*/
private int getEnum(String key)
{
1.4 +13 -11 xml-xalan/java/src/org/apache/xalan/processor/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/package.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- package.html 2000/09/07 19:47:58 1.3
+++ package.html 2001/01/02 03:36:42 1.4
@@ -4,17 +4,19 @@
<p>Parses an XSLT stylesheet document (which may include and import other stylesheet documents) and produces a StylesheetRoot
(a TRaX Templates object).</p>
- <p>StylesheetProcessor implements the TRaX Processor interface. It registers a StylesheetHandler
- (a TrAX TemplatesBuilder) as the SAX ContentHandler for an XMLReader, and uses the XMLReader to parse the stylesheet
- document.</p>
- <p>Before parsing the XSLT input, StylesheetHandler assembles an XSLT schema (see XSLTSchema), which uses XSLTElementDef
- and XSLTAttributeDef objects to recursively define the elements and attributes that an XSLT stylesheet may contain. The
- StylesheetHandler then passes on each parse event to the XSLTElementProcessor which the XSLTElementDef assigned to the
- element associated with that event.</p>
- <dl>
- <dt><b>Version: </b></dt><dd>xalan-j_2_0_D01, September 6, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
+ <p>StylesheetProcessor implements the TRaX {@link javax.xml.transform.TransformerFactory} interface,
+ as well as the {@link javax.xml.transform.sax.SAXTransformerFactory} interface.
+ It registers the {@link org.apache.xalan.processor.StylesheetHandler} object
+ (a TrAX {@link javax.xml.transform.sax.TemplatesHandler} implementation)
+ as the SAX ContentHandler for an XMLReader, and uses the XMLReader to parse
+ the stylesheet document.</p>
+ <p>Before parsing the XSLT input, StylesheetHandler assembles an {@link org.apache.xalan.processor.XSLTSchema},
+ which uses {@link org.apache.xalan.processor.XSLTElementDef}
+ and {@link org.apache.xalan.processor.XSLTAttributeDef} objects to
+ recursively define the elements and attributes that an XSLT stylesheet may
+ contain. The StylesheetHandler then passes on each parse event to the
+ {@link org.apache.xalan.processor.XSLTElementProcessor} which the
+ XSLTElementDef assigned to the element associated with that event.</p>
</body>
</html>
1.13 +4 -4 xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources.java
Index: XSLTErrorResources.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTErrorResources.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XSLTErrorResources.java 2000/12/14 22:45:42 1.12
+++ XSLTErrorResources.java 2001/01/02 03:36:42 1.13
@@ -1533,7 +1533,7 @@
/**
* Get a string representation of the error code.
*
- * @param errorCode Should be a valid error code less than {@link MAX_CODE}.
+ * @param errorCode Should be a valid error code less than {@link #MAX_CODE}.
*
* @return A string representation of the error code, or null if code is
* greater than MAX_CODE.
@@ -1554,7 +1554,7 @@
/**
* Get a string representation of the warning code.
*
- * @param errorCode Should be a valid warning code less than {@link MAX_WARNING}.
+ * @param errorCode Should be a valid warning code less than {@link #MAX_WARNING}.
*
* @return A string representation of the warning code, or null if code is
* greater than MAX_WARNING.
@@ -1575,7 +1575,7 @@
/**
* Get a string representation of the message code. (same as getMessageKey).
*
- * @param errorCode Should be a valid error code less than {@link MAX_CODE}.
+ * @param errorCode Should be a valid error code less than {@link #MAX_CODE}.
*
* @return A string representation of the error code, or null if code is
* greater than MAX_CODE.
@@ -1595,7 +1595,7 @@
/**
* Get a string representation of the warning code.
*
- * @param errorCode Should be a valid warning code less than {@link MAX_WARNING}.
+ * @param errorCode Should be a valid warning code less than {@link #MAX_WARNING}.
*
* @return A string representation of the warning code, or null if code is
* greater than MAX_WARNING.
1.9 +1 -1 xml-xalan/java/src/org/apache/xalan/res/XSLTInfo.properties
Index: XSLTInfo.properties
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/res/XSLTInfo.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSLTInfo.properties 2000/12/20 13:35:35 1.8
+++ XSLTInfo.properties 2001/01/02 03:36:42 1.9
@@ -2,7 +2,7 @@
# XSLT Resource File
#
-version=2.0.d5
+version=2.0.d6
vendor=Apache Software Foundation
vendor-url=http://xml.apache.org/xalan
1.2 +1 -4 xml-xalan/java/src/org/apache/xalan/res/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/res/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/06 02:28:08 1.1
+++ package.html 2001/01/02 03:36:43 1.2
@@ -2,10 +2,7 @@
<title>Xalan resource Package.</title>
<body>
<p>Contains strings that require internationalization.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
+ </body>
</html>
1.8 +1 -1 xml-xalan/java/src/org/apache/xalan/stree/CDATASectionImpl.java
Index: CDATASectionImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/CDATASectionImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CDATASectionImpl.java 2000/11/23 04:57:36 1.7
+++ CDATASectionImpl.java 2001/01/02 03:36:43 1.8
@@ -138,7 +138,7 @@
*
* @param ch Content Handler
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void dispatchSaxEvent(ContentHandler ch) throws org.xml.sax.SAXException
{
1.8 +1 -1 xml-xalan/java/src/org/apache/xalan/stree/CommentImpl.java
Index: CommentImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/CommentImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- CommentImpl.java 2000/11/23 04:57:37 1.7
+++ CommentImpl.java 2001/01/02 03:36:43 1.8
@@ -139,7 +139,7 @@
*
* @param ch Character array with comment data
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void dispatchSaxEvent(ContentHandler ch) throws org.xml.sax.SAXException
{
1.8 +4 -4 xml-xalan/java/src/org/apache/xalan/stree/DocumentTypeImpl.java
Index: DocumentTypeImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/DocumentTypeImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DocumentTypeImpl.java 2000/11/16 08:14:09 1.7
+++ DocumentTypeImpl.java 2001/01/02 03:36:43 1.8
@@ -262,7 +262,7 @@
* @return If the new <code>Node</code> replaces an existing node the
* replaced <code>Node</code> is returned, otherwise <code>null</code>
* is returned.
- * @exception DOMException
+ * @throws DOMException
* WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a
* different document than the one that created this map.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
@@ -287,7 +287,7 @@
* @param nameThe <code>nodeName</code> of the node to remove.
* @return The node removed from this map if a node with such a name
* exists.
- * @exception DOMException
+ * @throws DOMException
* NOT_FOUND_ERR: Raised if there is no node named <code>name</code> in
* this map.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
@@ -348,7 +348,7 @@
* @return If the new <code>Node</code> replaces an existing node the
* replaced <code>Node</code> is returned, otherwise <code>null</code>
* is returned.
- * @exception DOMException
+ * @throws DOMException
* WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a
* different document than the one that created this map.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
@@ -376,7 +376,7 @@
* @param localNameThe local name of the node to remove.
* @return The node removed from this map if a node with such a local
* name and namespace URI exists.
- * @exception DOMException
+ * @throws DOMException
* NOT_FOUND_ERR: Raised if there is no node with the specified
* <code>namespaceURI</code> and <code>localName</code> in this map.
* <br>NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
1.22 +6 -6 xml-xalan/java/src/org/apache/xalan/stree/ElementImpl.java
Index: ElementImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/ElementImpl.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ElementImpl.java 2000/12/31 09:51:44 1.21
+++ ElementImpl.java 2001/01/02 03:36:43 1.22
@@ -173,8 +173,8 @@
* @param i the index of the child.
*
* @return the attribute child at the specified position
- * @exception ArrayIndexOutOfBoundsException if the index is out of bounds.
- * @exception NullPointerException if there are no children.
+ * @throws ArrayIndexOutOfBoundsException if the index is out of bounds.
+ * @throws NullPointerException if there are no children.
*/
public AttrImpl getChildAttribute(int i)
throws ArrayIndexOutOfBoundsException, NullPointerException
@@ -770,7 +770,7 @@
* @return If the new <code>Node</code> replaces an existing node the
* replaced <code>Node</code> is returned, otherwise <code>null</code>
* is returned.
- * @exception DOMException
+ * @throws DOMException
* WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a
* different document than the one that created this map.
* <br> NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
@@ -797,7 +797,7 @@
* @param name The <code>nodeName</code> of the node to remove.
* @return The node removed from this map if a node with such a name
* exists.
- * @exception DOMException
+ * @throws DOMException
* NOT_FOUND_ERR: Raised if there is no node named <code>name</code>
* in this map.
* <br> NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
@@ -902,7 +902,7 @@
* @return If the new <code>Node</code> replaces an existing node the
* replaced <code>Node</code> is returned, otherwise <code>null</code>
* is returned.
- * @exception DOMException
+ * @throws DOMException
* WRONG_DOCUMENT_ERR: Raised if <code>arg</code> was created from a
* different document than the one that created this map.
* <br> NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
@@ -934,7 +934,7 @@
* @param localName The local name of the node to remove.
* @return The node removed from this map if a node with such a local
* name and namespace URI exists.
- * @exception DOMException
+ * @throws DOMException
* NOT_FOUND_ERR: Raised if there is no node with the specified
* <code>namespaceURI</code> and <code>localName</code> in this map.
* <br> NO_MODIFICATION_ALLOWED_ERR: Raised if this map is readonly.
1.17 +3 -3 xml-xalan/java/src/org/apache/xalan/stree/Parent.java
Index: Parent.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/Parent.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Parent.java 2000/12/31 09:44:15 1.16
+++ Parent.java 2001/01/02 03:36:43 1.17
@@ -203,8 +203,8 @@
* @param i the index of the child.
*
* @return The child node at the specified position or null if none found
- * @exception ArrayIndexOutOfBoundsException if the index is out of bounds.
- * @exception NullPointerException if there are no children.
+ * @throws ArrayIndexOutOfBoundsException if the index is out of bounds.
+ * @throws NullPointerException if there are no children.
*/
public Child getChild(int i)
throws ArrayIndexOutOfBoundsException, NullPointerException
@@ -319,7 +319,7 @@
* @param newChild Must be a org.apache.xalan.stree.Child.
*
* @return The node we just added to this parent's children list
- * @exception ClassCastException if the newChild isn't a org.apache.xalan.stree.Child.
+ * @throws ClassCastException if the newChild isn't a org.apache.xalan.stree.Child.
*
* @throws DOMException
*/
1.6 +1 -1 xml-xalan/java/src/org/apache/xalan/stree/ProcessingInstructionImpl.java
Index: ProcessingInstructionImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/ProcessingInstructionImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ProcessingInstructionImpl.java 2000/11/08 20:45:10 1.5
+++ ProcessingInstructionImpl.java 2001/01/02 03:36:43 1.6
@@ -149,7 +149,7 @@
* preceding the <code>?></code>.
*
* @return This PI's data
- * @exception DOMException
+ * @throws DOMException
* NO_MODIFICATION_ALLOWED_ERR: Raised when the node is readonly.
*/
public String getData()
1.3 +1 -1 xml-xalan/java/src/org/apache/xalan/stree/SaxEventDispatch.java
Index: SaxEventDispatch.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/SaxEventDispatch.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SaxEventDispatch.java 2000/11/13 16:27:07 1.2
+++ SaxEventDispatch.java 2001/01/02 03:36:43 1.3
@@ -85,7 +85,7 @@
*
* @param ch A non-null reference to a ContentHandler.
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void dispatchSaxEvent(ContentHandler ch)
throws org.xml.sax.SAXException;
1.28 +25 -31 xml-xalan/java/src/org/apache/xalan/stree/SourceTreeHandler.java
Index: SourceTreeHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/SourceTreeHandler.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- SourceTreeHandler.java 2000/12/31 09:54:04 1.27
+++ SourceTreeHandler.java 2001/01/02 03:36:43 1.28
@@ -322,7 +322,7 @@
/**
* Implement the startDocument event.
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void startDocument() throws org.xml.sax.SAXException
{
@@ -412,7 +412,7 @@
/**
* Implement the endDocument event.
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void endDocument() throws org.xml.sax.SAXException
{
@@ -497,7 +497,7 @@
* @param name Name of the element
* @param atts List of attributes associated with the element
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void startElement(
String ns, String localName, String name, Attributes atts)
@@ -533,7 +533,7 @@
* @param localName Local part of the qualified name of the element
* @param name Name of the element
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void endElement(String ns, String localName, String name)
throws org.xml.sax.SAXException
@@ -565,7 +565,7 @@
* the regular {@link org.xml.sax.ContentHandler#characters
* characters} event.</p>
*
- * @exception TransformerException The application may raise an exception.
+ * @throws org.xml.sax.SAXException The application may raise an exception.
* @see #endCDATA
*/
public void startCDATA() throws org.xml.sax.SAXException
@@ -576,7 +576,7 @@
/**
* Report the end of a CDATA section.
*
- * @exception TransformerException The application may raise an exception.
+ * @throws org.xml.sax.SAXException The application may raise an exception.
* @see #startCDATA
*/
public void endCDATA() throws org.xml.sax.SAXException
@@ -591,7 +591,7 @@
* @param start Start index of characters to process in the array
* @param length Number of characters to process in the array
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void characters(char ch[], int start, int length) throws org.xml.sax.SAXException
{
@@ -631,7 +631,7 @@
* @param start Start index of characters to process in the array
* @param length Number of characters to process in the array
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void charactersRaw(char ch[], int start, int length)
throws org.xml.sax.SAXException
@@ -652,7 +652,7 @@
* @param start Start index of characters to process in the array
* @param length Number of characters to process in the array
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void ignorableWhitespace(char ch[], int start, int length)
throws org.xml.sax.SAXException
@@ -675,7 +675,7 @@
* @param target Target of PI node
* @param data Content of PI node
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void processingInstruction(String target, String data)
throws org.xml.sax.SAXException
@@ -699,7 +699,7 @@
* @param ch An array holding the characters in the comment.
* @param start The starting position in the array.
* @param length The number of characters to use from the array.
- * @exception TransformerException The application may raise an exception.
+ * @throws org.xml.sax.SAXException The application may raise an exception.
*/
public void comment(char ch[], int start, int length) throws org.xml.sax.SAXException
{
@@ -726,7 +726,7 @@
*
* @param name The name of the entity. If it is a parameter
* entity, the name will begin with '%'.
- * @exception TransformerException The application may raise an exception.
+ * @throws org.xml.sax.SAXException The application may raise an exception.
* @see #endEntity
* @see org.xml.sax.ext.DeclHandler#internalEntityDecl
* @see org.xml.sax.ext.DeclHandler#externalEntityDecl
@@ -745,7 +745,7 @@
* Report the end of an entity.
*
* @param name The name of the entity that is ending.
- * @exception TransformerException The application may raise an exception.
+ * @throws org.xml.sax.SAXException The application may raise an exception.
* @see #startEntity
*/
public void endEntity(String name) throws org.xml.sax.SAXException
@@ -771,7 +771,7 @@
* external DTD subset, or null if none was declared.
* @param systemId The declared system identifier for the
* external DTD subset, or null if none was declared.
- * @exception TransformerException The application may raise an
+ * @throws org.xml.sax.SAXException The application may raise an
* exception.
* @see #endDTD
* @see #startEntity
@@ -790,7 +790,7 @@
/**
* Report the end of DTD declarations.
*
- * @exception TransformerException The application may raise an exception.
+ * @throws org.xml.sax.SAXException The application may raise an exception.
* @see #startDTD
*/
public void endDTD() throws org.xml.sax.SAXException
@@ -822,12 +822,10 @@
*
* @param prefix The Namespace prefix being declared.
* @param uri The Namespace URI the prefix is mapped to.
- * @exception javax.xml.transform.TransformerException The client may throw
- * an exception during processing.
* @see #endPrefixMapping
* @see #startElement
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void startPrefixMapping(String prefix, String uri)
throws org.xml.sax.SAXException
@@ -850,12 +848,10 @@
* guaranteed.</p>
*
* @param prefix The prefix that was being mapping.
- * @exception javax.xml.transform.TransformerException The client may throw
- * an exception during processing.
* @see #startPrefixMapping
* @see #endElement
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void endPrefixMapping(String prefix) throws org.xml.sax.SAXException
{
@@ -879,10 +875,8 @@
*
* @param name The name of the skipped entity. If it is a
* parameter entity, the name will begin with '%'.
- * @exception javax.xml.transform.TransformerException Any SAX exception, possibly
- * wrapping another exception.
*
- * @throws TransformerException
+ * @throws org.xml.sax.SAXException
*/
public void skippedEntity(String name) throws org.xml.sax.SAXException
{
@@ -950,7 +944,7 @@
*
* @param result A Result instance, should not be null.
*
- * @throws TransformerException if result is invalid for some reason.
+ * @throws IllegalArgumentException if result is invalid for some reason.
*/
public void setResult(Result result)
throws IllegalArgumentException
@@ -1025,7 +1019,7 @@
*
* @param name The element type name.
* @param model The content model as a normalized string.
- * @exception SAXException The application may raise an exception.
+ * @throws SAXException The application may raise an exception.
*/
public void elementDecl (String name, String model)
throws org.xml.sax.SAXException
@@ -1050,7 +1044,7 @@
* none of these applies.
* @param value A string representing the attribute's default value,
* or null if there is none.
- * @exception SAXException The application may raise an exception.
+ * @throws SAXException The application may raise an exception.
*/
public void attributeDecl (String eName,
String aName,
@@ -1071,7 +1065,7 @@
* @param name The name of the entity. If it is a parameter
* entity, the name will begin with '%'.
* @param value The replacement text of the entity.
- * @exception SAXException The application may raise an exception.
+ * @throws SAXException The application may raise an exception.
* @see #externalEntityDecl
* @see org.xml.sax.DTDHandler#unparsedEntityDecl
*/
@@ -1092,7 +1086,7 @@
* @param publicId The declared public identifier of the entity, or
* null if none was declared.
* @param systemId The declared system identifier of the entity.
- * @exception SAXException The application may raise an exception.
+ * @throws SAXException The application may raise an exception.
* @see #internalEntityDecl
* @see org.xml.sax.DTDHandler#unparsedEntityDecl
*/
@@ -1121,7 +1115,7 @@
* none was given.
* @param systemId The notation's system identifier, or null if
* none was given.
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
+ * @throws org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
* @see #unparsedEntityDecl
* @see org.xml.sax.AttributeList
@@ -1145,7 +1139,7 @@
* <p>If the system identifier is a URL, the parser must resolve it
* fully before passing it to the application.</p>
*
- * @exception org.xml.sax.SAXException Any SAX exception, possibly
+ * @throws org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
* @param name The unparsed entity's name.
* @param publicId The entity's public identifier, or null if none
1.10 +1 -1 xml-xalan/java/src/org/apache/xalan/stree/TextImpl.java
Index: TextImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/TextImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TextImpl.java 2000/12/31 09:40:32 1.9
+++ TextImpl.java 2001/01/02 03:36:43 1.10
@@ -140,7 +140,7 @@
*
* @param ch Content handler to handle SAX events
*
- * @throws TransformerException
+ * @throws SAXException if the content handler characters event throws a SAXException.
*/
public void dispatchSaxEvent(ContentHandler ch)
throws org.xml.sax.SAXException
1.2 +10 -7 xml-xalan/java/src/org/apache/xalan/stree/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/stree/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/06 02:28:09 1.1
+++ package.html 2001/01/02 03:36:43 1.2
@@ -2,13 +2,16 @@
<title>Xalan Source Tree Package.</title>
<body>
<p>Implementation of the Xalan Source Tree, which is a DOM implementation that
- is optimized for XSLT processing and the needs of Xalan -- derived nodes can index
- the children, and, combined with specialized node iterators (and tree walkers) can
- provide optimal child retrieval.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
+ is optimized for XSLT processing and the needs of Xalan. The primary feature
+ of the Stree is that nodes can be parsed on one thread, while they are being
+ read on another thread. If a requested child node has not yet arrived, the
+ reading thread will wait until the parse thread has produced the node, thrown
+ an exception, or marked the parent as complete. Stree nodes also contain a
+ document order index, which is used in conjunction with the XPath module to
+ optimize certain operations. Stree text nodes also do not build String objects
+ until requested, and are capable of directly dispatching text events to a
+ ContentHandler.<p>
+ </body>
</html>
1.13 +6 -1 xml-xalan/java/src/org/apache/xalan/templates/AVT.java
Index: AVT.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/AVT.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AVT.java 2000/12/27 22:26:25 1.12
+++ AVT.java 2001/01/02 03:36:45 1.13
@@ -84,16 +84,19 @@
/**
* If the AVT is not complex, just hold the simple string.
+ * @serial
*/
private String m_simpleString = null;
/**
* If the AVT is complex, hold a Vector of AVTParts.
+ * @serial
*/
private Vector m_parts = null;
/**
* The name of the attribute.
+ * @serial
*/
private String m_rawName;
@@ -119,6 +122,7 @@
/**
* The name of the attribute.
+ * @serial
*/
private String m_name;
@@ -143,7 +147,8 @@
}
/**
- * The name of the attribute.
+ * The namespace URI of the owning attribute.
+ * @serial
*/
private String m_uri;
1.9 +1 -0 xml-xalan/java/src/org/apache/xalan/templates/AVTPartSimple.java
Index: AVTPartSimple.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/AVTPartSimple.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- AVTPartSimple.java 2000/12/13 19:47:20 1.8
+++ AVTPartSimple.java 2001/01/02 03:36:45 1.9
@@ -70,6 +70,7 @@
/**
* Simple string value;
+ * @serial
*/
private String m_val;
1.11 +2 -1 xml-xalan/java/src/org/apache/xalan/templates/AVTPartXPath.java
Index: AVTPartXPath.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/AVTPartXPath.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AVTPartXPath.java 2000/12/27 22:26:25 1.10
+++ AVTPartXPath.java 2001/01/02 03:36:45 1.11
@@ -72,7 +72,8 @@
{
/**
- * Simple string value;
+ * The XPath object contained in this part.
+ * @serial
*/
private XPath m_xpath;
1.10 +3 -1 xml-xalan/java/src/org/apache/xalan/templates/DecimalFormatProperties.java
Index: DecimalFormatProperties.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/DecimalFormatProperties.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DecimalFormatProperties.java 2000/12/13 21:56:19 1.9
+++ DecimalFormatProperties.java 2001/01/02 03:36:45 1.10
@@ -96,7 +96,8 @@
public class DecimalFormatProperties extends ElemTemplateElement
{
- /** An instance of DecimalFormatSymbols for this element */
+ /** An instance of DecimalFormatSymbols for this element.
+ * @serial */
DecimalFormatSymbols m_dfs;
/**
@@ -142,6 +143,7 @@
/**
* If there is a name attribute, then the element declares a named
* decimal-format; otherwise, it declares the default decimal-format.
+ * @serial
*/
private QName m_qname = null;
1.12 +2 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemApplyTemplates.java
Index: ElemApplyTemplates.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemApplyTemplates.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemApplyTemplates.java 2000/12/21 02:11:23 1.11
+++ ElemApplyTemplates.java 2001/01/02 03:36:45 1.12
@@ -92,6 +92,7 @@
/**
* mode %qname; #IMPLIED
+ * @serial
*/
private QName m_mode = null;
@@ -120,6 +121,7 @@
* in which case it will act different with
* regard to processing modes.
* @see <a href="http://www.w3.org/TR/xslt#built-in-rule">built-in-rule in XSLT Specification</a>
+ * @serial
*/
private boolean m_isDefaultTemplate = false;
1.12 +2 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemAttribute.java
Index: ElemAttribute.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemAttribute.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemAttribute.java 2000/12/31 09:59:38 1.11
+++ ElemAttribute.java 2001/01/02 03:36:45 1.12
@@ -86,11 +86,13 @@
/**
* The local name which should be used.
+ * @serial
*/
public AVT m_name_avt = null;
/**
* The namespace which should be used.
+ * @serial
*/
public AVT m_namespace_avt = null;
1.8 +1 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemAttributeSet.java
Index: ElemAttributeSet.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemAttributeSet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemAttributeSet.java 2000/12/05 22:29:23 1.7
+++ ElemAttributeSet.java 2001/01/02 03:36:45 1.8
@@ -86,6 +86,7 @@
/**
* The name attribute specifies the name of the attribute set.
+ * @serial
*/
public QName m_qname = null;
1.13 +4 -1 xml-xalan/java/src/org/apache/xalan/templates/ElemCallTemplate.java
Index: ElemCallTemplate.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemCallTemplate.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemCallTemplate.java 2000/12/20 05:02:22 1.12
+++ ElemCallTemplate.java 2001/01/02 03:36:45 1.13
@@ -88,6 +88,7 @@
/**
* An xsl:call-template element invokes a template by name;
* it has a required name attribute that identifies the template to be invoked.
+ * @serial
*/
public QName m_templateName = null;
@@ -117,6 +118,7 @@
/**
* The template which is named by QName.
+ * @serial
*/
private ElemTemplateElement m_template = null;
@@ -204,7 +206,8 @@
}
}
- /** Vector of xsl:param elements associated with this element */
+ /** Vector of xsl:param elements associated with this element.
+ * @serial */
protected Vector m_paramElems = null;
/**
1.10 +1 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemCopyOf.java
Index: ElemCopyOf.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemCopyOf.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemCopyOf.java 2000/12/05 22:29:25 1.9
+++ ElemCopyOf.java 2001/01/02 03:36:45 1.10
@@ -86,6 +86,7 @@
/**
* The required select attribute contains an expression.
+ * @serial
*/
public XPath m_selectExpression = null;
1.12 +3 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemElement.java
Index: ElemElement.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemElement.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemElement.java 2000/12/05 22:29:25 1.11
+++ ElemElement.java 2001/01/02 03:36:46 1.12
@@ -89,6 +89,7 @@
* The name attribute is interpreted as an attribute value template.
* It is an error if the string that results from instantiating the
* attribute value template is not a QName.
+ * @serial
*/
private AVT m_name_avt = null;
@@ -123,6 +124,7 @@
* as an attribute value template. The string that results from
* instantiating the attribute value template should be a URI reference.
* It is not an error if the string is not a syntactically legal URI reference.
+ * @serial
*/
private AVT m_namespace_avt = null;
@@ -156,6 +158,7 @@
/**
* Cached prefix value... the use of which is dubious.
+ * @serial
*/
private String m_prefix;
1.18 +10 -5 xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java
Index: ElemExtensionCall.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionCall.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- ElemExtensionCall.java 2000/12/05 22:29:26 1.17
+++ ElemExtensionCall.java 2001/01/02 03:36:46 1.18
@@ -91,7 +91,8 @@
// ExtensionNSHandler nsh;
- /** The Namespace URI for this extension call element */
+ /** The Namespace URI for this extension call element.
+ * @serial */
String m_extns;
// String m_extHandlerLookup;
@@ -99,16 +100,20 @@
/** Flag indicating if the extension is available for execution */
transient boolean isAvailable = false;
- /** Language used by extension */
+ /** Language used by extension.
+ * @serial */
String m_lang;
- /** URL pointing to extension */
+ /** URL pointing to extension.
+ * @serial */
String m_srcURL;
- /** Source for script */
+ /** Source for script.
+ * @serial */
String m_scriptSrc;
- /** Declaration for Extension element */
+ /** Declaration for Extension element.
+ * @serial */
ElemExtensionDecl m_decl = null;
/**
1.14 +6 -3 xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionDecl.java
Index: ElemExtensionDecl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionDecl.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemExtensionDecl.java 2000/12/05 22:29:26 1.13
+++ ElemExtensionDecl.java 2001/01/02 03:36:46 1.14
@@ -89,7 +89,8 @@
// System.out.println("ElemExtensionDecl ctor");
}
- /** Prefix string for this extension element */
+ /** Prefix string for this extension element.
+ * @serial */
private String m_prefix = null;
/**
@@ -114,7 +115,8 @@
return m_prefix;
}
- /** StringVector holding the names of functions defined in this extension */
+ /** StringVector holding the names of functions defined in this extension.
+ * @serial */
private StringVector m_functions = new StringVector();
/**
@@ -169,7 +171,8 @@
return (null != m_functions) ? m_functions.size() : 0;
}
- /** StringVector of elements defined in this extension */
+ /** StringVector of elements defined in this extension.
+ * @serial */
private StringVector m_elements = null;
/**
1.5 +4 -2 xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionScript.java
Index: ElemExtensionScript.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemExtensionScript.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemExtensionScript.java 2000/12/05 22:29:26 1.4
+++ ElemExtensionScript.java 2001/01/02 03:36:46 1.5
@@ -73,7 +73,8 @@
// System.out.println("ElemExtensionScript ctor");
}
- /** Language used in extension */
+ /** Language used in extension.
+ * @serial */
private String m_lang = null;
/**
@@ -98,7 +99,8 @@
return m_lang;
}
- /** Extension handler */
+ /** Extension handler.
+ * @serial */
private String m_src = null;
/**
1.15 +4 -2 xml-xalan/java/src/org/apache/xalan/templates/ElemForEach.java
Index: ElemForEach.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemForEach.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemForEach.java 2000/12/21 02:11:23 1.14
+++ ElemForEach.java 2001/01/02 03:36:46 1.15
@@ -107,6 +107,7 @@
/**
* The "select" expression.
+ * @serial
*/
private XPath m_selectExpression = null;
@@ -142,7 +143,8 @@
? getStylesheetRoot().m_selectDefault : m_selectExpression;
}
- /** Vector containing the xsl:sort elements associated with this element */
+ /** Vector containing the xsl:sort elements associated with this element.
+ * @serial */
protected Vector m_sortElems = null;
/**
@@ -360,7 +362,7 @@
*
* @param transformer non-null reference to the the current transform-time state.
* @param sourceNode non-null reference to the <a href="http://www.w3.org/TR/xslt#dt-current-node">current source node</a>.
- * @exception TransformerException Thrown in a variety of circumstances.
+ * @throws TransformerException Thrown in a variety of circumstances.
* @param stylesheetTree The owning stylesheet tree.
* @param xslInstruction The stylesheet element context (depricated -- I do
* not think we need this).
1.8 +1 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemIf.java
Index: ElemIf.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemIf.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemIf.java 2000/12/05 22:29:27 1.7
+++ ElemIf.java 2001/01/02 03:36:46 1.8
@@ -86,6 +86,7 @@
/**
* The xsl:if element must have a test attribute, which specifies an expression.
+ * @serial
*/
private XPath m_test = null;
1.19 +11 -1 xml-xalan/java/src/org/apache/xalan/templates/ElemLiteralResult.java
Index: ElemLiteralResult.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemLiteralResult.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ElemLiteralResult.java 2000/12/31 09:57:02 1.18
+++ ElemLiteralResult.java 2001/01/02 03:36:46 1.19
@@ -90,6 +90,8 @@
/**
* Tells if this element represents a root element
* that is also the stylesheet element.
+ * TODO: This should be a derived class.
+ * @serial
*/
private boolean isLiteralResultAsStylesheet = false;
@@ -123,10 +125,12 @@
* The created element node will have the attribute nodes
* that were present on the element node in the stylesheet tree,
* other than attributes with names in the XSLT namespace.
+ * @serial
*/
private Vector m_avts = null;
- /** List of attributes with the XSLT namespace. */
+ /** List of attributes with the XSLT namespace.
+ * @serial */
private Vector m_xslAttr = null;
/**
@@ -301,6 +305,7 @@
/**
* The namespace of the element to be created.
+ * @serial
*/
private String m_namespace;
@@ -333,6 +338,7 @@
/**
* The local name of the element to be created.
+ * @serial
*/
private String m_localName;
@@ -363,6 +369,7 @@
/**
* The raw name of the element to be created.
+ * @serial
*/
private String m_rawName;
@@ -390,6 +397,7 @@
/**
* The "extension-element-prefixes" property, actually contains URIs.
+ * @serial
*/
private StringVector m_ExtensionElementURIs;
@@ -478,6 +486,7 @@
/**
* The XSLT version as specified by this element.
+ * @serial
*/
private String m_version;
@@ -494,6 +503,7 @@
/**
* The "exclude-result-prefixes" property.
+ * @serial
*/
private StringVector m_excludeResultPrefixes;
1.8 +1 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemMessage.java
Index: ElemMessage.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemMessage.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemMessage.java 2000/12/05 22:29:28 1.7
+++ ElemMessage.java 2001/01/02 03:36:46 1.8
@@ -86,6 +86,7 @@
* If the terminate attribute has the value yes, then the
* XSLT transformer should terminate processing after sending
* the message. The default value is no.
+ * @serial
*/
private boolean m_terminate = Constants.ATTRVAL_NO; // default value
1.15 +11 -3 xml-xalan/java/src/org/apache/xalan/templates/ElemNumber.java
Index: ElemNumber.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemNumber.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ElemNumber.java 2000/12/19 17:47:18 1.14
+++ ElemNumber.java 2001/01/02 03:36:46 1.15
@@ -108,6 +108,7 @@
/**
* Only nodes are counted that match this pattern.
+ * @serial
*/
private XPath m_countMatchPattern = null;
@@ -152,6 +153,7 @@
* For level="any:
* Only nodes after the first node before the
* current node that match the from pattern are considered.
+ * @serial
*/
private XPath m_fromMatchPattern = null;
@@ -213,6 +215,7 @@
* the union of the members of the preceding and ancestor-or-self axes). If the
* from attribute is specified, then only nodes after the first node before the
* current node that match the from pattern are considered.
+ * @serial
*/
private int m_level = Constants.NUMBERLEVEL_SINGLE;
@@ -246,6 +249,7 @@
* The value attribute contains an expression. The expression is evaluated
* and the resulting object is converted to a number as if by a call to the
* number function.
+ * @serial
*/
private XPath m_valueExpr = null;
@@ -279,6 +283,7 @@
* The "format" attribute is used to control conversion of a list of
* numbers into a string.
* @see <a href="http://www.w3.org/TR/xslt#convert">convert in XSLT Specification</a>
+ * @serial
*/
private AVT m_format_avt = null;
@@ -311,6 +316,7 @@
/**
* When numbering with an alphabetic sequence, the lang attribute
* specifies which language's alphabet is to be used.
+ * @serial
*/
private AVT m_lang_avt = null;
@@ -349,6 +355,7 @@
/**
* The letter-value attribute disambiguates between numbering
* sequences that use letters.
+ * @serial
*/
private AVT m_lettervalue_avt = null;
@@ -382,6 +389,7 @@
* The grouping-separator attribute gives the separator
* used as a grouping (e.g. thousands) separator in decimal
* numbering sequences.
+ * @serial
*/
private AVT m_groupingSeparator_avt = null;
@@ -415,6 +423,7 @@
/**
* The optional grouping-size specifies the size (normally 3) of the grouping.
+ * @serial
*/
private AVT m_groupingSize_avt = null;
@@ -450,8 +459,7 @@
/**
* Table to help in converting decimals to roman numerals.
- * @see TransformerImpl#DecimalToRoman
- * @see TransformerImpl#long2roman
+ * @see org.apache.xalan.transformer.DecimalToRoman
*/
private final static DecimalToRoman m_romanConvertTable[] = {
new DecimalToRoman(1000, "M", 900, "CM"),
@@ -1940,7 +1948,7 @@
* Returns the next token from this string tokenizer.
*
* @return the next token from this string tokenizer.
- * @exception NoSuchElementException if there are no more tokens in this
+ * @throws NoSuchElementException if there are no more tokens in this
* tokenizer's string.
*/
public String nextToken()
1.9 +1 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemPI.java
Index: ElemPI.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemPI.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ElemPI.java 2000/12/05 22:29:29 1.8
+++ ElemPI.java 2001/01/02 03:36:46 1.9
@@ -87,6 +87,7 @@
* attribute that specifies the name of the processing instruction node.
* The value of the name attribute is interpreted as an
* attribute value template.
+ * @serial
*/
private AVT m_name_atv = null;
1.6 +7 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemSort.java
Index: ElemSort.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemSort.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemSort.java 2000/12/05 22:29:29 1.5
+++ ElemSort.java 2001/01/02 03:36:46 1.6
@@ -86,6 +86,7 @@
/**
* xsl:sort has a select attribute whose value is an expression.
+ * @serial
*/
private XPath m_selectExpression = null;
@@ -133,6 +134,7 @@
/**
* lang specifies the language of the sort keys.
+ * @serial
*/
private AVT m_lang_avt = null;
@@ -165,6 +167,7 @@
/**
* data-type specifies the data type of the
* strings to be sorted.
+ * @serial
*/
private AVT m_dataType_avt = null;
@@ -245,6 +248,7 @@
/**
* order specifies whether the strings should be sorted in ascending
* or descending order.
+ * @serial
*/
private AVT m_order_avt = null;
@@ -277,6 +281,7 @@
/**
* case-order has the value upper-first or lower-first.
* The default value is language dependent.
+ * @serial
*/
private AVT m_caseorder_avt = null;
@@ -290,6 +295,8 @@
* The default value is language dependent.
*
* @param v The value to set for the "case-order" attribute
+ *
+ * @serial
*/
public void setCaseOrder(AVT v)
{
1.10 +8 -2 xml-xalan/java/src/org/apache/xalan/templates/ElemTemplate.java
Index: ElemTemplate.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemTemplate.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemTemplate.java 2000/12/05 22:29:30 1.9
+++ ElemTemplate.java 2001/01/02 03:36:46 1.10
@@ -92,10 +92,12 @@
public class ElemTemplate extends ElemTemplateElement
{
- /** The public identifier for the current document event */
+ /** The public identifier for the current document event.
+ * @serial */
private String m_publicId;
- /** The system identifier for the current document event */
+ /** The system identifier for the current document event.
+ * @serial */
private String m_systemId;
/**
@@ -191,6 +193,7 @@
/**
* The match attribute is a Pattern that identifies the source
* node or nodes to which the rule applies.
+ * @serial
*/
private XPath m_matchPattern = null;
@@ -228,6 +231,7 @@
/**
* An xsl:template element with a name attribute specifies a named template.
+ * @serial
*/
private QName m_name = null;
@@ -262,6 +266,7 @@
/**
* Modes allow an element to be processed multiple times,
* each time producing a different result.
+ * @serial
*/
private QName m_mode;
@@ -296,6 +301,7 @@
/**
* The priority of a template rule is specified by the priority
* attribute on the template rule.
+ * @serial
*/
private double m_priority = XPath.MATCH_SCORE_NONE;
1.34 +10 -10 xml-xalan/java/src/org/apache/xalan/templates/ElemTemplateElement.java
Index: ElemTemplateElement.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemTemplateElement.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ElemTemplateElement.java 2000/12/12 16:43:56 1.33
+++ ElemTemplateElement.java 2001/01/02 03:36:46 1.34
@@ -117,7 +117,6 @@
* @param atts The element attributes.
* @param lineNumber The line in the XSLT file that the element occurs on.
* @param columnNumber The column index in the XSLT file that the element occurs on.
- * @exception TransformerException Never.
*/
public ElemTemplateElement(){}
@@ -167,14 +166,11 @@
* Execute the element's primary function. Subclasses of this
* function may recursivly execute down the element tree.
*
- * @exception XSLProcessorException
- * @exception java.net.MalformedURLException
- * @exception java.io.FileNotFoundException
- * @exception java.io.IOException
- * @exception TransformerException
* @param transformer The XSLT TransformerFactory.
* @param sourceNode The current context node.
* @param mode The current mode.
+ *
+ * @throws TransformerException if any checked exception occurs.
*/
public void execute(
TransformerImpl transformer, Node sourceNode, QName mode)
@@ -294,7 +290,7 @@
* @param newChild Child to be added to child list
*
* @return Child just added to the child list
- * @exception DOMException
+ * @throws DOMException
*/
public Node appendChild(Node newChild) throws DOMException
{
@@ -509,7 +505,8 @@
return this.getSystemId();
}
- /** line number where the current document event ends */
+ /** line number where the current document event ends.
+ * @serial */
private int m_lineNumber;
/**
@@ -524,7 +521,8 @@
return m_lineNumber;
}
- /** the column number where the current document event ends */
+ /** the column number where the current document event ends.
+ * @serial */
private int m_columnNumber;
/**
@@ -998,6 +996,8 @@
}
}
+ /** The *relative* document order number of this element.
+ * @serial */
protected int m_docOrderNumber = -1;
/**
@@ -1144,7 +1144,7 @@
}
/** DOM backpointer that this element originated from. */
- private Node m_DOMBackPointer;
+ transient private Node m_DOMBackPointer;
/**
* If this stylesheet was created from a DOM, get the
1.4 +1 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemText.java
Index: ElemText.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemText.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ElemText.java 2000/12/05 22:29:31 1.3
+++ ElemText.java 2001/01/02 03:36:46 1.4
@@ -85,6 +85,7 @@
/**
* Tells if this element should disable escaping.
+ * @serial
*/
private boolean m_disableOutputEscaping = false;
1.8 +3 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemTextLiteral.java
Index: ElemTextLiteral.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemTextLiteral.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ElemTextLiteral.java 2000/12/05 22:29:31 1.7
+++ ElemTextLiteral.java 2001/01/02 03:36:46 1.8
@@ -76,6 +76,7 @@
/**
* Tell if space should be preserved.
+ * @serial
*/
private boolean m_preserveSpace;
@@ -103,6 +104,7 @@
/**
* The character array.
+ * @serial
*/
private char m_ch[];
@@ -128,6 +130,7 @@
/**
* Tells if this element should disable escaping.
+ * @serial
*/
private boolean m_disableOutputEscaping = false;
1.10 +1 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemUse.java
Index: ElemUse.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemUse.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemUse.java 2000/12/05 22:29:31 1.9
+++ ElemUse.java 2001/01/02 03:36:47 1.10
@@ -82,6 +82,7 @@
/**
* The value of the "use-attribute-sets" attribute.
+ * @serial
*/
private QName m_attributeSetsNames[] = null;
1.11 +2 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemValueOf.java
Index: ElemValueOf.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemValueOf.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemValueOf.java 2000/12/05 22:29:32 1.10
+++ ElemValueOf.java 2001/01/02 03:36:47 1.11
@@ -88,6 +88,7 @@
/**
* The select expression to be executed.
+ * @serial
*/
private XPath m_selectExpression = null;
@@ -119,6 +120,7 @@
/**
* Tells if this element should disable escaping.
+ * @serial
*/
private boolean m_disableOutputEscaping = false;
1.10 +3 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemVariable.java
Index: ElemVariable.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemVariable.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElemVariable.java 2000/12/05 22:29:32 1.9
+++ ElemVariable.java 2001/01/02 03:36:47 1.10
@@ -94,6 +94,7 @@
/**
* The value of the "select" attribute.
+ * @serial
*/
private XPath m_selectPattern;
@@ -129,6 +130,7 @@
/**
* The value of the "name" attribute.
+ * @serial
*/
private QName m_qname;
@@ -164,6 +166,7 @@
/**
* Tells if this is a top-level variable or param, or not.
+ * @serial
*/
private boolean m_isTopLevel = false;
1.5 +1 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemWhen.java
Index: ElemWhen.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemWhen.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemWhen.java 2000/12/05 22:29:32 1.4
+++ ElemWhen.java 2001/01/02 03:36:47 1.5
@@ -82,6 +82,7 @@
/**
* Each xsl:when element has a single attribute, test,
* which specifies an expression.
+ * @serial
*/
private XPath m_test;
1.6 +2 -0 xml-xalan/java/src/org/apache/xalan/templates/ElemWithParam.java
Index: ElemWithParam.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemWithParam.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemWithParam.java 2000/12/05 22:29:33 1.5
+++ ElemWithParam.java 2001/01/02 03:36:47 1.6
@@ -84,6 +84,7 @@
/**
* The "select" attribute, which specifies the value of the
* argument, if element content is not specified.
+ * @serial
*/
private XPath m_selectPattern = null;
@@ -116,6 +117,7 @@
* parameter (the variable the value of whose binding is
* to be replaced). The value of the name attribute is a QName,
* which is expanded as described in [2.4 Qualified Names].
+ * @serial
*/
private QName m_qname = null;
1.18 +2 -2 xml-xalan/java/src/org/apache/xalan/templates/FuncDocument.java
Index: FuncDocument.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/FuncDocument.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FuncDocument.java 2000/12/13 04:16:34 1.17
+++ FuncDocument.java 2001/01/02 03:36:47 1.18
@@ -391,7 +391,7 @@
* @param xctxt The XPath runtime state.
* @param msg The error message code
* @param args Arguments to be used in the error message
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws javax.xml.transform.TransformerException
@@ -417,7 +417,7 @@
* @param xctxt The XPath runtime state.
* @param msg Warning message code
* @param args Arguments to be used in the warning message
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws javax.xml.transform.TransformerException
1.13 +1 -1 xml-xalan/java/src/org/apache/xalan/templates/FuncFormatNumb.java
Index: FuncFormatNumb.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/FuncFormatNumb.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FuncFormatNumb.java 2000/12/05 22:29:33 1.12
+++ FuncFormatNumb.java 2001/01/02 03:36:47 1.13
@@ -188,7 +188,7 @@
* @param xctxt The XPath runtime state.
* @param msg Warning message code
* @param args Arguments to be used in warning message
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws javax.xml.transform.TransformerException
1.7 +3 -30 xml-xalan/java/src/org/apache/xalan/templates/KeyDeclaration.java
Index: KeyDeclaration.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/KeyDeclaration.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- KeyDeclaration.java 2000/12/05 22:29:34 1.6
+++ KeyDeclaration.java 2001/01/02 03:36:47 1.7
@@ -85,6 +85,7 @@
/**
* The "name" property.
+ * @serial
*/
private QName m_name;
@@ -116,6 +117,7 @@
/**
* The "match" attribute.
+ * @serial
*/
private XPath m_matchPattern = null;
@@ -149,6 +151,7 @@
/**
* The "use" attribute.
+ * @serial
*/
private XPath m_use;
@@ -176,36 +179,6 @@
public XPath getUse()
{
return m_use;
- }
-
- /** Constant for build state of this key */
- public static int UNBUILT = -1;
-
- /** Constant for build state of this key */
- public static int BUILDING = 0;
-
- /** Constant for build state of this key */
- public static int BUILT = 1;
-
- /** Hold the build state of this key */
- private int m_buildState = UNBUILT;
-
- /**
- * Set the state of the build for this key.
- * @param state One of UNBUILT, BUILDING, BUILT.
- */
- public void setBuildState(int state)
- {
- m_buildState = state;
- }
-
- /**
- * Get the state of the build for this key.
- * @return One of UNBUILT, BUILDING, BUILT.
- */
- public int getBuildState()
- {
- return m_buildState;
}
/**
1.7 +6 -2 xml-xalan/java/src/org/apache/xalan/templates/NamespaceAlias.java
Index: NamespaceAlias.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/NamespaceAlias.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NamespaceAlias.java 2000/12/05 22:43:48 1.6
+++ NamespaceAlias.java 2001/01/02 03:36:47 1.7
@@ -78,7 +78,8 @@
}
/**
- * The "stylesheet-prefix" attribute
+ * The "stylesheet-prefix" attribute.
+ * @serial
*/
private String m_StylesheetPrefix;
@@ -104,6 +105,7 @@
/**
* The namespace in the stylesheet space.
+ * @serial
*/
private String m_StylesheetNamespace;
@@ -128,7 +130,8 @@
}
/**
- * The "result-prefix" attribute
+ * The "result-prefix" attribute.
+ * @serial
*/
private String m_ResultPrefix;
@@ -154,6 +157,7 @@
/**
* The result namespace.
+ * @serial
*/
private String m_ResultNamespace;
1.10 +3 -2 xml-xalan/java/src/org/apache/xalan/templates/OutputProperties.java
Index: OutputProperties.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/OutputProperties.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- OutputProperties.java 2000/12/21 22:31:43 1.9
+++ OutputProperties.java 2001/01/02 03:36:47 1.10
@@ -136,7 +136,7 @@
* name".
*/
static final String S_BUILTIN_EXTENSIONS_UNIVERSAL=
- "{"+Constants.S_BUILTIN_EXTENSIONS_URL+"}";
+ "{"+Constants.S_BUILTIN_EXTENSIONS_URL+"}";
/**
* Fix up a string in an output properties file according to
@@ -963,7 +963,8 @@
*/
private transient Hashtable m_propertiesLevels;
- /** The output properties. */
+ /** The output properties.
+ * @serial */
private Properties m_properties = null;
// Some special Xalan keys.
1.21 +24 -5 xml-xalan/java/src/org/apache/xalan/templates/Stylesheet.java
Index: Stylesheet.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/Stylesheet.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Stylesheet.java 2000/12/06 05:52:40 1.20
+++ Stylesheet.java 2001/01/02 03:36:47 1.21
@@ -228,6 +228,7 @@
/**
* The "xmlns:xsl" property.
+ * @serial
*/
private String m_XmlnsXsl;
@@ -255,6 +256,7 @@
/**
* The "extension-element-prefixes" property, actually contains URIs.
+ * @serial
*/
private StringVector m_ExtensionElementURIs;
@@ -321,6 +323,7 @@
/**
* The "exclude-result-prefixes" property.
+ * @serial
*/
private StringVector m_ExcludeResultPrefixs;
@@ -402,6 +405,7 @@
/**
* The "id" property.
+ * @serial
*/
private String m_Id;
@@ -429,6 +433,7 @@
/**
* The "version" property.
+ * @serial
*/
private String m_Version;
@@ -456,6 +461,7 @@
/**
* The "xsl:import" list.
+ * @serial
*/
private Vector m_imports;
@@ -509,6 +515,7 @@
/**
* The "xsl:include" properties.
+ * @serial
*/
private Vector m_includes;
@@ -559,7 +566,8 @@
/**
* Table of tables of element decimal-format.
- * @see ElemDecimalFormat.
+ * @see DecimalFormatProperties
+ * @serial
*/
Stack m_DecimalFormatDeclarations;
@@ -611,7 +619,7 @@
/**
* Get an "xsl:decimal-format" property.
* @see <a href="http://www.w3.org/TR/xslt#format-number">format-number in XSLT Specification</a>
- * @see ElemDecimalFormat.
+ * @see DecimalFormatProperties
*
* @param i Index of decimal-format property in stack
*
@@ -631,7 +639,7 @@
/**
* Get the number of xsl:decimal-format declarations.
- * @see ElemDecimalFormat.
+ * @see DecimalFormatProperties
*
* @return the number of xsl:decimal-format declarations.
*/
@@ -644,6 +652,7 @@
/**
* The "xsl:strip-space" properties,
* A lookup table of all space stripping elements.
+ * @serial
*/
private Vector m_whitespaceStrippingElements;
@@ -698,6 +707,7 @@
/**
* The "xsl:preserve-space" property,
* A lookup table of all space preserving elements.
+ * @serial
*/
private Vector m_whitespacePreservingElements;
@@ -751,6 +761,7 @@
/**
* The "xsl:output" properties. This is a vector of OutputProperties objects.
+ * @serial
*/
private Vector m_output;
@@ -804,6 +815,7 @@
/**
* The "xsl:key" property.
+ * @serial
*/
private Vector m_keyDeclarations;
@@ -854,6 +866,7 @@
/**
* The "xsl:attribute-set" property.
+ * @serial
*/
private Vector m_attributeSets;
@@ -907,6 +920,7 @@
/**
* The "xsl:variable" and "xsl:param" properties.
+ * @serial
*/
private Vector m_topLevelVariables;
@@ -1050,6 +1064,7 @@
/**
* The "xsl:template" properties.
+ * @serial
*/
private Vector m_templates;
@@ -1101,6 +1116,7 @@
/**
* The "xsl:namespace-alias" properties.
+ * @serial
*/
private Vector m_prefix_aliases;
@@ -1152,6 +1168,7 @@
/**
* The "non-xsl-top-level" properties.
+ * @serial
*/
private Hashtable m_NonXslTopLevel;
@@ -1192,10 +1209,12 @@
*/
private String m_href = null;
- /** The doctype-public element */
+ /** The doctype-public element.
+ * @serial */
private String m_publicId;
- /** The doctype-system element */
+ /** The doctype-system element.
+ * @serial */
private String m_systemId;
/**
1.25 +6 -3 xml-xalan/java/src/org/apache/xalan/templates/StylesheetComposed.java
Index: StylesheetComposed.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/StylesheetComposed.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- StylesheetComposed.java 2000/12/07 00:59:38 1.24
+++ StylesheetComposed.java 2001/01/02 03:36:47 1.25
@@ -209,12 +209,14 @@
}
}
- /** Order in import chain */
+ /** Order in import chain.
+ * @serial */
private int m_importNumber = -1;
/** The precedence of this stylesheet in the global import list.
* The lowest precedence stylesheet is 0. A higher
* number has a higher precedence.
+ * @serial
*/
private int m_importCountComposed;
@@ -271,6 +273,7 @@
/**
* The combined list of includes.
+ * @serial
*/
private transient Vector m_includesComposed;
@@ -338,11 +341,11 @@
* (rather than appending to) previous composition.
* We could phase out the old API in favor of this one, but I'm
* holding off until we've made up our minds about compilation.
- * ADDED 9/5/2000 to support compilation experiment
- * @see <a href="http://www.w3.org/TR/xslt#section-Defining-Template-Rules">section-Defining-Template-Rules in XSLT Specification</a>
+ * ADDED 9/5/2000 to support compilation experiment.
* NOTE: GLP 29-Nov-00 I've left this method in so that CompilingStylesheetHandler will compile. However,
* I'm not sure why it's needed or what it does and I've commented out the body.
*
+ * @see <a href="http://www.w3.org/TR/xslt#section-Defining-Template-Rules">section-Defining-Template-Rules in XSLT Specification</a>
* @param flushFirst Flag indicating the option of overwriting
* (rather than appending to) previous composition.
*
1.36 +15 -4 xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java
Index: StylesheetRoot.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/StylesheetRoot.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- StylesheetRoot.java 2000/12/21 05:52:21 1.35
+++ StylesheetRoot.java 2001/01/02 03:36:47 1.36
@@ -96,7 +96,7 @@
/**
* Uses an XSL stylesheet document.
- * @exception TransformerConfigurationException if the baseIdentifier can not be resolved to a URL.
+ * @throws TransformerConfigurationException if the baseIdentifier can not be resolved to a URL.
*/
public StylesheetRoot() throws TransformerConfigurationException
{
@@ -119,6 +119,7 @@
/**
* The schema used when creating this StylesheetRoot
+ * @serial
*/
private Hashtable m_availElems;
@@ -127,7 +128,7 @@
* StylesheetRoot. The schema may be needed later for an element-available() function call.
*
* @param schema The schema used to create this stylesheet
- * @exception TransformerConfigurationException if the baseIdentifier can not be resolved to a URL.
+ * @throws TransformerConfigurationException if the baseIdentifier can not be resolved to a URL.
*/
public StylesheetRoot(XSLTSchema schema) throws TransformerConfigurationException
{
@@ -311,6 +312,7 @@
* The combined list of imports. The stylesheet with the highest
* import precedence will be at element 0. The one with the lowest
* import precedence will be at element length - 1.
+ * @serial
*/
private StylesheetComposed[] m_globalImportList;
@@ -423,6 +425,7 @@
/**
* This will be set up with the default values, and then the values
* will be set as stylesheets are encountered.
+ * @serial
*/
private OutputProperties m_outputProperties;
@@ -457,7 +460,8 @@
return m_outputProperties;
}
- /** Flag indicating whether an output method has been set by the user */
+ /** Flag indicating whether an output method has been set by the user.
+ * @serial */
private boolean m_outputMethodSet = false;
/**
@@ -474,6 +478,7 @@
/**
* Composed set of all included and imported attribute set properties.
* Each entry is a vector of ElemAttributeSet objects.
+ * @serial
*/
private Hashtable m_attrSets;
@@ -514,6 +519,7 @@
/**
* Table of DecimalFormatSymbols, keyed by QName.
+ * @serial
*/
private Hashtable m_decimalFormatSymbols;
@@ -576,6 +582,7 @@
/**
* A list of all key declarations visible from this stylesheet and all
* lesser stylesheets.
+ * @serial
*/
private Vector m_keyDecls;
@@ -602,6 +609,7 @@
/**
* Composed set of all namespace aliases.
+ * @serial
*/
private Hashtable m_namespaceAliasComposed;
@@ -633,6 +641,7 @@
/**
* The "xsl:template" properties.
+ * @serial
*/
private TemplateList m_templateList;
@@ -714,7 +723,7 @@
/**
* Composed set of all variables and params.
- * (note to self: why were these marked transient??? -sb)
+ * @serial
*/
private Vector m_variables;
@@ -769,6 +778,7 @@
/**
* A list of properties that specify how to do space
* stripping. This uses the same exact mechanism as Templates.
+ * @serial
*/
private TemplateList m_whiteSpaceInfoList;
@@ -883,6 +893,7 @@
/**
* Used for default selection.
+ * @serial
*/
XPath m_selectDefault;
1.30 +43 -29 xml-xalan/java/src/org/apache/xalan/templates/TemplateList.java
Index: TemplateList.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/TemplateList.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- TemplateList.java 2000/12/13 21:56:19 1.29
+++ TemplateList.java 2001/01/02 03:36:47 1.30
@@ -155,7 +155,7 @@
}
/** Flag to indicate whether in DEBUG mode */
- boolean DEBUG = false;
+ static boolean DEBUG = false;
/**
* Dump all patterns and elements that match those patterns
@@ -403,14 +403,19 @@
}
/**
- * <meta name="usage" content="internal"/>
- * Method getPriorityOrScore <needs-description/>
+ * Given a match pattern and template association, return the
+ * score of that match. This score or priority can always be
+ * statically calculated.
+ *
+ * @param matchPat The match pattern to template association.
+ *
+ * @return {@link org.apache.xpath.patterns.NodeTest#SCORE_NODETEST},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NONE},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_NSWILD},
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_QNAME}, or
+ * {@link org.apache.xpath.patterns.NodeTest#SCORE_OTHER}, or
+ * the value defined by the priority attribute of the template.
*
- *
- * @param matchPat
- *
- * @return
- *
*/
private double getPriorityOrScore(TemplateSubPatternAssociation matchPat)
{
@@ -431,13 +436,11 @@
}
/**
- * Locate a macro via the "name" attribute.
+ * Locate a named template.
*
- * @param qname
+ * @param qname Qualified name of the template.
*
- * @return
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
- * the error condition is severe enough to halt processing.
+ * @return Template argument with the requested name, or null if not found.
*/
public ElemTemplate getTemplate(QName qname)
{
@@ -445,14 +448,16 @@
}
/**
- * Get the head of the most likely list of associations to check.
+ * Get the head of the most likely list of associations to check, based on
+ * the name and type of the targetNode argument.
*
- * @param xctxt
- * @param targetNode
+ * @param xctxt The XPath runtime context.
+ * @param targetNode The target node that will be checked for a match.
*
- * @return
+ * @return The head of a linked list that contains all possible match pattern to
+ * template associations.
*/
- TemplateSubPatternAssociation getHead(XPathContext xctxt, Node targetNode)
+ public TemplateSubPatternAssociation getHead(XPathContext xctxt, Node targetNode)
{
short targetNodeType = targetNode.getNodeType();
@@ -507,7 +512,7 @@
* access templates that have been overridden.
* @param quietConflictWarnings
* @return Rule that best matches targetElem.
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
@@ -632,24 +637,30 @@
*/
private Hashtable m_patternTable = new Hashtable(89);
- /** Wildcard patterns */
+ /** Wildcard patterns.
+ * @serial */
private TemplateSubPatternAssociation m_wildCardPatterns = null;
- /** Text Patterns */
+ /** Text Patterns.
+ * @serial */
private TemplateSubPatternAssociation m_textPatterns = null;
- /** Root document Patterns */
+ /** Root document Patterns.
+ * @serial */
private TemplateSubPatternAssociation m_docPatterns = null;
- /** Comment Patterns */
+ /** Comment Patterns.
+ * @serial */
private TemplateSubPatternAssociation m_commentPatterns = null;
/**
* Get table of named Templates.
- * These are keyed on string macro names, and holding values
- * that are template elements in the XSL DOM tree.
+ * These are keyed on template names, and holding values
+ * that are template elements.
*
- * @return
+ * @return A Hashtable dictionary that contains {@link java.lang.String}s
+ * as the keys, and {@link org.apache.xalan.templates.ElemTemplate}s as the
+ * values.
*/
private Hashtable getNamedTemplates()
{
@@ -661,7 +672,9 @@
* These are keyed on string macro names, and holding values
* that are template elements in the XSL DOM tree.
*
- * @param v
+ * @param v Hashtable dictionary that contains {@link java.lang.String}s
+ * as the keys, and {@link org.apache.xalan.templates.ElemTemplate}s as the
+ * values.
*/
private void setNamedTemplates(Hashtable v)
{
@@ -671,9 +684,10 @@
/**
* Get the head of the assocation list that is keyed by target.
*
- * @param key
+ * @param key The name of a node.
*
- * @return
+ * @return The head of a linked list that contains all possible match pattern to
+ * template associations for the given key.
*/
private TemplateSubPatternAssociation getHead(String key)
{
1.7 +2 -1 xml-xalan/java/src/org/apache/xalan/templates/WhiteSpaceInfo.java
Index: WhiteSpaceInfo.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/WhiteSpaceInfo.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- WhiteSpaceInfo.java 2000/12/13 21:56:20 1.6
+++ WhiteSpaceInfo.java 2001/01/02 03:36:47 1.7
@@ -66,7 +66,8 @@
public class WhiteSpaceInfo extends ElemTemplate
{
- /** Flag indicating whether whitespaces should be stripped */
+ /** Flag indicating whether whitespaces should be stripped.
+ * @serial */
private boolean m_shouldStripSpace;
/**
1.5 +6 -3 xml-xalan/java/src/org/apache/xalan/templates/XMLNSDecl.java
Index: XMLNSDecl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/XMLNSDecl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XMLNSDecl.java 2000/12/02 00:28:17 1.4
+++ XMLNSDecl.java 2001/01/02 03:36:47 1.5
@@ -78,7 +78,8 @@
m_isExcluded = isExcluded;
}
- /** non-null reference to prefix, using "" for default namespace. */
+ /** non-null reference to prefix, using "" for default namespace.
+ * @serial */
private String m_prefix;
/**
@@ -91,7 +92,8 @@
return m_prefix;
}
- /** non-null reference to namespace URI */
+ /** non-null reference to namespace URI.
+ * @serial */
private String m_uri;
/**
@@ -103,7 +105,8 @@
return m_uri;
}
- /** true if this namespace declaration should normally be excluded. */
+ /** true if this namespace declaration should normally be excluded.
+ * @serial */
private boolean m_isExcluded;
/**
1.4 +7 -6 xml-xalan/java/src/org/apache/xalan/templates/XUnresolvedVariable.java
Index: XUnresolvedVariable.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/XUnresolvedVariable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XUnresolvedVariable.java 2000/11/14 18:56:26 1.3
+++ XUnresolvedVariable.java 2001/01/02 03:36:47 1.4
@@ -77,27 +77,28 @@
public class XUnresolvedVariable extends XObject
{
/** The node context for execution. */
- private Node m_context;
+ transient private Node m_context;
/** The transformer context for execution. */
- private TransformerImpl m_transformer;
+ transient private TransformerImpl m_transformer;
/** An index to the point in the variable stack where we should
* begin variable searches for evaluation of expressions.
* This is -1 if m_isTopLevel is false.
**/
- private int m_varStackPos = -1;
+ transient private int m_varStackPos = -1;
/** An index into the variable stack where the variable context
* ends, i.e. at the point we should terminate the search.
**/
- private int m_varStackContext;
+ transient private int m_varStackContext;
- /** true if this variable or parameter is a global. */
+ /** true if this variable or parameter is a global.
+ * @serial */
private boolean m_isGlobal;
/** true if this variable or parameter is not currently being evaluated. */
- private boolean m_doneEval = true;
+ transient private boolean m_doneEval = true;
/**
* Create an XUnresolvedVariable, that may be executed at a later time.
1.3 +1 -1 xml-xalan/java/src/org/apache/xalan/templates/output_html.properties
Index: output_html.properties
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/output_html.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- output_html.properties 2000/12/08 23:28:07 1.2
+++ output_html.properties 2001/01/02 03:36:47 1.3
@@ -19,6 +19,6 @@
# ...
# Note that the colon after the protocol needs to be escaped.
{http\u003a//xml.apache.org/xslt}indent-amount=0
-{http\u003a//xml.apache.org/xslt}content-handler=org.apache.xalan.serialize.FormatterToHTML
+{http\u003a//xml.apache.org/xslt}content-handler=org.apache.xalan.serialize.SerializerToHTML
{http\u003a//xml.apache.org/xslt}entities=HTMLEntities.res
{http\u003a//xml.apache.org/xslt}use-url-escaping=yes
1.4 +1 -1 xml-xalan/java/src/org/apache/xalan/templates/output_text.properties
Index: output_text.properties
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/output_text.properties,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- output_text.properties 2000/12/09 03:47:26 1.3
+++ output_text.properties 2001/01/02 03:36:47 1.4
@@ -15,4 +15,4 @@
# xalan:content-handler="MyContentHandler"/>
# ...
# Note that the colon after the protocol needs to be escaped.
-{http\u003a//xml.apache.org/xslt}content-handler=org.apache.xalan.serialize.FormatterToText
\ No newline at end of file
+{http\u003a//xml.apache.org/xslt}content-handler=org.apache.xalan.serialize.SerializerToText
\ No newline at end of file
1.2 +1 -1 xml-xalan/java/src/org/apache/xalan/templates/output_xml.properties
Index: output_xml.properties
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/output_xml.properties,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- output_xml.properties 2000/12/06 05:52:41 1.1
+++ output_xml.properties 2001/01/02 03:36:47 1.2
@@ -22,5 +22,5 @@
# ...
# Note that the colon after the protocol needs to be escaped.
{http\u003a//xml.apache.org/xslt}indent-amount=0
-{http\u003a//xml.apache.org/xslt}content-handler=org.apache.xalan.serialize.FormatterToXML
+{http\u003a//xml.apache.org/xslt}content-handler=org.apache.xalan.serialize.SerializerToXML
1.4 +15 -12 xml-xalan/java/src/org/apache/xalan/templates/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/package.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- package.html 2000/09/07 19:48:16 1.3
+++ package.html 2001/01/02 03:36:47 1.4
@@ -1,22 +1,25 @@
<html>
<title>Xalan Templates Package.</title>
<body>
- <p>Implements the trax.Templates interface, and defines a set of classes that represent an XSLT stylesheet.</p>
+ <p>Implements the {@link javax.xml.transform.Templates} interface,
+ and defines a set of classes that represent an XSLT stylesheet.</p>
- <p>StylesheetRoot implements trax.Templates and extends StylesheetComposed, which is a Stylesheet composed of itself and its
- included Stylesheet objects. A StylesheetRoot also contains a global list of all imported StylesheetComposed objects. The
- role of these objects is to hold immutable stylesheet data, not to perform procedural tasks associated with the
+ <p>{@link org.apache.xalan.templates.StylesheetRoot} implements the {@link javax.xml.transform.Templates} interface, and
+ extends {@link org.apache.xalan.templates.StylesheetComposed},
+ which is a {@link org.apache.xalan.templates.Stylesheet} composed of itself
+ and its included Stylesheet objects. A StylesheetRoot also contains a
+ global list of all imported StylesheetComposed objects. The
+ role of these objects is to hold immutable stylesheet data, not to perform
+ procedural tasks associated with the
construction of the data (the org.apache.xalan.processor package) or with the transformation (the org.apache.xalan.transformer
package).</p>
- <p>ElemTemplateElement is the superclass of all XSLT instruction elements, including Stylesheet. The <i>x</i>Func classes
- extend members of the org.apache.xpath package and implement XSLT functions. Unlike the Stylesheet "container" objects, the
- instruction element and function classes do contain procedural execute() methods that are called during the
- transformation.</p>
+ <p>{@link org.apache.xalan.templates.ElemTemplateElement} is the superclass of
+ all XSLT instruction elements, including Stylesheet. The <i>x</i>Func classes
+ extend members of the org.apache.xpath package and implement XSLT functions. Unlike
+ the Stylesheet "container" objects, the
+ instruction element and function classes do contain procedural execute()
+ methods that are called during the transformation.</p>
<p>
- <dl>
- <dt><b>Version: </b></dt><dd>xalan-j_2_0_D01, September 6, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
</html>
1.6 +5 -7 xml-xalan/java/src/org/apache/xalan/trace/GenerateEvent.java
Index: GenerateEvent.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/trace/GenerateEvent.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- GenerateEvent.java 2000/12/21 22:31:57 1.5
+++ GenerateEvent.java 2001/01/02 03:36:51 1.6
@@ -71,20 +71,18 @@
* formatter listener FormatterToXXX)classes.
*
* @see org.apache.xml.utils.DOMBuilder
- * @see org.apache.xml.utils.FormatterToHTML
- * @see org.apache.xml.utils.FormatterToText
- * @see org.apache.xml.utils.FormatterToXML
+ * @see org.apache.xalan.serialize.SerializerToHTML
+ * @see org.apache.xalan.serialize.SerializerToText
+ * @see org.apache.xalan.serialize.SerializerToXML
*
*/
public class GenerateEvent implements java.util.EventListener
{
/**
- * The XSLT TransformerFactory, which either directly or indirectly contains most needed information.
- * Accessing the m_stylesheetRoot member variable will get you to the stylesheet information.
+ * The XSLT Transformer, which either directly or indirectly contains most needed information.
*
- * @see org.apache.xalan.transformer.TransformerImpl, org.apache.xalan.templates.StylesheetRoot,
- * org.apache.xalan.xslt.Stylesheet
+ * @see org.apache.xalan.transformer.TransformerImpl
*/
public TransformerImpl m_processor;
1.6 +1 -1 xml-xalan/java/src/org/apache/xalan/trace/PrintTraceListener.java
Index: PrintTraceListener.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/trace/PrintTraceListener.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PrintTraceListener.java 2000/12/13 22:26:50 1.5
+++ PrintTraceListener.java 2001/01/02 03:36:51 1.6
@@ -72,7 +72,7 @@
* Implementation of the TraceListener interface that
* prints each event to standard out as it occurs.
*
- * @see TracerEvent.java
+ * @see org.apache.xalan.trace.TracerEvent
*/
public class PrintTraceListener implements TraceListener
{
1.4 +2 -2 xml-xalan/java/src/org/apache/xalan/trace/TraceListener.java
Index: TraceListener.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/trace/TraceListener.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TraceListener.java 2000/11/13 16:27:18 1.3
+++ TraceListener.java 2001/01/02 03:36:51 1.4
@@ -63,8 +63,8 @@
* Interface the XSL processor calls when it matches a source node, selects a set of source nodes,
* or generates a result node.
* If you want an object instance to be called when a trace event occurs, use the TransformerImpl setTraceListener method.
- * @see TracerEvent.java
- * @see org.apache.xalan.xslt.TransformerImpl#setTraceListener
+ * @see org.apache.xalan.trace.TracerEvent
+ * @see org.apache.xalan.trace.TraceManager#addTraceListener
*/
public interface TraceListener extends java.util.EventListener
{
1.2 +1 -4 xml-xalan/java/src/org/apache/xalan/trace/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/trace/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/06 02:28:14 1.1
+++ package.html 2001/01/02 03:36:51 1.2
@@ -2,10 +2,7 @@
<title>Xalan Trace (debugger) Package.</title>
<body>
<p>Implementation of Xalan Trace events, for use by a debugger.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
+ </body>
</html>
1.6 +2 -2 xml-xalan/java/src/org/apache/xalan/transformer/CountersTable.java
Index: CountersTable.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/CountersTable.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CountersTable.java 2000/12/12 21:32:56 1.5
+++ CountersTable.java 2001/01/02 03:36:51 1.6
@@ -122,7 +122,7 @@
/**
* Place to collect new counters.
*/
- private NodeSet m_newFound = new NodeSet();
+ transient private NodeSet m_newFound = new NodeSet();
/**
* Add a list of counted nodes that were built in backwards document
@@ -146,7 +146,7 @@
// For diagnostics
/** Number of counters created so far */
- int m_countersMade = 0;
+ transient int m_countersMade = 0;
/**
* Count forward until the given node is found, or until
1.4 +0 -2 xml-xalan/java/src/org/apache/xalan/transformer/DecimalToRoman.java
Index: DecimalToRoman.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/DecimalToRoman.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DecimalToRoman.java 2000/12/12 21:32:56 1.3
+++ DecimalToRoman.java 2001/01/02 03:36:51 1.4
@@ -59,8 +59,6 @@
/**
* <meta name="usage" content="internal"/>
* Structure to help in converting integers to roman numerals
- * @see long2roman
- * @see m_romanConvertTable
*/
public class DecimalToRoman
{
1.9 +7 -4 xml-xalan/java/src/org/apache/xalan/transformer/KeyIterator.java
Index: KeyIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/KeyIterator.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- KeyIterator.java 2000/11/30 18:28:19 1.8
+++ KeyIterator.java 2001/01/02 03:36:51 1.9
@@ -85,17 +85,19 @@
public class KeyIterator extends LocPathIterator
{
- /** The key table this iterator is associated to */
+ /** The key table this iterator is associated to.
+ * @serial */
private KeyTable m_keyTable;
- /** Key name */
+ /** Key name.
+ * @serial */
private QName m_name;
/**
* Flag indicating whether the whole source tree has been walked.
* True if we still need to finish walking the tree.
* */
- private boolean m_lookForMoreNodes = true;
+ transient private boolean m_lookForMoreNodes = true;
/**
* Get the key name from a key declaration this iterator will process
@@ -108,7 +110,8 @@
return m_name;
}
- /** Vector of Key declarations in the stylesheet */
+ /** Vector of Key declarations in the stylesheet.
+ * @serial */
private Vector m_keyDeclarations;
/**
1.10 +1 -1 xml-xalan/java/src/org/apache/xalan/transformer/KeyManager.java
Index: KeyManager.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/KeyManager.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- KeyManager.java 2000/11/30 18:28:20 1.9
+++ KeyManager.java 2001/01/02 03:36:51 1.10
@@ -75,7 +75,7 @@
/**
* Table of tables of element keys.
- * @see KeyTable.
+ * @see org.apache.xalan.transformer.KeyTable
*/
private transient Vector m_key_tables = null;
1.6 +7 -4 xml-xalan/java/src/org/apache/xalan/transformer/KeyRefIterator.java
Index: KeyRefIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/KeyRefIterator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- KeyRefIterator.java 2000/12/18 20:56:56 1.5
+++ KeyRefIterator.java 2001/01/02 03:36:51 1.6
@@ -77,13 +77,16 @@
public class KeyRefIterator extends LocPathIterator
{
- /** Key name */
+ /** Key name.
+ * @serial */
private QName m_name;
- /** Use field of key function */
+ /** Use field of key function.
+ * @serial */
private String m_lookupKey;
- /** Main Key iterator for this iterator */
+ /** Main Key iterator for this iterator.
+ * @serial */
private KeyIterator m_ki;
/**
@@ -126,7 +129,7 @@
* @return The next <code>Node</code> in the set being iterated over, or
* <code>null</code> if there are no more members in that set.
*
- * @exception DOMException
+ * @throws DOMException
* INVALID_STATE_ERR: Raised if this method is called after the
* <code>detach</code> method was invoked.
*/
1.11 +5 -4 xml-xalan/java/src/org/apache/xalan/transformer/KeyWalker.java
Index: KeyWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/KeyWalker.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- KeyWalker.java 2000/11/30 18:28:20 1.10
+++ KeyWalker.java 2001/01/02 03:36:51 1.11
@@ -108,15 +108,16 @@
}
/** List of attribute nodes of the current node */
- NamedNodeMap m_attrs;
+ transient NamedNodeMap m_attrs;
/** Flag indicating that attibute nodes were found for the current node */
- boolean m_foundAttrs;
+ transient boolean m_foundAttrs;
/** Current position in the attribute nodes list */
- int m_attrPos;
+ transient int m_attrPos;
- /** Key value that this is looking for */
+ /** Key value that this is looking for.
+ * @serial */
String m_lookupKey;
/**
1.8 +12 -12 xml-xalan/java/src/org/apache/xalan/transformer/MsgMgr.java
Index: MsgMgr.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/MsgMgr.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- MsgMgr.java 2000/12/12 21:32:56 1.7
+++ MsgMgr.java 2001/01/02 03:36:51 1.8
@@ -96,7 +96,7 @@
*
* @param msg The message text to issue
* @param terminate Flag indicating whether to terminate this process
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
@@ -127,7 +127,7 @@
* Warn the user of a problem.
*
* @param msg Message text to issue
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
@@ -143,7 +143,7 @@
*
* @param msg Message text to issue
* @param args Arguments to pass to the message
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
@@ -161,7 +161,7 @@
* @param styleNode Stylesheet node
* @param sourceNode Source tree node
* @param msg Message text to issue
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
@@ -180,7 +180,7 @@
* @param sourceNode Source tree node
* @param msg Message text to issue
* @param args Arguments to pass to the message
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
@@ -204,7 +204,7 @@
* exception.
*
* @param msg Message text to issue
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
@@ -230,7 +230,7 @@
* exception.
*
* @param msg Message text to issue
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
@@ -247,7 +247,7 @@
*
* @param msg Message text to issue
* @param args Arguments to be passed to the message
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
@@ -264,7 +264,7 @@
*
* @param msg Message text to issue
* @param e Exception to throw
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
@@ -282,7 +282,7 @@
* @param msg Message text to issue
* @param args Arguments to use in message
* @param e Exception to throw
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
@@ -313,7 +313,7 @@
* @param styleNode Stylesheet node
* @param sourceNode Source tree node
* @param msg Message text to issue
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
@@ -333,7 +333,7 @@
* @param sourceNode Source tree node
* @param msg Message text to issue
* @param args Arguments to use in message
- * @exception XSLProcessorException thrown if the active ProblemListener and XPathContext decide
+ * @throws XSLProcessorException thrown if the active ProblemListener and XPathContext decide
* the error condition is severe enough to halt processing.
*
* @throws TransformerException
1.4 +3 -4 xml-xalan/java/src/org/apache/xalan/transformer/NumeratorFormatter.java
Index: NumeratorFormatter.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/NumeratorFormatter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- NumeratorFormatter.java 2000/12/12 21:32:56 1.3
+++ NumeratorFormatter.java 2001/01/02 03:36:51 1.4
@@ -87,8 +87,7 @@
/**
* Table to help in converting decimals to roman numerals.
- * @see TransformerImpl#DecimalToRoman
- * @see TransformerImpl#long2roman
+ * @see org.apache.xalan.transformer.DecimalToRoman
*/
private final static DecimalToRoman m_romanConvertTable[] = {
new DecimalToRoman(1000, "M", 900, "CM"),
@@ -132,7 +131,7 @@
* @param val Value to convert -- must be greater than zero.
* @param table a table containing one character for each digit in the radix
* @return String representing alpha count of number.
- * @see TransformerImpl#DecimalToRoman
+ * @see org.apache.xalan.transformer.DecimalToRoman
*
* Note that the radix of the conversion is inferred from the size
* of the table.
@@ -299,7 +298,7 @@
* Returns the next token from this string tokenizer.
*
* @return the next token from this string tokenizer.
- * @exception NoSuchElementException if there are no more tokens in this
+ * @throws NoSuchElementException if there are no more tokens in this
* tokenizer's string.
*/
String nextToken()
1.32 +5 -10 xml-xalan/java/src/org/apache/xalan/transformer/ResultTreeHandler.java
Index: ResultTreeHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/ResultTreeHandler.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ResultTreeHandler.java 2000/12/31 10:05:21 1.31
+++ ResultTreeHandler.java 2001/01/02 03:36:51 1.32
@@ -329,12 +329,10 @@
*
* @param prefix The Namespace prefix being declared.
* @param uri The Namespace URI the prefix is mapped to.
- * @exception javax.xml.transform.TransformerException The client may throw
+ * @throws org.xml.sax.SAXException The client may throw
* an exception during processing.
* @see #endPrefixMapping
* @see #startElement
- *
- * @throws org.xml.sax.SAXException
*/
public void startPrefixMapping(String prefix, String uri)
throws org.xml.sax.SAXException
@@ -351,7 +349,8 @@
* @param shouldFlush Indicate whether pending events needs
* to be flushed first
*
- * @throws org.xml.sax.SAXException
+ * @throws org.xml.sax.SAXException The client may throw
+ * an exception during processing.
*/
public void startPrefixMapping(
String prefix, String uri, boolean shouldFlush) throws org.xml.sax.SAXException
@@ -396,12 +395,10 @@
* guaranteed.</p>
*
* @param prefix The prefix that was being mapping.
- * @exception javax.xml.transform.TransformerException The client may throw
+ * @throws org.xml.sax.SAXException The client may throw
* an exception during processing.
* @see #startPrefixMapping
* @see #endElement
- *
- * @throws org.xml.sax.SAXException
*/
public void endPrefixMapping(String prefix) throws org.xml.sax.SAXException{}
@@ -722,10 +719,8 @@
*
* @param name The name of the skipped entity. If it is a
* parameter entity, the name will begin with '%'.
- * @exception javax.xml.transform.TransformerException Any SAX exception, possibly
+ * @throws org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- *
- * @throws org.xml.sax.SAXException
*/
public void skippedEntity(String name) throws org.xml.sax.SAXException{}
1.5 +17 -17 xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java
Index: TrAXFilter.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TrAXFilter.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- TrAXFilter.java 2000/11/16 03:22:22 1.4
+++ TrAXFilter.java 2001/01/02 03:36:52 1.5
@@ -51,7 +51,7 @@
* or to set or get a feature or property will fail.</p>
*
* @param parent The parent XML reader.
- * @exception java.lang.NullPointerException If the parent is null.
+ * @throws java.lang.NullPointerException If the parent is null.
*/
public void setParent (XMLReader parent)
{
@@ -70,9 +70,9 @@
* Parse a document.
*
* @param input The input source for the document entity.
- * @exception javax.xml.transform.TransformerException Any SAX exception, possibly
+ * @throws org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @exception java.io.IOException An IO exception from the parser,
+ * @throws java.io.IOException An IO exception from the parser,
* possibly from a byte stream or character stream
* supplied by the application.
* @see org.xml.sax.XMLReader#parse(org.xml.sax.InputSource)
@@ -86,25 +86,25 @@
// Use JAXP1.1 ( if possible )
try {
- javax.xml.parsers.SAXParserFactory factory=
- javax.xml.parsers.SAXParserFactory.newInstance();
- factory.setNamespaceAware( true );
- javax.xml.parsers.SAXParser jaxpParser=
- factory.newSAXParser();
- reader=jaxpParser.getXMLReader();
-
+ javax.xml.parsers.SAXParserFactory factory=
+ javax.xml.parsers.SAXParserFactory.newInstance();
+ factory.setNamespaceAware( true );
+ javax.xml.parsers.SAXParser jaxpParser=
+ factory.newSAXParser();
+ reader=jaxpParser.getXMLReader();
+
} catch( javax.xml.parsers.ParserConfigurationException ex ) {
- throw new org.xml.sax.SAXException( ex );
+ throw new org.xml.sax.SAXException( ex );
} catch( javax.xml.parsers.FactoryConfigurationError ex1 ) {
- throw new org.xml.sax.SAXException( ex1.toString() );
+ throw new org.xml.sax.SAXException( ex1.toString() );
} catch( NoSuchMethodError ex2 ) {
}
XMLReader parent;
if( reader==null )
- parent= XMLReaderFactory.createXMLReader();
+ parent= XMLReaderFactory.createXMLReader();
else
- parent=reader;
+ parent=reader;
try
{
parent.setFeature("http://xml.org/sax/features/namespace-prefixes",
@@ -141,9 +141,9 @@
* Parse a document.
*
* @param systemId The system identifier as a fully-qualified URI.
- * @exception javax.xml.transform.TransformerException Any SAX exception, possibly
+ * @throws org.xml.sax.SAXException Any SAX exception, possibly
* wrapping another exception.
- * @exception java.io.IOException An IO exception from the parser,
+ * @throws java.io.IOException An IO exception from the parser,
* possibly from a byte stream or character stream
* supplied by the application.
* @see org.xml.sax.XMLReader#parse(java.lang.String)
@@ -195,7 +195,7 @@
* Set the content event handler.
*
* @param resolver The new content handler.
- * @exception java.lang.NullPointerException If the handler
+ * @throws java.lang.NullPointerException If the handler
* is null.
* @see org.xml.sax.XMLReader#setContentHandler
*/
1.69 +11 -42 xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -r1.68 -r1.69
--- TransformerImpl.java 2000/12/31 10:12:52 1.68
+++ TransformerImpl.java 2001/01/02 03:36:52 1.69
@@ -163,29 +163,9 @@
/**
* <meta name="usage" content="advanced"/>
- * The Xalan workhorse -- Collaborates with the XPath xcontext, the DOM,
- * and the XPath engine, to transform a source tree of nodes into a result tree
- * according to instructions and templates specified by a stylesheet tree.
- * We suggest you use one of the
- * static XSLTProcessorFactory getProcessor() methods to instantiate the processor
- * and return an interface that greatly simplifies the process of manipulating
- * TransformerImpl.
- *
- * <p>The methods <code>process(...)</code> are the primary public entry points.
- * The best way to perform transformations is to use the
- * {@link XSLTProcessor#process(XSLTInputSource, XSLTInputSource, XSLTResultTarget)} method,
- * but you may use any of process methods defined in TransformerImpl.</p>
- *
- * <p>Please note that this class is not safe per instance over multiple
- * threads. If you are in a multithreaded environment, you should
- * keep a pool of these objects, or create a new one each time. In a
- * multithreaded environment, the right way to do things is to create a
- * StylesheetRoot via processStylesheet, and then reuse this object
- * over multiple threads.</p>
- *
- * <p>If you reuse the processor instance, you should call reset() between transformations.</p>
- * @see XSLTProcessorFactory
- * @see XSLTProcessor
+ * This class implements the
+ * {@link javax.xml.transform.Transformer} interface, and is the core
+ * representation of the transformation execution.</p>
*/
public class TransformerImpl extends Transformer
implements Runnable, TransformState
@@ -715,11 +695,6 @@
* @param name The property name, which is a fully-qualified URI.
*
* @return The value of the property, or null if not found.
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the property name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the property name but
- * cannot set the requested value.
*
* @throws IllegalArgumentException If the property is not supported,
* and is not namespaced.
@@ -750,13 +725,7 @@
*
* @param name The property name, which is a fully-qualified URI.
* @param value The requested value for the property.
- * @exception org.xml.sax.SAXNotRecognizedException When the
- * XMLReader does not recognize the property name.
- * @exception org.xml.sax.SAXNotSupportedException When the
- * XMLReader recognizes the property name but
- * cannot set the requested value.
- *
- * @throws TransformerException
+ * @throws IllegalArgumentException if the property name is not legal.
*/
public void setOutputProperty(String name, String value)
throws IllegalArgumentException
@@ -1611,7 +1580,7 @@
* Set the content event handler.
*
* @param resolver The new content handler.
- * @exception java.lang.NullPointerException If the handler
+ * @throws java.lang.NullPointerException If the handler
* is null.
* @see org.xml.sax.XMLReader#setContentHandler
*/
@@ -1765,7 +1734,7 @@
*
* @return The stringized result of executing the elements children.
*
- * @exception TransformerException
+ * @throws TransformerException
*/
public String transformToString(
ElemTemplateElement elem, Node sourceNode, QName mode)
@@ -1857,7 +1826,7 @@
* @param template The template to use if xsl:for-each, or null.
* @param child The source context node.
* @param mode The current mode, may be null.
- * @exception TransformerException
+ * @throws TransformerException
* @return true if applied a template, false if not.
*/
public boolean applyTemplateToNode(ElemTemplateElement xslInstruction, // xsl:apply-templates or xsl:for-each
@@ -2000,7 +1969,7 @@
* @param handler The ContentHandler to where the result events
* should be fed.
*
- * @exception TransformerException
+ * @throws TransformerException
*/
public void executeChildTemplates(
ElemTemplateElement elem, Node sourceNode, QName mode, ContentHandler handler)
@@ -2036,7 +2005,7 @@
* @param sourceNode The current context node.
* @param mode The current mode.
*
- * @exception TransformerException
+ * @throws TransformerException
*/
public void executeChildTemplates(
ElemTemplateElement elem, Node sourceNode, QName mode)
@@ -2666,9 +2635,9 @@
* @param name The feature name, which is a fully-qualified
* URI.
* @return The current state of the feature (true or false).
- * @exception org.xml.sax.SAXNotRecognizedException When the
+ * @throws org.xml.sax.SAXNotRecognizedException When the
* TransformerFactory does not recognize the feature name.
- * @exception org.xml.sax.SAXNotSupportedException When the
+ * @throws org.xml.sax.SAXNotSupportedException When the
* TransformerFactory recognizes the feature name but
* cannot determine its value at this time.
*
1.4 +6 -11 xml-xalan/java/src/org/apache/xalan/transformer/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/package.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- package.html 2000/09/07 19:48:27 1.3
+++ package.html 2001/01/02 03:36:52 1.4
@@ -3,23 +3,18 @@
<body>
<p>In charge of run-time transformations and the production of result trees.</p>
- <p>TransformerImpl implements the TRaX Transformer interface, and extends the SAX XMLFilterImpl. It uses a SAX XMLParser to
- parse the XML input and sends parse events to an input SAX ContentHandler, org.apache.xalan.stree.SourceTreeHandler, which in
- turn uses org.apache.xalan.utils.DOMBuilder to assemble the input into a DOM tree (this step is unnecessary if the XML input
- is submitted as a DOM).</p>
+ <p>{@link org.apache.xalan.transformer.TransformerImpl} implements the
+ {@link javax.xml.transform.Transformer} interface, and is the core representation
+ of the transformation execution.</p>
<p>For each node in the XML source, TransformerImpl uses the StylesheetRoot and underlying XSLT schema to determine which
template to apply: one of the templates in the StylesheetRoot, a default template rule as specified in the XSLT spec, or
none.</p>
- <p>The Transformer works with org.apache.xalan.transformer.ResultTreeHandler to forward the SAX events produced by this
- process to the appropriate output ContentHandler, a serializer if the Result object has been set up to write to a stream or
- file, a DOMBuilder utility if the output is to be a DOM tree.</p>
+ <p>The Transformer works with {@link org.apache.xalan.transformer.ResultTreeHandler} to
+ forward the SAX events produced by the
+ transformation to the appropriate output ContentHandler.</p>
<p>To the degree possible, the parsing of the XML source and application of the Templates object to that source are performed
concurrently in separate threads. When necessary, the Transformer waits for the parse events that must be in place before a
given template may be applied.</p>
- <dl>
- <dt><b>Version: </b></dt><dd>xalan-j_2_0_D01, September 6, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
</html>
1.2 +1 -4 xml-xalan/java/src/org/apache/xalan/xslt/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/xslt/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/07/06 02:28:16 1.1
+++ package.html 2001/01/02 03:36:54 1.2
@@ -2,10 +2,7 @@
<title>Xalan command-line interface.</title>
<body>
<p>Implementation of Xalan command-line interface.<p>
- <dl>
- <dt><b>Version: </b></dt><dd>Alpha, 2.0.0, July 05, 2000</dd>
- <dt><b>Author: </b></dt><dd><a href="mailto:scott_boag@lotus.com">Scott Boag</a></dd>
- </dl>
</body>
+ </body>
</html>