jkesselm 01/08/03 10:06:05
Modified: java/src/org/apache/xalan/processor StylesheetHandler.java
java/src/org/apache/xalan/templates ElemTemplateElement.java
java/src/org/apache/xalan/transformer ResultTreeHandler.java
TransformSnapshotImpl.java
Log:
Cutover to NamespaceSupport2, q.v.
Revision Changes Path
1.44 +7 -5
xml-xalan/java/src/org/apache/xalan/processor/StylesheetHandler.java
Index: StylesheetHandler.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/processor/StylesheetHandler.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- StylesheetHandler.java 2001/07/28 00:25:57 1.43
+++ StylesheetHandler.java 2001/08/03 17:06:05 1.44
@@ -92,7 +92,9 @@
import org.xml.sax.EntityResolver;
import org.xml.sax.InputSource;
import org.xml.sax.Locator;
+
import org.xml.sax.helpers.NamespaceSupport;
+import org.apache.xml.utils.NamespaceSupport2;
import org.xml.sax.helpers.DefaultHandler;
import javax.xml.transform.SourceLocator;
@@ -601,7 +603,7 @@
String uri, String localName, String rawName, Attributes
attributes)
throws org.xml.sax.SAXException
{
- NamespaceSupport nssupport = this.getNamespaceSupport();
+ NamespaceSupport nssupport = this.getNamespaceSupport();
nssupport.pushContext();
int n = m_prefixMappings.size();
@@ -1477,19 +1479,19 @@
*/
private boolean warnedAboutOldXSLTNamespace = false;
- /** Stack of [EMAIL PROTECTED] org.xml.sax.helpers.NamespaceSupport}
objects. */
+ /** Stack of NamespaceSupport objects. */
Stack m_nsSupportStack = new Stack();
/**
- * Push a new [EMAIL PROTECTED] org.xml.sax.helpers.NamespaceSupport}
instance.
+ * Push a new NamespaceSupport instance.
*/
void pushNewNamespaceSupport()
{
- m_nsSupportStack.push(new NamespaceSupport());
+ m_nsSupportStack.push(new NamespaceSupport2());
}
/**
- * Pop the current [EMAIL PROTECTED] org.xml.sax.helpers.NamespaceSupport}
object.
+ * Pop the current NamespaceSupport object.
*
*/
void popNamespaceSupport()
1.42 +2 -0
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.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- ElemTemplateElement.java 2001/06/15 05:13:56 1.41
+++ ElemTemplateElement.java 2001/08/03 17:06:05 1.42
@@ -91,7 +91,9 @@
// SAX Imports
import org.xml.sax.Locator;
import javax.xml.transform.TransformerException;
+
import org.xml.sax.helpers.NamespaceSupport;
+import org.apache.xml.utils.NamespaceSupport2;
/**
* <meta name="usage" content="advanced"/>
1.43 +3 -1
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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- ResultTreeHandler.java 2001/06/29 18:04:28 1.42
+++ ResultTreeHandler.java 2001/08/03 17:06:05 1.43
@@ -78,7 +78,9 @@
import org.xml.sax.Attributes;
import org.xml.sax.ContentHandler;
import org.xml.sax.ext.LexicalHandler;
+
import org.xml.sax.helpers.NamespaceSupport;
+import org.apache.xml.utils.NamespaceSupport2;
import org.xml.sax.Locator;
import javax.xml.transform.TransformerException;
@@ -1626,7 +1628,7 @@
/**
* Use the SAX2 helper class to track result namespaces.
*/
- NamespaceSupport m_nsSupport = new NamespaceSupport();
+ NamespaceSupport m_nsSupport = new NamespaceSupport2();
/**
* The transformer object.
1.6 +2 -1
xml-xalan/java/src/org/apache/xalan/transformer/TransformSnapshotImpl.java
Index: TransformSnapshotImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformSnapshotImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TransformSnapshotImpl.java 2001/06/12 19:15:27 1.5
+++ TransformSnapshotImpl.java 2001/08/03 17:06:05 1.6
@@ -67,6 +67,7 @@
import java.util.Stack;
import org.xml.sax.helpers.NamespaceSupport;
+import org.apache.xml.utils.NamespaceSupport2;
import java.util.Enumeration;
@@ -183,7 +184,7 @@
m_eventCount = rtf.m_eventCount;
// yuck. No clone. Hope this is good enough.
- m_nsSupport = new NamespaceSupport();
+ m_nsSupport = new NamespaceSupport2();
Enumeration prefixes = rtf.m_nsSupport.getPrefixes();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
