mkwan 2002/11/01 08:31:05
Modified: java/src/org/apache/xalan/serialize SerializerToXML.java
Log:
Simplify the code for the new SystemIDResolver. One call to the getAbsoluteURI
interface should be enough.
Revision Changes Path
1.18 +2 -18
xml-xalan/java/src/org/apache/xalan/serialize/SerializerToXML.java
Index: SerializerToXML.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/serialize/SerializerToXML.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- SerializerToXML.java 20 Sep 2002 18:53:18 -0000 1.17
+++ SerializerToXML.java 1 Nov 2002 16:31:05 -0000 1.18
@@ -441,8 +441,6 @@
if (null != entitiesFileName)
{
- try
- {
m_charInfo = null;
if (null == m_charInfos)
@@ -474,26 +472,12 @@
{
String absoluteEntitiesFileName;
- if (entitiesFileName.indexOf(':') < 0)
- {
- absoluteEntitiesFileName =
- SystemIDResolver.getAbsoluteURIFromRelative(entitiesFileName);
- }
- else
- {
- absoluteEntitiesFileName =
- SystemIDResolver.getAbsoluteURI(entitiesFileName, null);
- }
-
+ absoluteEntitiesFileName =
SystemIDResolver.getAbsoluteURI(entitiesFileName);
+
m_charInfo = new CharInfo(absoluteEntitiesFileName);
m_charInfos.put(entitiesFileName, m_charInfo);
}
- }
- catch (javax.xml.transform.TransformerException te)
- {
- throw new org.apache.xml.utils.WrappedRuntimeException(te);
- }
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
