You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by mm...@locus.apache.org on 2000/07/26 23:20:19 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/processor XSLTElementDef.java XSLTSchema.java
mmidy 00/07/26 14:20:19
Modified: java/src/org/apache/xalan/processor XSLTElementDef.java
XSLTSchema.java
Log:
Add an entry for whitespace in schema and fix extensionElementPrefixes.
Revision Changes Path
1.2 +5 -2 xml-xalan/java/src/org/apache/xalan/processor/XSLTElementDef.java
Index: XSLTElementDef.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTElementDef.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSLTElementDef.java 2000/06/19 16:52:15 1.1
+++ XSLTElementDef.java 2000/07/26 21:20:19 1.2
@@ -307,8 +307,11 @@
*/
void setElementProcessor(XSLTElementProcessor handler)
{
- m_elementProcessor = handler;
- m_elementProcessor.setElemDef(this);
+ if (handler != null)
+ {
+ m_elementProcessor = handler;
+ m_elementProcessor.setElemDef(this);
+ }
}
/**
1.2 +12 -3 xml-xalan/java/src/org/apache/xalan/processor/XSLTSchema.java
Index: XSLTSchema.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/processor/XSLTSchema.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XSLTSchema.java 2000/06/19 16:52:16 1.1
+++ XSLTSchema.java 2000/07/26 21:20:19 1.2
@@ -238,7 +238,16 @@
new ProcessorCharacters(),
ElemTextLiteral.class /* class object */ );
charData.setType(XSLTElementDef.T_PCDATA);
-
+
+ XSLTElementDef whiteSpaceOnly
+ = new XSLTElementDef(null, "text()",
+ null /*alias */,
+ null /* elements */,
+ null, /* attributes */
+ null,
+ ElemTextLiteral.class /* should be null? -sb */ );
+ charData.setType(XSLTElementDef.T_PCDATA);
+
XSLTAttributeDef resultAttr
= new XSLTAttributeDef(null, "*", XSLTAttributeDef.T_AVT, false);
@@ -607,7 +616,7 @@
XSLTAttributeDef extensionElementPrefixesAttr
= new XSLTAttributeDef(null, "extension-element-prefixes",
- XSLTAttributeDef.T_CDATA, false);
+ XSLTAttributeDef.T_STRINGLIST, false);
XSLTAttributeDef idAttr
= new XSLTAttributeDef(null, "id",
@@ -639,7 +648,7 @@
build(null,
null,
null,
- new XSLTElementDef[] {stylesheetElemDef, resultElement},
+ new XSLTElementDef[] {stylesheetElemDef, whiteSpaceOnly, resultElement},
null,
new ProcessorStylesheetDoc(), /* ContentHandler */
null /* class object */