mmidy 02/04/10 13:33:58
Modified: java/src/org/apache/xalan/templates ElemApplyTemplates.java
ElemForEach.java TemplateList.java
VarNameCollector.java
Log:
Change extended types to be an integer and use a structure with a localname,
a namespace and a nodetype to represent the node extended type. We no longer
need to do the shifting left and right that we did for the previous extended
types.
Revision Changes Path
1.23 +1 -1
xml-xalan/java/src/org/apache/xalan/templates/ElemApplyTemplates.java
Index: ElemApplyTemplates.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemApplyTemplates.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- ElemApplyTemplates.java 27 Mar 2002 22:11:32 -0000 1.22
+++ ElemApplyTemplates.java 10 Apr 2002 20:33:58 -0000 1.23
@@ -329,7 +329,7 @@
}
final int exNodeType = dtm.getExpandedTypeID(child);
- final int nodeType = (exNodeType >>
ExpandedNameTable.ROTAMOUNT_TYPE);
+ final int nodeType = dtm.getNodeType(child);
final QName mode = transformer.getMode();
1.28 +2 -2
xml-xalan/java/src/org/apache/xalan/templates/ElemForEach.java
Index: ElemForEach.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/ElemForEach.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ElemForEach.java 24 Mar 2002 13:48:05 -0000 1.27
+++ ElemForEach.java 10 Apr 2002 20:33:58 -0000 1.28
@@ -424,8 +424,8 @@
docID = sourceNode & DTMManager.IDENT_DTM_DEFAULT;
}
- final int exNodeType = dtm.getExpandedTypeID(child);
- final int nodeType = (exNodeType >>
ExpandedNameTable.ROTAMOUNT_TYPE);
+ //final int exNodeType = dtm.getExpandedTypeID(child);
+ final int nodeType = dtm.getNodeType(child);
// Fire a trace event for the template.
if (TransformerImpl.S_DEBUG)
1.33 +1 -1
xml-xalan/java/src/org/apache/xalan/templates/TemplateList.java
Index: TemplateList.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/TemplateList.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- TemplateList.java 30 Jan 2002 19:08:01 -0000 1.32
+++ TemplateList.java 10 Apr 2002 20:33:58 -0000 1.33
@@ -535,7 +535,7 @@
TemplateSubPatternAssociation head;
- switch (expTypeID >> ExpandedNameTable.ROTAMOUNT_TYPE)
+ switch (dtm.getNodeType(targetNode))
{
case DTM.ELEMENT_NODE :
case DTM.ATTRIBUTE_NODE :
1.3 +1 -1
xml-xalan/java/src/org/apache/xalan/templates/VarNameCollector.java
Index: VarNameCollector.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xalan/templates/VarNameCollector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- VarNameCollector.java 22 Mar 2002 01:04:40 -0000 1.2
+++ VarNameCollector.java 10 Apr 2002 20:33:58 -0000 1.3
@@ -19,7 +19,7 @@
*/
public void reset()
{
- m_refs.clear();
+ m_refs.removeAllElements(); //.clear();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
