Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/org/apache/xalan/extensions/MethodResolver.java
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@ static class ConversionInfo
* given set of Java parameters.
* If any invocations of this function for a method with
* the same name return the same positive value, then a conflict
* has occured, and an error should be signaled.
* has occurred, and an error should be signaled.
* @param javaParamTypes Must be filled with valid class names, and
* of the same length as xsltArgs.
* @param xsltArgs Must be filled with valid object instances, and
Expand Down
2 changes: 1 addition & 1 deletion src/org/apache/xalan/lib/sql/SQLDocument.java
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ public class SQLDocument extends DTMDocument
private boolean m_MultipleResults = false;

/**
* Flag to detect if an error occured during an operation
* Flag to detect if an error occurred during an operation
* Defines how errors are handled and how the SQL Connection
* is closed.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/org/apache/xalan/processor/ProcessorCharacters.java
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public void endElement(

/**
* Accumulate characters, until a non-whitespace event has
* occured.
* occurred.
*/
private StringBuffer m_accumulator = new StringBuffer();

Expand Down
4 changes: 2 additions & 2 deletions src/org/apache/xalan/serialize/Serializer.java
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public interface Serializer
*
* @return A {@link ContentHandler} interface into this serializer,
* or null if the serializer is not SAX 2 capable
* @throws IOException An I/O exception occured
* @throws IOException An I/O exception occurred
* @deprecated Use org.apache.xml.serializer.Serializer
*/
public ContentHandler asContentHandler() throws IOException;
Expand All @@ -122,7 +122,7 @@ public interface Serializer
*
* @return A {@link DOMSerializer} interface into this serializer,
* or null if the serializer is not DOM capable
* @throws IOException An I/O exception occured
* @throws IOException An I/O exception occurred
* @deprecated Use org.apache.xml.serializer.Serializer
*/
public DOMSerializer asDOMSerializer() throws IOException;
Expand Down
2 changes: 1 addition & 1 deletion src/org/apache/xalan/templates/ElemLiteralResult.java
Original file line number Diff line number Diff line change
Expand Up @@ -1477,7 +1477,7 @@ protected void callChildVisitors(XSLTVisitor visitor, boolean callAttrs)
/**
* Throw a DOMException
*
* @param msg key of the error that occured.
* @param msg key of the error that occurred.
*/
public void throwDOMException(short code, String msg)
{
Expand Down
2 changes: 1 addition & 1 deletion src/org/apache/xalan/templates/ElemTemplateElement.java
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ public void endCompose(StylesheetRoot sroot) throws TransformerException
/**
* Throw a template element runtime error. (Note: should we throw a TransformerException instead?)
*
* @param msg key of the error that occured.
* @param msg key of the error that occurred.
* @param args Arguments to be used in the message
*/
public void error(String msg, Object[] args)
Expand Down
4 changes: 2 additions & 2 deletions src/org/apache/xalan/xsltc/compiler/ApplyImports.java
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@ public boolean hasWithParams() {
/**
* Determine the lowest import precedence for any stylesheet imported
* or included by the stylesheet in which this <xsl:apply-imports/>
* element occured. The templates that are imported by the stylesheet in
* which this element occured will all have higher import precedence than
* element occurred. The templates that are imported by the stylesheet in
* which this element occurred will all have higher import precedence than
* the integer returned by this method.
*/
private int getMinPrecedence(int max) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public double getDefaultPriority() {
* mode and that match on the same core pattern. The rules used are:
* o) first check precedence - highest precedence wins
* o) then check priority - highest priority wins
* o) then check the position - the template that occured last wins
* o) then check the position - the template that occurred last wins
*/
public boolean noSmallerThan(LocationPathPattern other) {
if (_importPrecedence > other._importPrecedence) {
Expand Down
2 changes: 1 addition & 1 deletion src/org/apache/xalan/xsltc/compiler/Mode.java
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ final class Mode implements Constants {
* Creates a new Mode.
*
* @param name A textual representation of the mode's QName
* @param stylesheet The Stylesheet in which the mode occured
* @param stylesheet The Stylesheet in which the mode occurred
* @param suffix A suffix to append to the method name for this mode
* (normally a sequence number - still in a String).
*/
Expand Down
8 changes: 4 additions & 4 deletions src/org/apache/xalan/xsltc/compiler/Parser.java
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@ private void checkForSuperfluousAttributes(SyntaxTreeNode node,

/**
* Parse an XPath expression:
* @param parent - XSL element where the expression occured
* @param parent - XSL element where the expression occurred
* @param exp - textual representation of the expression
*/
public Expression parseExpression(SyntaxTreeNode parent, String exp) {
Expand All @@ -1048,7 +1048,7 @@ public Expression parseExpression(SyntaxTreeNode parent, String exp) {

/**
* Parse an XPath expression:
* @param parent - XSL element where the expression occured
* @param parent - XSL element where the expression occurred
* @param attr - name of this element's attribute to get expression from
* @param def - default expression (if the attribute was not found)
*/
Expand All @@ -1064,7 +1064,7 @@ public Expression parseExpression(SyntaxTreeNode parent,

/**
* Parse an XPath pattern:
* @param parent - XSL element where the pattern occured
* @param parent - XSL element where the pattern occurred
* @param pattern - textual representation of the pattern
*/
public Pattern parsePattern(SyntaxTreeNode parent, String pattern) {
Expand All @@ -1073,7 +1073,7 @@ public Pattern parsePattern(SyntaxTreeNode parent, String pattern) {

/**
* Parse an XPath pattern:
* @param parent - XSL element where the pattern occured
* @param parent - XSL element where the pattern occurred
* @param attr - name of this element's attribute to get pattern from
* @param def - default pattern (if the attribute was not found)
*/
Expand Down
10 changes: 5 additions & 5 deletions src/org/apache/xalan/xsltc/compiler/SyntaxTreeNode.java
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ protected final boolean isDummy() {

/**
* Get the import precedence of this element. The import precedence equals
* the import precedence of the stylesheet in which this element occured.
* the import precedence of the stylesheet in which this element occurred.
* @return The import precedence of this syntax tree node.
*/
protected int getImportPrecedence() {
Expand All @@ -355,7 +355,7 @@ protected int getImportPrecedence() {

/**
* Get the Stylesheet node that represents the <xsl:stylesheet/> element
* that this node occured under.
* that this node occurred under.
* @return The Stylesheet ancestor node of this node.
*/
public Stylesheet getStylesheet() {
Expand All @@ -373,7 +373,7 @@ public Stylesheet getStylesheet() {

/**
* Get the Template node that represents the <xsl:template/> element
* that this node occured under. Note that this method will return 'null'
* that this node occurred under. Note that this method will return 'null'
* for nodes that represent top-level elements.
* @return The Template ancestor node of this node or 'null'.
*/
Expand Down Expand Up @@ -913,7 +913,7 @@ protected final void indent(int indent) {

/**
* Report an error to the parser.
* @param element The element in which the error occured (normally 'this'
* @param element The element in which the error occurred (normally 'this'
* but it could also be an expression/pattern/etc.)
* @param parser The XSLT parser to report the error to.
* @param error The error code (from util/ErrorMsg).
Expand All @@ -927,7 +927,7 @@ protected void reportError(SyntaxTreeNode element, Parser parser,

/**
* Report a recoverable error to the parser.
* @param element The element in which the error occured (normally 'this'
* @param element The element in which the error occurred (normally 'this'
* but it could also be an expression/pattern/etc.)
* @param parser The XSLT parser to report the error to.
* @param error The error code (from util/ErrorMsg).
Expand Down
2 changes: 1 addition & 1 deletion src/org/apache/xalan/xsltc/compiler/TestSeq.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
/**
* A test sequence is a sequence of patterns that
*
* (1) occured in templates in the same mode
* (1) occurred in templates in the same mode
* (2) share the same kernel node type (e.g. A/B and C/C/B)
* (3) may also contain patterns matching "*" and "node()"
* (element sequence only) or matching "@*" (attribute
Expand Down
8 changes: 4 additions & 4 deletions src/org/apache/xml/dtm/DTMException.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@


/**
* This class specifies an exceptional condition that occured
* This class specifies an exceptional condition that occurred
* in the DTM module.
*/
public class DTMException extends RuntimeException {
static final long serialVersionUID = -775576419181334734L;

/** Field locator specifies where the error occured.
/** Field locator specifies where the error occurred.
* @serial */
SourceLocator locator;

/**
* Method getLocator retrieves an instance of a SourceLocator
* object that specifies where an error occured.
* object that specifies where an error occurred.
*
* @return A SourceLocator object, or null if none was specified.
*/
Expand All @@ -53,7 +53,7 @@ public SourceLocator getLocator() {

/**
* Method setLocator sets an instance of a SourceLocator
* object that specifies where an error occured.
* object that specifies where an error occurred.
*
* @param location A SourceLocator object, or null to clear the location.
*/
Expand Down
2 changes: 1 addition & 1 deletion src/org/apache/xml/dtm/ref/DTMDefaultBaseTraversers.java
Original file line number Diff line number Diff line change
Expand Up @@ -362,7 +362,7 @@ protected int getNextIndexed(int axisRoot, int nextPotential,
if(parentID == axisRoot)
return nextID;

// If the parent occured before the subtree root, then
// If the parent occurred before the subtree root, then
// we know it is past the child axis.
if(parentID < axisRoot)
return NULL;
Expand Down
8 changes: 4 additions & 4 deletions src/org/apache/xml/dtm/ref/sax2dtm/SAX2DTM.java
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ public class SAX2DTM extends DTMDefaultBaseIterators
/** End document has been reached.
* Made protected rather than private so SAX2RTFDTM can access it.
*/
protected boolean m_endDocumentOccured = false;
protected boolean m_endDocumentOccurred = false;

/** Data or qualified name values, one array element for each node. */
protected SuballocatedIntVector m_dataOrQName;
Expand Down Expand Up @@ -777,7 +777,7 @@ protected boolean nextNode()
if (null == m_incrementalSAXSource)
return false;

if (m_endDocumentOccured)
if (m_endDocumentOccurred)
{
clearCoRoutine();

Expand Down Expand Up @@ -1370,7 +1370,7 @@ public int getElementById(String elementId)
if (null != intObj)
return makeNodeHandle(intObj.intValue());

if (!isMore || m_endDocumentOccured)
if (!isMore || m_endDocumentOccurred)
break;

isMore = nextNode();
Expand Down Expand Up @@ -1726,7 +1726,7 @@ public void endDocument() throws SAXException
m_prefixMappings = null;
m_contextIndexes = null;

m_endDocumentOccured = true;
m_endDocumentOccurred = true;

// Bugzilla 4858: throw away m_locator. we cache m_systemId
m_locator = null;
Expand Down
6 changes: 3 additions & 3 deletions src/org/apache/xml/dtm/ref/sax2dtm/SAX2RTFDTM.java
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ protected int _documentRoot(int nodeIdentifier)
public void startDocument() throws SAXException
{
// Re-initialize the tree append process
m_endDocumentOccured = false;
m_endDocumentOccurred = false;
m_prefixMappings = new java.util.Vector();
m_contextIndexes = new IntStack();
m_parents = new IntStack();
Expand Down Expand Up @@ -261,7 +261,7 @@ public void endDocument() throws SAXException
m_contextIndexes = null;

m_currentDocumentNode= NULL; // no longer open
m_endDocumentOccured = true;
m_endDocumentOccurred = true;
}


Expand Down Expand Up @@ -357,6 +357,6 @@ public boolean popRewindMark()
* */
public boolean isTreeIncomplete()
{
return !m_endDocumentOccured;
return !m_endDocumentOccurred;
}
}
4 changes: 2 additions & 2 deletions src/org/apache/xml/serializer/DOM3Serializer.java
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,12 @@
public interface DOM3Serializer {
/**
* Serializes the Level 3 DOM node. Throws an exception only if an I/O
* exception occured while serializing.
* exception occurred while serializing.
*
* This interface is a public API.
*
* @param node the Level 3 DOM node to serialize
* @throws IOException if an I/O exception occured while serializing
* @throws IOException if an I/O exception occurred while serializing
*/
public void serializeDOM3(Node node) throws IOException;

Expand Down
4 changes: 2 additions & 2 deletions src/org/apache/xml/serializer/DOMSerializer.java
Original file line number Diff line number Diff line change
Expand Up @@ -63,12 +63,12 @@ public interface DOMSerializer
{
/**
* Serializes the DOM node. Throws an exception only if an I/O
* exception occured while serializing.
* exception occurred while serializing.
*
* This interface is a public API.
*
* @param node the DOM node to serialize
* @throws IOException if an I/O exception occured while serializing
* @throws IOException if an I/O exception occurred while serializing
*/
public void serialize(Node node) throws IOException;
}
2 changes: 1 addition & 1 deletion src/org/apache/xml/serializer/OutputPropertiesFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ public Object run()
* the rules of {@link #loadPropertiesFile}.
*
* @param s non-null reference to string that may need to be fixed up.
* @return A new string if fixup occured, otherwise the s argument.
* @return A new string if fixup occurred, otherwise the s argument.
*/
static private String fixupPropertyString(String s, boolean doClipping)
{
Expand Down
6 changes: 3 additions & 3 deletions src/org/apache/xml/serializer/Serializer.java
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public interface Serializer {
*
* @return A {@link ContentHandler} interface into this serializer,
* or null if the serializer is not SAX 2 capable
* @throws IOException An I/O exception occured
* @throws IOException An I/O exception occurred
*/
public ContentHandler asContentHandler() throws IOException;

Expand All @@ -203,7 +203,7 @@ public interface Serializer {
*
* @return A {@link DOMSerializer} interface into this serializer,
* or null if the serializer is not DOM capable
* @throws IOException An I/O exception occured
* @throws IOException An I/O exception occurred
*/
public DOMSerializer asDOMSerializer() throws IOException;

Expand Down Expand Up @@ -231,7 +231,7 @@ public interface Serializer {
*
* @return An Object to be cast to a DOM3Serializer interface into this serializer,
* or null if the serializer is not DOM capable
* @throws IOException An I/O exception occured
* @throws IOException An I/O exception occurred
*/
public Object asDOM3Serializer() throws IOException;
}
Expand Down
8 changes: 4 additions & 4 deletions src/org/apache/xml/serializer/SerializerBase.java
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ public void setDocumentLocator(Locator locator)
* there is a currently open element.
*
* An element is currently open if a startElement() notification has
* occured but the start of the element has not yet been written to the
* occurred but the start of the element has not yet been written to the
* output. In the stream case this means that we have not yet been forced
* to close the elements opening tag by another notification, such as a
* character notification.
Expand Down Expand Up @@ -508,7 +508,7 @@ public void addAttributes(Attributes atts) throws SAXException
*
* @return A {@link ContentHandler} interface into this serializer,
* or null if the serializer is not SAX 2 capable
* @throws IOException An I/O exception occured
* @throws IOException An I/O exception occurred
*/
public ContentHandler asContentHandler() throws IOException
{
Expand Down Expand Up @@ -786,7 +786,7 @@ public void namespaceAfterStartElement(String uri, String prefix)
*
* @return A {@link DOMSerializer} interface into this serializer, or null
* if the serializer is not DOM capable
* @throws IOException An I/O exception occured
* @throws IOException An I/O exception occurred
* @see Serializer#asDOMSerializer()
*/
public DOMSerializer asDOMSerializer() throws IOException
Expand Down Expand Up @@ -1576,7 +1576,7 @@ public String getOutputPropertyNonDefault(String name )
*
* @return A {@link DOM3Serializer} interface into this serializer, or null
* if the serializer is not DOM capable
* @throws IOException An I/O exception occured
* @throws IOException An I/O exception occurred
* @see org.apache.xml.serializer.Serializer#asDOM3Serializer()
*/
public Object asDOM3Serializer() throws IOException
Expand Down
4 changes: 2 additions & 2 deletions src/org/apache/xml/serializer/ToStream.java
Original file line number Diff line number Diff line change
Expand Up @@ -204,10 +204,10 @@ protected void closeCDATA() throws org.xml.sax.SAXException

/**
* Serializes the DOM node. Throws an exception only if an I/O
* exception occured while serializing.
* exception occurred while serializing.
*
* @param node Node to serialize.
* @throws IOException An I/O exception occured while serializing
* @throws IOException An I/O exception occurred while serializing
*/
public void serialize(Node node) throws IOException
{
Expand Down
Loading