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/03/01 00:17:44 UTC
cvs commit: xml-xalan/src/org/apache/xalan/xslt/trace PrintTraceListener.java
mmidy 00/02/29 15:17:44
Modified: src/org/apache/xalan/xpath SimpleNodeLocator.java
XPathProcessorImpl.java
src/org/apache/xalan/xslt ElemCopyOf.java
XSLTEngineImpl.java
src/org/apache/xalan/xslt/trace PrintTraceListener.java
Log:
Use static constants in case statements
Revision Changes Path
1.15 +7 -7 xml-xalan/src/org/apache/xalan/xpath/SimpleNodeLocator.java
Index: SimpleNodeLocator.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/SimpleNodeLocator.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- SimpleNodeLocator.java 2000/02/23 06:07:03 1.14
+++ SimpleNodeLocator.java 2000/02/29 23:17:42 1.15
@@ -362,10 +362,10 @@
{
switch(stepType)
{
- case xpath.OP_VARIABLE:
- case xpath.OP_EXTFUNCTION:
- case xpath.OP_FUNCTION:
- case xpath.OP_GROUP:
+ case XPath.OP_VARIABLE:
+ case XPath.OP_EXTFUNCTION:
+ case XPath.OP_FUNCTION:
+ case XPath.OP_GROUP:
subQueryResults = new MutableNodeListImpl();
argLen = findNodeSet(xpath, execContext, context, opPos,
stepType, subQueryResults, isSimpleFollowing, stopAtFirst);
@@ -392,14 +392,14 @@
subQueryResults = findAncestorsOrSelf(xpath, execContext, context, opPos, stepType, subQueryResults, isSimpleFollowing, stopAtFirst);
shouldReorder = true;
break;
- case xpath.MATCH_ATTRIBUTE:
+ case XPath.MATCH_ATTRIBUTE:
continueStepRecursion = false;
// fall-through on purpose.
case XPath.FROM_ATTRIBUTES:
subQueryResults = findAttributes(xpath, execContext, context, opPos, stepType, subQueryResults, isSimpleFollowing, stopAtFirst);
break;
- case xpath.MATCH_ANY_ANCESTOR:
- case xpath.MATCH_IMMEDIATE_ANCESTOR:
+ case XPath.MATCH_ANY_ANCESTOR:
+ case XPath.MATCH_IMMEDIATE_ANCESTOR:
continueStepRecursion = false;
// fall-through on purpose.
case XPath.FROM_CHILDREN:
1.23 +10 -10 xml-xalan/src/org/apache/xalan/xpath/XPathProcessorImpl.java
Index: XPathProcessorImpl.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/XPathProcessorImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- XPathProcessorImpl.java 2000/02/28 22:00:49 1.22
+++ XPathProcessorImpl.java 2000/02/29 23:17:42 1.23
@@ -527,22 +527,22 @@
int tok = getKeywordToken(m_token);
switch(tok)
{
- case m_xpath.NODETYPE_COMMENT:
+ case XPath.NODETYPE_COMMENT:
targetStrings.addElement(PSEUDONAME_COMMENT);
break;
- case m_xpath.NODETYPE_TEXT:
+ case XPath.NODETYPE_TEXT:
targetStrings.addElement(PSEUDONAME_TEXT);
break;
- case m_xpath.NODETYPE_NODE:
+ case XPath.NODETYPE_NODE:
targetStrings.addElement(PSEUDONAME_ANY);
break;
- case m_xpath.NODETYPE_ROOT:
+ case XPath.NODETYPE_ROOT:
targetStrings.addElement(PSEUDONAME_ROOT);
break;
- case m_xpath.NODETYPE_ANYELEMENT:
+ case XPath.NODETYPE_ANYELEMENT:
targetStrings.addElement(PSEUDONAME_ANY);
break;
- case m_xpath.NODETYPE_PI:
+ case XPath.NODETYPE_PI:
targetStrings.addElement(PSEUDONAME_ANY);
break;
default:
@@ -2022,10 +2022,10 @@
}
switch(funcTok)
{
- case m_xpath.NODETYPE_PI:
- case m_xpath.NODETYPE_COMMENT:
- case m_xpath.NODETYPE_TEXT:
- case m_xpath.NODETYPE_NODE:
+ case XPath.NODETYPE_PI:
+ case XPath.NODETYPE_COMMENT:
+ case XPath.NODETYPE_TEXT:
+ case XPath.NODETYPE_NODE:
LocationPath();
return;
default:
1.12 +5 -5 xml-xalan/src/org/apache/xalan/xslt/ElemCopyOf.java
Index: ElemCopyOf.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemCopyOf.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ElemCopyOf.java 2000/02/28 22:03:37 1.11
+++ ElemCopyOf.java 2000/02/29 23:17:42 1.12
@@ -128,14 +128,14 @@
String s;
switch(type)
{
- case value.CLASS_BOOLEAN:
- case value.CLASS_NUMBER:
- case value.CLASS_STRING:
+ case XObject.CLASS_BOOLEAN:
+ case XObject.CLASS_NUMBER:
+ case XObject.CLASS_STRING:
s = value.str();
processor.m_resultTreeHandler.characters(s.toCharArray(), 0, s.length());
break;
- case value.CLASS_NODESET:
+ case XObject.CLASS_NODESET:
// System.out.println(value);
NodeList nl = value.nodeset();
int nChildren = nl.getLength();
@@ -168,7 +168,7 @@
}
break;
- case value.CLASS_RTREEFRAG:
+ case XObject.CLASS_RTREEFRAG:
processor.outputResultTreeFragment(value, processor.getExecContext());
break;
1.50 +8 -3 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.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- XSLTEngineImpl.java 2000/02/24 21:24:53 1.49
+++ XSLTEngineImpl.java 2000/02/29 23:17:42 1.50
@@ -451,6 +451,11 @@
m_stackGuard = new StackGuard();
m_parserLiaison.reset();
}
+
+ public StackGuard getStackGuard()
+ {
+ return m_stackGuard;
+ }
// Guard against being serialized by mistake
private void writeObject(ObjectOutputStream stream)
@@ -1209,11 +1214,11 @@
String s;
switch(type)
{
- case value.CLASS_BOOLEAN: case value.CLASS_NUMBER: case value.CLASS_STRING:
+ case XObject.CLASS_BOOLEAN: case XObject.CLASS_NUMBER: case XObject.CLASS_STRING:
s = value.str();
m_resultTreeHandler.characters(s.toCharArray(), 0, s.length());
break;
- case value.CLASS_NODESET: // System.out.println(value);
+ case XObject.CLASS_NODESET: // System.out.println(value);
NodeList nl = value.nodeset();
int nChildren = nl.getLength();
for(int i = 0; i < nChildren; i++)
@@ -1254,7 +1259,7 @@
}
break;
- case value.CLASS_RTREEFRAG:
+ case XObject.CLASS_RTREEFRAG:
outputResultTreeFragment(value, m_parserLiaison);
break;
}
1.5 +10 -10 xml-xalan/src/org/apache/xalan/xslt/trace/PrintTraceListener.java
Index: PrintTraceListener.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/trace/PrintTraceListener.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PrintTraceListener.java 2000/02/25 16:12:29 1.4
+++ PrintTraceListener.java 2000/02/29 23:17:43 1.5
@@ -222,40 +222,40 @@
{
switch(ev.m_eventtype)
{
- case ev.EVENTTYPE_STARTDOCUMENT:
+ case GenerateEvent.EVENTTYPE_STARTDOCUMENT:
m_pw.println("STARTDOCUMENT");
break;
- case ev.EVENTTYPE_ENDDOCUMENT:
+ case GenerateEvent.EVENTTYPE_ENDDOCUMENT:
m_pw.println("ENDDOCUMENT");
break;
- case ev.EVENTTYPE_STARTELEMENT:
+ case GenerateEvent.EVENTTYPE_STARTELEMENT:
m_pw.println("STARTELEMENT: "+ev.m_name);
break;
- case ev.EVENTTYPE_ENDELEMENT:
+ case GenerateEvent.EVENTTYPE_ENDELEMENT:
m_pw.println("ENDELEMENT: "+ev.m_name);
break;
- case ev.EVENTTYPE_CHARACTERS:
+ case GenerateEvent.EVENTTYPE_CHARACTERS:
{
String chars = new String(ev.m_characters, ev.m_start, ev.m_length);
m_pw.println("CHARACTERS: "+chars);
}
break;
- case ev.EVENTTYPE_CDATA:
+ case GenerateEvent.EVENTTYPE_CDATA:
{
String chars = new String(ev.m_characters, ev.m_start, ev.m_length);
m_pw.println("CDATA: "+chars);
}
break;
- case ev.EVENTTYPE_COMMENT:
+ case GenerateEvent.EVENTTYPE_COMMENT:
m_pw.println("COMMENT: "+ev.m_data);
break;
- case ev.EVENTTYPE_PI:
+ case GenerateEvent.EVENTTYPE_PI:
m_pw.println("PI: "+ev.m_name+", "+ev.m_data);
break;
- case ev.EVENTTYPE_ENTITYREF:
+ case GenerateEvent.EVENTTYPE_ENTITYREF:
m_pw.println("ENTITYREF: "+ev.m_name);
break;
- case ev.EVENTTYPE_IGNORABLEWHITESPACE:
+ case GenerateEvent.EVENTTYPE_IGNORABLEWHITESPACE:
m_pw.println("IGNORABLEWHITESPACE");
break;
}