sboag 00/05/31 01:33:50
Modified: src/org/apache/xalan/xpath/dtm DTM.java
src/org/apache/xalan/xslt KeyTable.java XSLTEngineImpl.java
Log:
Minor changes in DTM for latest Xerces.
Revision Changes Path
1.21 +9 -11 xml-xalan/src/org/apache/xalan/xpath/dtm/DTM.java
Index: DTM.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/dtm/DTM.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- DTM.java 2000/05/26 05:50:21 1.20
+++ DTM.java 2000/05/31 08:33:49 1.21
@@ -1009,14 +1009,12 @@
/**
* <!ELEMENT Name contentspec>
*/
- public final void elementDecl(QName elementDecl, XMLContentSpec
contentSpec)
- throws Exception
+ public void elementDecl(QName elementDecl,
+ int contentSpecType,
+ int contentSpecIndex,
+ XMLContentSpec.Provider contentSpecProvider)
+ throws Exception
{
- if (false)
- {
- System.out.println("elementDecl(" +
fStringPool.toString(elementDecl.rawname) + ", " +
- contentSpec + ")");
- }
}
/**
@@ -1032,11 +1030,11 @@
* or -1 if there is no defaultvalue
* @exception java.lang.Exception
*/
- public final void attlistDecl(QName elementDecl, QName attributeDecl,
- int attType,
+ public void attlistDecl(QName elementDecl, QName attributeDecl,
+ int attType, boolean attList,
String enumString,
- int attDefaultType, int attDefaultValue)
- throws Exception
+ int attDefaultType,
+ int attDefaultValue) throws Exception
{
} // attlistDecl(int,int,int,String,int,int)
1.13 +3 -1 xml-xalan/src/org/apache/xalan/xslt/KeyTable.java
Index: KeyTable.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/KeyTable.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- KeyTable.java 2000/03/29 03:51:57 1.12
+++ KeyTable.java 2000/05/31 08:33:49 1.13
@@ -108,7 +108,7 @@
{
m_docKey = doc;
XPathSupport execContext = xmlLiaison;
-
+
try
{
// org.apache.xalan.xpath.dtm.DTMProxy docp =
(org.apache.xalan.xpath.dtm.DTMProxy)doc;
@@ -116,6 +116,7 @@
org.apache.xalan.xpath.dtm.DTMProxy dtmp =
(org.apache.xalan.xpath.dtm.DTMProxy)startNode;
int dtmpPos = dtmp.getDTMNodeNumber();
org.apache.xalan.xpath.dtm.DTM dtm = dtmp.getDTM();
+ // dtm.dumpDTM();
boolean breakout = false;
// Walk across the kids until all have been accounted for
@@ -124,6 +125,7 @@
kid = dtm.getNextNode(dtmpPos, kid))
{
org.apache.xalan.xpath.dtm.DTMProxy testNode = dtm.getNode(kid);
+
// Walk through each of the declarations made with xsl:key
int nDeclarations = keyDeclarations.size();
for(int i = 0; i < nDeclarations; i++)
1.64 +6 -2 xml-xalan/src/org/apache/xalan/xslt/XSLTEngineImpl.java
Index: XSLTEngineImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/XSLTEngineImpl.java,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- XSLTEngineImpl.java 2000/05/17 22:43:31 1.63
+++ XSLTEngineImpl.java 2000/05/31 08:33:49 1.64
@@ -3869,9 +3869,13 @@
fireGenerateEvent(new GenerateEvent(XSLTEngineImpl.this,
GenerateEvent.EVENTTYPE_ENDELEMENT,
name, (AttributeList)null));
- m_resultNameSpaces.pop();
+ if(!m_resultNameSpaces.isEmpty())
+ m_resultNameSpaces.pop();
if(null != m_stylesheetRoot.m_cdataSectionElems)
- m_cdataStack.pop();
+ {
+ if(!m_cdataStack.isEmpty())
+ m_cdataStack.pop();
+ }
}
/**
