You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@locus.apache.org on 2000/03/29 05:52:00 UTC
cvs commit: xml-xalan/src/org/apache/xalan/xslt/extensions Redirect.java
sboag 00/03/28 19:52:00
Modified: src/org/apache/xalan/xpath SimpleNodeLocator.java
XPathProcessorImpl.java
src/org/apache/xalan/xpath/dtm DTM.java DTMLiaison.java
src/org/apache/xalan/xpath/xml ElemDesc.java
FormatterToXML.java TreeWalker.java
XMLParserLiaisonDefault.java XSLMessages.java
src/org/apache/xalan/xslt CountersTable.java
ElemCallTemplate.java ElemFallback.java
ElemLiteralResult.java ElemNumber.java
ElemTemplateElement.java FuncDocument.java
KeyTable.java Process.java ResultTreeFrag.java
StylesheetHandler.java XSLTEngineImpl.java
src/org/apache/xalan/xslt/extensions Redirect.java
Log:
Elimination of unused local variables, discovered by putting j++ warning level to 4. They have all been commented out, rather than removed.
Revision Changes Path
1.21 +2 -2 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.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- SimpleNodeLocator.java 2000/03/27 20:18:50 1.20
+++ SimpleNodeLocator.java 2000/03/29 03:51:54 1.21
@@ -1053,7 +1053,7 @@
boolean isSimpleFollowing, boolean stopAtFirst)
throws org.xml.sax.SAXException
{
- int argLen = xpath.getArgLengthOfStep(opPos);
+ // int argLen = xpath.getArgLengthOfStep(opPos);
opPos = xpath.getFirstChildPosOfStep(opPos);
Document docContext = (Node.DOCUMENT_NODE == context.getNodeType())
@@ -1287,7 +1287,7 @@
boolean isSimpleFollowing, boolean stopAtFirst)
throws org.xml.sax.SAXException
{
- int argLen = xpath.getArgLengthOfStep(opPos);
+ // int argLen = xpath.getArgLengthOfStep(opPos);
opPos = xpath.getFirstChildPosOfStep(opPos);
xpath.error(context, XPATHErrorResources.ER_UNKNOWN_AXIS, new Object[] {Integer.toString(stepType)}); //"unknown axis: "+stepType);
return subQueryResults;
1.30 +1 -1 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.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- XPathProcessorImpl.java 2000/03/27 15:24:05 1.29
+++ XPathProcessorImpl.java 2000/03/29 03:51:54 1.30
@@ -1716,7 +1716,7 @@
{
if(true)
{
- int posOfLastOp = xpath.getNextOpPos(opPos)-1;
+ // int posOfLastOp = xpath.getNextOpPos(opPos)-1;
opPos = xpath.getFirstChildPos(opPos);
// step
1.17 +4 -4 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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DTM.java 2000/03/16 17:33:34 1.16
+++ DTM.java 2000/03/29 03:51:55 1.17
@@ -930,9 +930,9 @@
public final void startDTD(int rootElementType, int publicId, int systemId)
throws Exception
{
- String qualifiedName = fStringPool.toString(rootElementType);
- String publicID = fStringPool.toString(publicId);
- String systemID = fStringPool.toString(systemId);
+ // String qualifiedName = fStringPool.toString(rootElementType);
+ // String publicID = fStringPool.toString(publicId);
+ // String systemID = fStringPool.toString(systemId);
// fDocumentType = new org.apache.xerces.dom.DocumentTypeImpl(null, qualifiedName, publicID, systemID);
@@ -1295,7 +1295,7 @@
return -1;
// 0 is Document; first child is node 1.
- int parent = (position == 0) ? 1 : gotslot[1];
+ // int parent = (position == 0) ? 1 : gotslot[1];
// Advance to first non-Attr child
// (First child of any kind is at position+1, thereafter walk sibs)
1.15 +2 -3 xml-xalan/src/org/apache/xalan/xpath/dtm/DTMLiaison.java
Index: DTMLiaison.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/dtm/DTMLiaison.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DTMLiaison.java 2000/03/16 17:33:34 1.14
+++ DTMLiaison.java 2000/03/29 03:51:55 1.15
@@ -194,8 +194,7 @@
{
if(null == m_docHandler)
{
- DTM domParser = new DTM(this.getProblemListener());
- DTM parser = domParser;
+ DTM parser = new DTM(this.getProblemListener());
Thread parseThread = null;
{
if(null != m_errorHandler)
@@ -222,7 +221,7 @@
parser.setFeature("http://xml.org/sax/features/validation", true);
// Set whether or not to create entity ref nodes
- domParser.setFeature("http://apache.org/xml/features/dom/create-entity-ref-nodes", getShouldExpandEntityRefs());
+ parser.setFeature("http://apache.org/xml/features/dom/create-entity-ref-nodes", getShouldExpandEntityRefs());
if(m_doThreading)
{
1.5 +1 -1 xml-xalan/src/org/apache/xalan/xpath/xml/ElemDesc.java
Index: ElemDesc.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/ElemDesc.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ElemDesc.java 2000/03/06 20:13:44 1.4
+++ ElemDesc.java 2000/03/29 03:51:56 1.5
@@ -100,7 +100,7 @@
boolean is(int flags)
{
- int which = (m_flags & flags);
+ // int which = (m_flags & flags);
return (m_flags & flags) != 0;
}
1.33 +1 -1 xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java
Index: FormatterToXML.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/FormatterToXML.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- FormatterToXML.java 2000/03/16 17:33:37 1.32
+++ FormatterToXML.java 2000/03/29 03:51:56 1.33
@@ -1143,7 +1143,7 @@
writeParentTagEnd();
m_ispreserve = true;
- int pos = 0;
+ // int pos = 0;
int end = start+length;
for (int i = start; i < end; i ++)
{
1.9 +1 -1 xml-xalan/src/org/apache/xalan/xpath/xml/TreeWalker.java
Index: TreeWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/TreeWalker.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TreeWalker.java 2000/03/06 20:13:45 1.8
+++ TreeWalker.java 2000/03/29 03:51:56 1.9
@@ -197,7 +197,7 @@
{
ProcessingInstruction pi = (ProcessingInstruction)node;
String name = pi.getNodeName();
- String data = pi.getData();
+ // String data = pi.getData();
if(name.equals("xslt-next-is-raw") && name.equals("formatter-to-dom"))
{
nextIsRaw = true;
1.34 +1 -1 xml-xalan/src/org/apache/xalan/xpath/xml/XMLParserLiaisonDefault.java
Index: XMLParserLiaisonDefault.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/XMLParserLiaisonDefault.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- XMLParserLiaisonDefault.java 2000/03/16 17:33:37 1.33
+++ XMLParserLiaisonDefault.java 2000/03/29 03:51:56 1.34
@@ -1449,7 +1449,7 @@
*/
public static void getNodeData(Node node, StringBuffer buf)
{
- String data = null;
+ // String data = null;
switch(node.getNodeType())
{
1.9 +1 -1 xml-xalan/src/org/apache/xalan/xpath/xml/XSLMessages.java
Index: XSLMessages.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xpath/xml/XSLMessages.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- XSLMessages.java 2000/03/06 20:13:45 1.8
+++ XSLMessages.java 2000/03/29 03:51:56 1.9
@@ -370,7 +370,7 @@
{
Locale locale = Locale.getDefault();
- String suffix = getResourceSuffix(locale);
+ // String suffix = getResourceSuffix(locale);
try
{
//System.out.println("resource " +className+suffix);
1.6 +2 -2 xml-xalan/src/org/apache/xalan/xslt/CountersTable.java
Index: CountersTable.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/CountersTable.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CountersTable.java 2000/03/15 04:18:48 1.5
+++ CountersTable.java 2000/03/29 03:51:57 1.6
@@ -135,8 +135,8 @@
int count = 0;
Vector counters = getCounters(numberElem);
int nCounters = counters.size();
- XPath countMatchPattern = numberElem.getCountMatchPattern(support, node);
- XPath fromMatchPattern = numberElem.m_fromMatchPattern;
+ // XPath countMatchPattern = numberElem.getCountMatchPattern(support, node);
+ // XPath fromMatchPattern = numberElem.m_fromMatchPattern;
Node target = numberElem.getTargetNode(support, node);
if(null != target)
1.13 +1 -1 xml-xalan/src/org/apache/xalan/xslt/ElemCallTemplate.java
Index: ElemCallTemplate.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemCallTemplate.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ElemCallTemplate.java 2000/03/02 10:23:00 1.12
+++ ElemCallTemplate.java 2000/03/29 03:51:57 1.13
@@ -115,7 +115,7 @@
SAXException
{
super.execute(processor, sourceTree, sourceNode, mode);
- XPathSupport execContext = processor.getXMLProcessorLiaison();
+ // XPathSupport execContext = processor.getXMLProcessorLiaison();
if(null == m_template)
{
m_template
1.6 +1 -1 xml-xalan/src/org/apache/xalan/xslt/ElemFallback.java
Index: ElemFallback.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemFallback.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ElemFallback.java 2000/03/03 20:22:34 1.5
+++ ElemFallback.java 2000/03/29 03:51:57 1.6
@@ -117,7 +117,7 @@
if(!parent.elementIsAvailable())
{
super.execute(processor, sourceTree, sourceNode, mode);
- XPathSupport execContext = processor.getXMLProcessorLiaison();
+ // XPathSupport execContext = processor.getXMLProcessorLiaison();
executeChildren(processor, sourceTree,
sourceNode, mode);
}
1.20 +1 -1 xml-xalan/src/org/apache/xalan/xslt/ElemLiteralResult.java
Index: ElemLiteralResult.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemLiteralResult.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ElemLiteralResult.java 2000/03/03 20:22:34 1.19
+++ ElemLiteralResult.java 2000/03/29 03:51:57 1.20
@@ -144,7 +144,7 @@
if(needToProcess)
{
boolean _processUseAttributeSets = processUseAttributeSets(aname, atts, i);
- boolean _processSpaceAttr = processSpaceAttr(aname, atts, i);
+ // boolean _processSpaceAttr = processSpaceAttr(aname, atts, i);
// Add xmlns attribute(except xmlns:xsl), xml:space, etc...
// Ignore anything with xsl:xxx
if(!_processUseAttributeSets && isAttrOK(aname, atts, i))
1.14 +2 -2 xml-xalan/src/org/apache/xalan/xslt/ElemNumber.java
Index: ElemNumber.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemNumber.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- ElemNumber.java 2000/03/15 04:18:48 1.13
+++ ElemNumber.java 2000/03/29 03:51:57 1.14
@@ -731,7 +731,7 @@
NumberFormatStringTokenizer formatTokenizer = new NumberFormatStringTokenizer(formatValue);
- int sepCount = 0; // keep track of seperators
+ // int sepCount = 0; // keep track of seperators
// Loop through all the numbers in the list.
for(int i = 0; i < nNumbers; i++)
{
@@ -1247,7 +1247,7 @@
}
} // end while
- String s = new String(buf, 0, charPos);
+ // String s = new String(buf, 0, charPos);
return new String(buf, 0, charPos);
}
1.30 +2 -2 xml-xalan/src/org/apache/xalan/xslt/ElemTemplateElement.java
Index: ElemTemplateElement.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ElemTemplateElement.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ElemTemplateElement.java 2000/03/27 20:28:13 1.29
+++ ElemTemplateElement.java 2000/03/29 03:51:57 1.30
@@ -338,7 +338,7 @@
{
String qnames = attrValue;
StringTokenizer tokenizer = new StringTokenizer(qnames, " \t\n\r", false);
- String extensionElementPrefixes[] = new String[tokenizer.countTokens()];
+ // String extensionElementPrefixes[] = new String[tokenizer.countTokens()];
for(int k = 0; tokenizer.hasMoreTokens(); k++)
{
String eprefix = tokenizer.nextToken();
@@ -836,7 +836,7 @@
SAXException
{
// Sort the nodes according to the xsl:sort method
- int tok = xslInstruction.getXSLToken();
+ // int tok = xslInstruction.getXSLToken();
Vector keys = processSortKeys(xslInstruction,
tcontext, sourceNodeContext);
1.13 +9 -8 xml-xalan/src/org/apache/xalan/xslt/FuncDocument.java
Index: FuncDocument.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/FuncDocument.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FuncDocument.java 2000/03/02 10:23:05 1.12
+++ FuncDocument.java 2000/03/29 03:51:57 1.13
@@ -238,15 +238,16 @@
* the error condition is severe enough to halt processing.
*/
public void error(XPathSupport execContext, int msg, Object args[])
- throws org.xml.sax.SAXException
+ throws org.xml.sax.SAXException
{
- String formattedMsg = XSLMessages.createMessage(msg, args);
-
- XMLParserLiaison parserLiaison = (XMLParserLiaison)execContext;
- boolean shouldThrow = parserLiaison.getProblemListener().problem(ProblemListener.XSLPROCESSOR,
- ProblemListener.ERROR,
- null, null, formattedMsg,
- null, 0, 0);
+ String formattedMsg = XSLMessages.createMessage(msg, args);
+
+ XMLParserLiaison parserLiaison = (XMLParserLiaison)execContext;
+ // boolean shouldThrow =
+ parserLiaison.getProblemListener().problem(ProblemListener.XSLPROCESSOR,
+ ProblemListener.ERROR,
+ null, null, formattedMsg,
+ null, 0, 0);
}
/**
1.12 +1 -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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- KeyTable.java 2000/03/02 10:23:05 1.11
+++ KeyTable.java 2000/03/29 03:51:57 1.12
@@ -111,7 +111,7 @@
try
{
- org.apache.xalan.xpath.dtm.DTMProxy docp = (org.apache.xalan.xpath.dtm.DTMProxy)doc;
+ // org.apache.xalan.xpath.dtm.DTMProxy docp = (org.apache.xalan.xpath.dtm.DTMProxy)doc;
org.apache.xalan.xpath.dtm.DTMProxy dtmp = (org.apache.xalan.xpath.dtm.DTMProxy)startNode;
int dtmpPos = dtmp.getDTMNodeNumber();
1.19 +4 -4 xml-xalan/src/org/apache/xalan/xslt/Process.java
Index: Process.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/Process.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Process.java 2000/03/13 22:43:03 1.18
+++ Process.java 2000/03/29 03:51:57 1.19
@@ -201,7 +201,7 @@
XSLTProcessor processor = XSLTProcessorFactory.getProcessor(xmlProcessorLiaison);
boolean formatOutput = false;
- QName mode = null;
+ // QName mode = null;
String inFileName = null;
String outFileName = null;
String dumpFileName = null;
@@ -209,8 +209,8 @@
String compiledStylesheetFileNameOut = null;
String compiledStylesheetFileNameIn = null;
String treedumpFileName = null;
- boolean didSetCR = false;
- boolean didSetLF = false;
+ // boolean didSetCR = false;
+ // boolean didSetLF = false;
boolean stripCData = false;
boolean escapeCData = false;
boolean useXercesSerializers = false;
@@ -477,7 +477,7 @@
}
PrintWriter resultWriter;
- String mimeEncoding = null;
+ // String mimeEncoding = null;
OutputStream outputStream = null;
if(null != outFileName)
1.6 +3 -3 xml-xalan/src/org/apache/xalan/xslt/ResultTreeFrag.java
Index: ResultTreeFrag.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/ResultTreeFrag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ResultTreeFrag.java 2000/03/02 10:23:06 1.5
+++ ResultTreeFrag.java 2000/03/29 03:51:58 1.6
@@ -247,9 +247,9 @@
Node refChild)
throws DOMException
{
- MutableNodeListImpl mnl = (MutableNodeListImpl)m_children;
- int refIndex = (null == refChild)
- ? mnl.getLength() : mnl.indexOf(refChild);
+ // MutableNodeListImpl mnl = (MutableNodeListImpl)m_children;
+ // int refIndex = (null == refChild)
+ // ? mnl.getLength() : mnl.indexOf(refChild);
return newChild;
}
1.27 +1 -5 xml-xalan/src/org/apache/xalan/xslt/StylesheetHandler.java
Index: StylesheetHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/StylesheetHandler.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- StylesheetHandler.java 2000/03/02 18:56:42 1.26
+++ StylesheetHandler.java 2000/03/29 03:51:58 1.27
@@ -218,7 +218,7 @@
{
if(!m_processor.m_stylesheetLocatorStack.empty())
{
- Locator locator = (Locator)m_processor.m_stylesheetLocatorStack.pop();
+ m_processor.m_stylesheetLocatorStack.pop();
// System.out.println("popping locator for: "+locator.getPublicId());
}
// m_stylesheet.m_extensionNamespaces.clear();
@@ -1232,10 +1232,6 @@
try
{
- String[] stringHolder =
- {
- null};
-
Stylesheet importedStylesheet
= new Stylesheet(m_stylesheet.m_stylesheetRoot,
m_processor, m_stylesheet.m_baseIdent);
1.61 +5 -5 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.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- XSLTEngineImpl.java 2000/03/27 20:27:25 1.60
+++ XSLTEngineImpl.java 2000/03/29 03:51:58 1.61
@@ -541,9 +541,9 @@
// liaison is going to be used.
switchLiaisonsIfNeeded(inputSource.getNode(), outputTarget.getNode());
- String xslIdentifier = ((null == stylesheetSource) ||
- (null == stylesheetSource.getSystemId()))
- ? "Input XSL" : stylesheetSource.getSystemId();
+ // String xslIdentifier = ((null == stylesheetSource) ||
+ // (null == stylesheetSource.getSystemId()))
+ // ? "Input XSL" : stylesheetSource.getSystemId();
Boolean totalTimeID = new Boolean(true);
pushTime(totalTimeID);
Node sourceTree = null;
@@ -2518,7 +2518,7 @@
{
if(parent.getNodeType() == Node.ELEMENT_NODE)
{
- Element parentElem = (Element)parent;
+ // Element parentElem = (Element)parent;
/*
Attr attr = parentElem.getAttributeNode("xml:space");
@@ -4130,7 +4130,7 @@
if((null != m_stylesheetRoot.m_cdataSectionElems) &&
!m_cdataStack.isEmpty() && (m_cdataStack.peek() == TRUE))
{
- boolean isLexH = (m_flistener instanceof LexicalHandler);
+ // boolean isLexH = (m_flistener instanceof LexicalHandler);
if(m_flistener instanceof LexicalHandler)
((LexicalHandler)m_flistener).startCDATA();
1.9 +3 -2 xml-xalan/src/org/apache/xalan/xslt/extensions/Redirect.java
Index: Redirect.java
===================================================================
RCS file: /home/cvs/xml-xalan/src/org/apache/xalan/xslt/extensions/Redirect.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Redirect.java 2000/02/24 22:14:37 1.8
+++ Redirect.java 2000/03/29 03:52:00 1.9
@@ -164,8 +164,9 @@
String mkdirsExpr = ((ElemExtensionCall)elem).getAttribute ("mkdirs", context.sourceNode, context.processor);
boolean mkdirs = (mkdirsExpr != null)
? (mkdirsExpr.equals("true") || mkdirsExpr.equals("yes")) : true;
- DocumentHandler fl = makeFormatterListener(context, fileName, true, mkdirs);
- // fl.startDocument();
+ // DocumentHandler fl =
+ makeFormatterListener(context, fileName, true, mkdirs);
+ // fl.startDocument();
}
}