You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by zo...@apache.org on 2002/09/14 12:53:24 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/transformer TransformerImpl.java
zongaro 2002/09/14 03:53:24
Modified: java/src/org/apache/xalan/processor Tag: XSLTC_DTM
XSLTAttributeDef.java
java/src/org/apache/xalan/templates Tag: XSLTC_DTM
OutputProperties.java
java/src/org/apache/xalan/transformer Tag: XSLTC_DTM
TransformerImpl.java
Log:
Bringing branch up to date with latest change in MAIN branch.
Revision Changes Path
No revision
No revision
1.21.2.2 +5 -1 xml-xalan/java/src/org/apache/xalan/processor/XSLTAttributeDef.java
Index: XSLTAttributeDef.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTAttributeDef.java,v
retrieving revision 1.21.2.1
retrieving revision 1.21.2.2
diff -u -r1.21.2.1 -r1.21.2.2
--- XSLTAttributeDef.java 29 Jul 2002 00:01:17 -0000 1.21.2.1
+++ XSLTAttributeDef.java 14 Sep 2002 10:53:24 -0000 1.21.2.2
@@ -1273,7 +1273,11 @@
String prefix = tokenizer.nextToken();
String url = handler.getNamespaceForPrefix(prefix);
- strings.addElement(url);
+ if (url != null)
+ strings.addElement(url);
+ else
+ throw new org.xml.sax.SAXException(XSLMessages.createMessage(XSLTErrorResources.ER_CANT_RESOLVE_NSPREFIX, new Object[] {prefix}));
+
}
return strings;
No revision
No revision
1.20.10.1 +4 -0 xml-xalan/java/src/org/apache/xalan/templates/OutputProperties.java
Index: OutputProperties.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/templates/OutputProperties.java,v
retrieving revision 1.20
retrieving revision 1.20.10.1
diff -u -r1.20 -r1.20.10.1
--- OutputProperties.java 28 Jul 2001 00:25:58 -0000 1.20
+++ OutputProperties.java 14 Sep 2002 10:53:24 -0000 1.20.10.1
@@ -909,6 +909,10 @@
while (enum.hasMoreElements())
{
String key = (String) enum.nextElement();
+
+ if (!isLegalPropertyKey(key))
+ throw new IllegalArgumentException(XSLMessages.createMessage(XSLTErrorResources.ER_OUTPUT_PROPERTY_NOT_RECOGNIZED, new Object[]{key})); //"output property not recognized: "
+
Object oldValue = m_properties.get(key);
if (null == oldValue)
{
No revision
No revision
1.131.2.2 +7 -0 xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java
Index: TransformerImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/TransformerImpl.java,v
retrieving revision 1.131.2.1
retrieving revision 1.131.2.2
diff -u -r1.131.2.1 -r1.131.2.2
--- TransformerImpl.java 29 Jul 2002 00:01:20 -0000 1.131.2.1
+++ TransformerImpl.java 14 Sep 2002 10:53:24 -0000 1.131.2.2
@@ -899,8 +899,15 @@
* @param oformat A set of output properties that will be
* used to override any of the same properties in effect
* for the transformation.
+ *
+ * @see javax.xml.transform.OutputKeys
+ * @see java.util.Properties
+ *
+ * @throws IllegalArgumentException if any of the argument keys are not
+ * recognized and are not namespace qualified.
*/
public void setOutputProperties(Properties oformat)
+ throws IllegalArgumentException
{
synchronized (m_reentryGuard)
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org