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...@locus.apache.org on 2000/11/15 03:35:07 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/processor StylesheetHandler.java TransformerFactoryImpl.java
sboag 00/11/14 18:35:07
Modified: java/src/org/apache/xalan/processor StylesheetHandler.java
TransformerFactoryImpl.java
Log:
Updated for TrAX changes:
Changed TemplateHandler#setSystemID to TemplateHandler#setSystemId.
Delete the Features class, and define FEATURE variables on
the Source and Result derived classes, as well as on SAXTransformerFactory
and also define FEATURE_XMLFILTER on SAXTransformerFactory.
Revision Changes Path
1.22 +1 -1 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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- StylesheetHandler.java 2000/11/14 17:40:35 1.21
+++ StylesheetHandler.java 2000/11/15 02:35:06 1.22
@@ -297,7 +297,7 @@
* resolve relative URLs in the stylesheet.
* @param baseID Base URL for this stylesheet.
*/
- public void setSystemID(String baseID)
+ public void setSystemId(String baseID)
{
pushBaseIndentifier(baseID);
}
1.8 +21 -17 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TransformerFactoryImpl.java 2000/11/14 18:56:25 1.7
+++ TransformerFactoryImpl.java 2000/11/15 02:35:06 1.8
@@ -75,7 +75,6 @@
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerFactory;
import javax.xml.transform.TransformerConfigurationException;
-import javax.xml.transform.Features;
import javax.xml.transform.Source;
import javax.xml.transform.URIResolver;
import javax.xml.transform.Templates;
@@ -83,8 +82,11 @@
import javax.xml.transform.sax.TransformerHandler;
import javax.xml.transform.sax.SAXTransformerFactory;
import javax.xml.transform.sax.SAXSource;
+import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.stream.StreamSource;
+import javax.xml.transform.stream.StreamResult;
import javax.xml.transform.ErrorListener;
import java.io.IOException;
@@ -366,23 +368,25 @@
{
// Try first with identity comparison, which
// will be faster.
- if (Features.DOM == name)
+ if ( (DOMResult.FEATURE == name) || (DOMSource.FEATURE == name)
+ || (SAXResult.FEATURE == name) || (SAXSource.FEATURE == name)
+ || (StreamResult.FEATURE == name) || (StreamSource.FEATURE == name)
+ || (SAXTransformerFactory.FEATURE == name)
+ || (SAXTransformerFactory.FEATURE_XMLFILTER == name)
+ )
return true;
- else if (Features.SAX == name)
- return true;
- else if (Features.STREAM == name)
- return true;
- // And now with equality comparisons.
- else if (Features.DOM.equals(name))
- return true;
- else if (Features.SAX.equals(name))
- return true;
- else if (Features.STREAM.equals(name))
- return true;
-
- return false;
+ else
+ if ( (DOMResult.FEATURE.equals(name)) || (DOMSource.FEATURE.equals(name))
+ || (SAXResult.FEATURE.equals(name)) || (SAXSource.FEATURE.equals(name))
+ || (StreamResult.FEATURE.equals(name)) || (StreamSource.FEATURE.equals(name))
+ || (SAXTransformerFactory.FEATURE.equals(name))
+ || (SAXTransformerFactory.FEATURE_XMLFILTER.equals(name))
+ )
+ return true;
+ else
+ return false;
}
-
+
/**
* Allows the user to set specific attributes on the underlying
* implementation.
@@ -577,7 +581,7 @@
DOMSource dsource = (DOMSource)source;
Node node = dsource.getNode();
String baseID = dsource.getSystemId();
- builder.setSystemID(baseID);
+ builder.setSystemId(baseID);
return processFromNode(node, baseID);
}