mmidy 00/08/18 10:41:09
Modified: src/org/apache/xalan/xslt TemplateList.java
Log:
Leave check for template priority intact (was changed by previous check in)
Revision Changes Path
1.10 +3 -4 xml-xalan/src/org/apache/xalan/xslt/TemplateList.java
Index: TemplateList.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/TemplateList.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TemplateList.java 2000/08/17 18:26:25 1.9
+++ TemplateList.java 2000/08/18 17:41:07 1.10
@@ -283,7 +283,7 @@
// We'll be needing to match rules according to what
// mode we're in.
QName ruleMode = rule.m_mode;
- double matchPatPriority = rule.m_priority; //XPath.MATCH_SCORE_NONE;
+ double matchPatPriority = XPath.MATCH_SCORE_NONE;
// The logic here should be that if we are not in a mode AND
// the rule does not have a node, then go ahead.
@@ -295,9 +295,8 @@
String patterns = matchPat.getPattern();
if((null != patterns) && !((prevPat != null) &&
prevPat.equals(patterns) &&
- prevMatchPatPriority ==
matchPatPriority))
- //(prevMatchPat.getTemplate().m_priority
- // ==
matchPat.getTemplate().m_priority)) )
+ (prevMatchPat.getTemplate().m_priority
+ == matchPat.getTemplate().m_priority))
)
{
prevMatchPat = matchPat;
prevPat = patterns;
