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:42:51 UTC
cvs commit: xml-xalan/java/src/org/apache/xml/utils BoolStack.java DOMBuilder.java DefaultErrorHandler.java ElemDesc.java IntStack.java NameSpace.java NodeVector.java ObjectPool.java QName.java SAXSourceLocator.java SerializableLocatorImpl.java SystemIDResolver.java URI.java WrappedRuntimeException.java package.html
sboag 01/01/01 19:42:51
Modified: java/src/org/apache/xml/utils BoolStack.java DOMBuilder.java
DefaultErrorHandler.java ElemDesc.java
IntStack.java NameSpace.java NodeVector.java
ObjectPool.java QName.java SAXSourceLocator.java
SerializableLocatorImpl.java SystemIDResolver.java
URI.java WrappedRuntimeException.java package.html
Log:
Javadoc work, to make the javadocs build clean.
Revision Changes Path
1.3 +2 -2 xml-xalan/java/src/org/apache/xml/utils/BoolStack.java
Index: BoolStack.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/BoolStack.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BoolStack.java 2000/11/30 20:13:58 1.2
+++ BoolStack.java 2001/01/02 03:42:50 1.3
@@ -127,7 +127,7 @@
* object as the value of this function.
*
* @return The object at the top of this stack.
- * @exception EmptyStackException if this stack is empty.
+ * @throws EmptyStackException if this stack is empty.
*/
public final boolean pop()
{
@@ -165,7 +165,7 @@
* from the stack.
*
* @return the object at the top of this stack.
- * @exception EmptyStackException if this stack is empty.
+ * @throws EmptyStackException if this stack is empty.
*/
public final boolean peek()
{
1.5 +2 -2 xml-xalan/java/src/org/apache/xml/utils/DOMBuilder.java
Index: DOMBuilder.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/DOMBuilder.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DOMBuilder.java 2000/12/31 09:23:01 1.4
+++ DOMBuilder.java 2001/01/02 03:42:50 1.5
@@ -457,8 +457,8 @@
* @param name The name of the entity. If it is a parameter
* entity, the name will begin with '%'.
* @see #endEntity
- * @see org.xml.sax.misc.DeclHandler#internalEntityDecl
- * @see org.xml.sax.misc.DeclHandler#externalEntityDecl
+ * @see org.xml.sax.ext.DeclHandler#internalEntityDecl
+ * @see org.xml.sax.ext.DeclHandler#externalEntityDecl
*/
public void startEntity(String name) throws org.xml.sax.SAXException
{
1.2 +6 -21 xml-xalan/java/src/org/apache/xml/utils/DefaultErrorHandler.java
Index: DefaultErrorHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/DefaultErrorHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DefaultErrorHandler.java 2000/11/23 04:58:45 1.1
+++ DefaultErrorHandler.java 2001/01/02 03:42:50 1.2
@@ -88,11 +88,8 @@
*
* @param exception The warning information encapsulated in a
* SAX parse exception.
- * @exception javax.xml.transform.TransformerException Any SAX exception, possibly
+ * @throws SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see javax.xml.transform.TransformerException
- *
- * @throws TransformerException
*/
public void warning(SAXParseException exception) throws SAXException
{
@@ -118,11 +115,8 @@
*
* @param exception The error information encapsulated in a
* SAX parse exception.
- * @exception javax.xml.transform.TransformerException Any SAX exception, possibly
+ * @throws SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see javax.xml.transform.TransformerException
- *
- * @throws TransformerException
*/
public void error(SAXParseException exception) throws SAXException
{
@@ -146,11 +140,8 @@
*
* @param exception The error information encapsulated in a
* SAX parse exception.
- * @exception javax.xml.transform.TransformerException Any SAX exception, possibly
+ * @throws SAXException Any SAX exception, possibly
* wrapping another exception.
- * @see javax.xml.transform.TransformerException
- *
- * @throws TransformerException
*/
public void fatalError(SAXParseException exception) throws SAXException
{
@@ -172,11 +163,9 @@
*
* @param exception The warning information encapsulated in a
* SAX parse exception.
- * @exception javax.xml.transform.TransformerException Any SAX exception, possibly
+ * @throws javax.xml.transform.TransformerException Any SAX exception, possibly
* wrapping another exception.
* @see javax.xml.transform.TransformerException
- *
- * @throws TransformerException
*/
public void warning(TransformerException exception) throws TransformerException
{
@@ -203,11 +192,9 @@
*
* @param exception The error information encapsulated in a
* SAX parse exception.
- * @exception javax.xml.transform.TransformerException Any SAX exception, possibly
+ * @throws javax.xml.transform.TransformerException Any SAX exception, possibly
* wrapping another exception.
* @see javax.xml.transform.TransformerException
- *
- * @throws TransformerException
*/
public void error(TransformerException exception) throws TransformerException
{
@@ -232,11 +219,9 @@
*
* @param exception The error information encapsulated in a
* SAX parse exception.
- * @exception javax.xml.transform.TransformerException Any SAX exception, possibly
+ * @throws javax.xml.transform.TransformerException Any SAX exception, possibly
* wrapping another exception.
* @see javax.xml.transform.TransformerException
- *
- * @throws TransformerException
*/
public void fatalError(TransformerException exception) throws TransformerException
{
1.4 +1 -1 xml-xalan/java/src/org/apache/xml/utils/ElemDesc.java
Index: ElemDesc.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/ElemDesc.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ElemDesc.java 2000/12/13 17:36:48 1.3
+++ ElemDesc.java 2001/01/02 03:42:50 1.4
@@ -60,7 +60,7 @@
/**
* <meta name="usage" content="internal"/>
- * This class is in support of FormatterToHTML, and acts as a sort
+ * This class is in support of SerializerToHTML, and acts as a sort
* of element representative for HTML elements.
*/
class ElemDesc
1.3 +2 -2 xml-xalan/java/src/org/apache/xml/utils/IntStack.java
Index: IntStack.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/IntStack.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- IntStack.java 2000/11/30 20:14:01 1.2
+++ IntStack.java 2001/01/02 03:42:50 1.3
@@ -136,7 +136,7 @@
* from the stack.
*
* @return the object at the top of this stack.
- * @exception EmptyStackException if this stack is empty.
+ * @throws EmptyStackException if this stack is empty.
*/
public int peek()
{
@@ -148,7 +148,7 @@
*
*
* @param val object to set at the top
- * @exception EmptyStackException if this stack is empty.
+ * @throws EmptyStackException if this stack is empty.
*/
public void setTop(int val)
{
1.3 +6 -3 xml-xalan/java/src/org/apache/xml/utils/NameSpace.java
Index: NameSpace.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/NameSpace.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NameSpace.java 2000/11/30 22:58:49 1.2
+++ NameSpace.java 2001/01/02 03:42:50 1.3
@@ -67,13 +67,16 @@
public class NameSpace implements Serializable
{
- /** Next NameSpace element on the stack */
+ /** Next NameSpace element on the stack.
+ * @serial */
public NameSpace m_next = null;
- /** Prefix of this NameSpace element */
+ /** Prefix of this NameSpace element.
+ * @serial */
public String m_prefix;
- /** Namespace URI of this NameSpace element */
+ /** Namespace URI of this NameSpace element.
+ * @serial */
public String m_uri; // if null, then Element namespace is empty.
/**
1.3 +8 -4 xml-xalan/java/src/org/apache/xml/utils/NodeVector.java
Index: NodeVector.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/NodeVector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- NodeVector.java 2000/11/30 22:58:49 1.2
+++ NodeVector.java 2001/01/02 03:42:50 1.3
@@ -67,16 +67,20 @@
public class NodeVector implements Serializable, Cloneable
{
- /** Size of blocks to allocate */
+ /** Size of blocks to allocate.
+ * @serial */
private int m_blocksize;
- /** Array of nodes this points to */
+ /** Array of nodes this points to.
+ * @serial */
private Node m_map[];
- /** Number of nodes in this NodeVector */
+ /** Number of nodes in this NodeVector.
+ * @serial */
protected int m_firstFree = 0;
- /** Size of the array this points to */
+ /** Size of the array this points to.
+ * @serial */
private int m_mapSize; // lazy initialization
/**
1.3 +4 -2 xml-xalan/java/src/org/apache/xml/utils/ObjectPool.java
Index: ObjectPool.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/ObjectPool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ObjectPool.java 2000/11/30 22:58:50 1.2
+++ ObjectPool.java 2001/01/02 03:42:50 1.3
@@ -65,10 +65,12 @@
public class ObjectPool implements java.io.Serializable
{
- /** Type of objects in this pool */
+ /** Type of objects in this pool.
+ * @serial */
private final Class objectType;
- /** Vector of given objects this points to */
+ /** Vector of given objects this points to.
+ * @serial */
private final Vector freeStack;
/**
1.6 +4 -0 xml-xalan/java/src/org/apache/xml/utils/QName.java
Index: QName.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/QName.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- QName.java 2000/12/06 05:31:49 1.5
+++ QName.java 2001/01/02 03:42:50 1.6
@@ -82,16 +82,19 @@
/**
* The local name.
+ * @serial
*/
protected String _localName;
/**
* The namespace URI.
+ * @serial
*/
protected String _namespaceURI;
/**
* The namespace prefix.
+ * @serial
*/
protected String _prefix;
@@ -103,6 +106,7 @@
/**
* The cached hashcode, which is calculated at construction time.
+ * @serial
*/
private int m_hashCode;
1.3 +3 -0 xml-xalan/java/src/org/apache/xml/utils/SAXSourceLocator.java
Index: SAXSourceLocator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/SAXSourceLocator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SAXSourceLocator.java 2000/11/30 22:58:52 1.2
+++ SAXSourceLocator.java 2001/01/02 03:42:50 1.3
@@ -71,6 +71,9 @@
public class SAXSourceLocator extends LocatorImpl
implements SourceLocator, Serializable
{
+ /** The SAX Locator object.
+ * @serial
+ */
Locator m_locator;
/**
1.2 +31 -12 xml-xalan/java/src/org/apache/xml/utils/SerializableLocatorImpl.java
Index: SerializableLocatorImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/SerializableLocatorImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SerializableLocatorImpl.java 2000/11/23 04:58:45 1.1
+++ SerializableLocatorImpl.java 2001/01/02 03:42:50 1.2
@@ -107,10 +107,10 @@
*/
public SerializableLocatorImpl (org.xml.sax.Locator locator)
{
- setPublicId(locator.getPublicId());
- setSystemId(locator.getSystemId());
- setLineNumber(locator.getLineNumber());
- setColumnNumber(locator.getColumnNumber());
+ setPublicId(locator.getPublicId());
+ setSystemId(locator.getSystemId());
+ setLineNumber(locator.getLineNumber());
+ setColumnNumber(locator.getColumnNumber());
}
@@ -129,7 +129,7 @@
*/
public String getPublicId ()
{
- return publicId;
+ return publicId;
}
@@ -143,7 +143,7 @@
*/
public String getSystemId ()
{
- return systemId;
+ return systemId;
}
@@ -156,7 +156,7 @@
*/
public int getLineNumber ()
{
- return lineNumber;
+ return lineNumber;
}
@@ -169,7 +169,7 @@
*/
public int getColumnNumber ()
{
- return columnNumber;
+ return columnNumber;
}
@@ -187,7 +187,7 @@
*/
public void setPublicId (String publicId)
{
- this.publicId = publicId;
+ this.publicId = publicId;
}
@@ -200,7 +200,7 @@
*/
public void setSystemId (String systemId)
{
- this.systemId = systemId;
+ this.systemId = systemId;
}
@@ -212,7 +212,7 @@
*/
public void setLineNumber (int lineNumber)
{
- this.lineNumber = lineNumber;
+ this.lineNumber = lineNumber;
}
@@ -224,7 +224,7 @@
*/
public void setColumnNumber (int columnNumber)
{
- this.columnNumber = columnNumber;
+ this.columnNumber = columnNumber;
}
@@ -232,9 +232,28 @@
// Internal state.
////////////////////////////////////////////////////////////////////
+ /**
+ * The public ID.
+ * @serial
+ */
private String publicId;
+
+ /**
+ * The system ID.
+ * @serial
+ */
private String systemId;
+
+ /**
+ * The line number.
+ * @serial
+ */
private int lineNumber;
+
+ /**
+ * The column number.
+ * @serial
+ */
private int columnNumber;
}
1.5 +1 -1 xml-xalan/java/src/org/apache/xml/utils/SystemIDResolver.java
Index: SystemIDResolver.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/SystemIDResolver.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SystemIDResolver.java 2000/12/09 19:40:49 1.4
+++ SystemIDResolver.java 2001/01/02 03:42:50 1.5
@@ -106,7 +106,7 @@
* @param base Base URI to use to resolve the given systemID
*
* @return The resolved absolute URI
- * @exception TransformerException thrown if the string can't be turned into a URL.
+ * @throws TransformerException thrown if the string can't be turned into a URL.
*/
public static String getAbsoluteURI(String urlString, String base)
throws TransformerException
1.4 +32 -25 xml-xalan/java/src/org/apache/xml/utils/URI.java
Index: URI.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/URI.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- URI.java 2000/12/13 22:59:42 1.3
+++ URI.java 2001/01/02 03:42:50 1.4
@@ -88,7 +88,7 @@
* default port for a specific scheme). Rather, it only knows the
* grammar and basic set of operations that can be applied to a URI.
*
- * @version $Id: URI.java,v 1.3 2000/12/13 22:59:42 mmidy Exp $
+ * @version $Id: URI.java,v 1.4 2001/01/02 03:42:50 sboag Exp $
*
*/
public class URI implements Serializable
@@ -142,28 +142,35 @@
*/
private static final String USERINFO_CHARACTERS = ";:&=+$,";
- /** Stores the scheme (usually the protocol) for this URI. */
+ /** Stores the scheme (usually the protocol) for this URI.
+ * @serial */
private String m_scheme = null;
- /** If specified, stores the userinfo for this URI; otherwise null */
+ /** If specified, stores the userinfo for this URI; otherwise null.
+ * @serial */
private String m_userinfo = null;
- /** If specified, stores the host for this URI; otherwise null */
+ /** If specified, stores the host for this URI; otherwise null.
+ * @serial */
private String m_host = null;
- /** If specified, stores the port for this URI; otherwise -1 */
+ /** If specified, stores the port for this URI; otherwise -1.
+ * @serial */
private int m_port = -1;
- /** If specified, stores the path for this URI; otherwise null */
+ /** If specified, stores the path for this URI; otherwise null.
+ * @serial */
private String m_path = null;
/**
* If specified, stores the query string for this URI; otherwise
- * null.
+ * null.
+ * @serial
*/
private String m_queryString = null;
- /** If specified, stores the fragment for this URI; otherwise null */
+ /** If specified, stores the fragment for this URI; otherwise null.
+ * @serial */
private String m_fragment = null;
/** Indicate whether in DEBUG mode */
@@ -197,7 +204,7 @@
* @param p_uriSpec the URI specification string (cannot be null or
* empty)
*
- * @exception MalformedURIException if p_uriSpec violates any syntax
+ * @throws MalformedURIException if p_uriSpec violates any syntax
* rules
*/
public URI(String p_uriSpec) throws MalformedURIException
@@ -214,7 +221,7 @@
* @param p_uriSpec the URI specification string (cannot be null or
* empty if p_base is null)
*
- * @exception MalformedURIException if p_uriSpec violates any syntax
+ * @throws MalformedURIException if p_uriSpec violates any syntax
* rules
*/
public URI(URI p_base, String p_uriSpec) throws MalformedURIException
@@ -231,7 +238,7 @@
* @param p_schemeSpecificPart the scheme-specific part (cannot be
* null or empty)
*
- * @exception MalformedURIException if p_scheme violates any
+ * @throws MalformedURIException if p_scheme violates any
* syntax rules
*/
public URI(String p_scheme, String p_schemeSpecificPart)
@@ -273,7 +280,7 @@
* @param p_fragment the URI fragment (cannot be specified if path
* is null)
*
- * @exception MalformedURIException if any of the parameters violates
+ * @throws MalformedURIException if any of the parameters violates
* syntax rules or semantic rules
*/
public URI(String p_scheme, String p_host, String p_path, String p_queryString, String p_fragment)
@@ -304,7 +311,7 @@
* @param p_fragment the URI fragment (cannot be specified if path
* is null)
*
- * @exception MalformedURIException if any of the parameters violates
+ * @throws MalformedURIException if any of the parameters violates
* syntax rules or semantic rules
*/
public URI(String p_scheme, String p_userinfo, String p_host, int p_port, String p_path, String p_queryString, String p_fragment)
@@ -384,7 +391,7 @@
* relative URI (can only be null/empty if p_base
* is not null)
*
- * @exception MalformedURIException if p_base is null and p_uriSpec
+ * @throws MalformedURIException if p_base is null and p_uriSpec
* is not an absolute URI or if
* p_uriSpec violates syntax rules
*/
@@ -601,7 +608,7 @@
*
* @param p_uriSpec the URI specification (cannot be null)
*
- * @exception MalformedURIException if URI does not have a conformant
+ * @throws MalformedURIException if URI does not have a conformant
* scheme
*/
private void initializeScheme(String p_uriSpec) throws MalformedURIException
@@ -643,7 +650,7 @@
*
* @param p_uriSpec the URI specification (cannot be null)
*
- * @exception MalformedURIException if p_uriSpec violates syntax rules
+ * @throws MalformedURIException if p_uriSpec violates syntax rules
*/
private void initializeAuthority(String p_uriSpec)
throws MalformedURIException
@@ -747,7 +754,7 @@
*
* @param p_uriSpec the URI specification (cannot be null)
*
- * @exception MalformedURIException if p_uriSpec violates syntax rules
+ * @throws MalformedURIException if p_uriSpec violates syntax rules
*/
private void initializePath(String p_uriSpec) throws MalformedURIException
{
@@ -1037,7 +1044,7 @@
*
* @param p_scheme the scheme for this URI (cannot be null)
*
- * @exception MalformedURIException if p_scheme is not a conformant
+ * @throws MalformedURIException if p_scheme is not a conformant
* scheme name
*/
public void setScheme(String p_scheme) throws MalformedURIException
@@ -1062,7 +1069,7 @@
*
* @param p_userinfo the userinfo for this URI
*
- * @exception MalformedURIException if p_userinfo contains invalid
+ * @throws MalformedURIException if p_userinfo contains invalid
* characters
*/
public void setUserinfo(String p_userinfo) throws MalformedURIException
@@ -1119,7 +1126,7 @@
*
* @param p_host the host for this URI
*
- * @exception MalformedURIException if p_host is not a valid IP
+ * @throws MalformedURIException if p_host is not a valid IP
* address or DNS hostname.
*/
public void setHost(String p_host) throws MalformedURIException
@@ -1147,7 +1154,7 @@
*
* @param p_port the port number for this URI
*
- * @exception MalformedURIException if p_port is not -1 and not a
+ * @throws MalformedURIException if p_port is not -1 and not a
* valid port number
*/
public void setPort(int p_port) throws MalformedURIException
@@ -1180,7 +1187,7 @@
*
* @param p_path the path for this URI (may be null)
*
- * @exception MalformedURIException if p_path contains invalid
+ * @throws MalformedURIException if p_path contains invalid
* characters
*/
public void setPath(String p_path) throws MalformedURIException
@@ -1208,7 +1215,7 @@
*
* @param p_addToPath the new segment to be added to the current path
*
- * @exception MalformedURIException if p_addToPath contains syntax
+ * @throws MalformedURIException if p_addToPath contains syntax
* errors
*/
public void appendPath(String p_addToPath) throws MalformedURIException
@@ -1266,7 +1273,7 @@
*
* @param p_queryString the query string for this URI
*
- * @exception MalformedURIException if p_queryString is not null and this
+ * @throws MalformedURIException if p_queryString is not null and this
* URI does not conform to the generic
* URI syntax or if the path is null
*/
@@ -1306,7 +1313,7 @@
*
* @param p_fragment the fragment for this URI
*
- * @exception MalformedURIException if p_fragment is not null and this
+ * @throws MalformedURIException if p_fragment is not null and this
* URI does not conform to the generic
* URI syntax or if the path is null
*/
1.3 +2 -1 xml-xalan/java/src/org/apache/xml/utils/WrappedRuntimeException.java
Index: WrappedRuntimeException.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/WrappedRuntimeException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- WrappedRuntimeException.java 2000/12/01 20:30:15 1.2
+++ WrappedRuntimeException.java 2001/01/02 03:42:50 1.3
@@ -64,7 +64,8 @@
public class WrappedRuntimeException extends RuntimeException
{
- /** Primary checked exception */
+ /** Primary checked exception.
+ * @serial */
private Exception m_exception;
/**
1.2 +1 -4 xml-xalan/java/src/org/apache/xml/utils/package.html
Index: package.html
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/package.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- package.html 2000/11/23 04:58:47 1.1
+++ package.html 2001/01/02 03:42:50 1.2
@@ -3,10 +3,7 @@
<body>
<p>Implementation of Xalan utility classes. This package is also shared by XPath.
There *should* be no outward dependencies to XPath or Xalan by classes in 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>