Author: markt
Date: Wed Nov 7 12:38:14 2012
New Revision: 1406589
URL: http://svn.apache.org/viewvc?rev=1406589&view=rev
Log:
Silence the remaining Eclipse warnings in Jasper
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java?rev=1406589&r1=1406588&r2=1406589&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/ELFunctionMapper.java Wed Nov
7 12:38:14 2012
@@ -59,8 +59,10 @@ public class ELFunctionMapper {
String ds = map.ds.toString();
if (ds.length() > 0) {
Node root = page.getRoot();
- new Node.Declaration(map.ss.toString(), null, root);
- new Node.Declaration("static {\n" + ds + "}\n", null, root);
+ @SuppressWarnings("unused")
+ Node unused = new Node.Declaration(map.ss.toString(), null, root);
+ unused = new Node.Declaration(
+ "static {\n" + ds + "}\n", null, root);
}
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java?rev=1406589&r1=1406588&r2=1406589&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java
(original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspDocumentParser.java Wed Nov
7 12:38:14 2012
@@ -488,7 +488,9 @@ class JspDocumentParser
if (tagDependentNesting > 0) {
if (charBuffer.length() > 0) {
- new Node.TemplateText(charBuffer.toString(), startMark,
current);
+ @SuppressWarnings("unused")
+ Node unused = new Node.TemplateText(
+ charBuffer.toString(), startMark, current);
}
startMark = new Mark(ctxt, path, locator.getLineNumber(),
locator.getColumnNumber());
@@ -517,10 +519,9 @@ class JspDocumentParser
if ((lastCh == '$' || lastCh == '#') && ch == '{') {
elType = lastCh;
if (ttext.size() > 0) {
- new Node.TemplateText(
- ttext.toString(),
- startMark,
- current);
+ @SuppressWarnings("unused")
+ Node unused = new Node.TemplateText(
+ ttext.toString(), startMark, current);
ttext = new CharArrayWriter();
//We subtract two from the column number to
//account for the '[$,#]{' that we've already parsed
@@ -553,10 +554,10 @@ class JspDocumentParser
continue;
}
if (ch == '}') {
- new Node.ELExpression((char) elType,
- ttext.toString(),
- startMark,
- current);
+ @SuppressWarnings("unused")
+ Node unused = new Node.ELExpression(
+ (char) elType, ttext.toString(),
+ startMark, current);
ttext = new CharArrayWriter();
startMark = new Mark(ctxt, path, line, column);
break;
@@ -589,7 +590,9 @@ class JspDocumentParser
ttext.write(lastCh);
}
if (ttext.size() > 0) {
- new Node.TemplateText(ttext.toString(), startMark, current);
+ @SuppressWarnings("unused")
+ Node unused = new Node.TemplateText(
+ ttext.toString(), startMark, current);
}
}
startMark = new Mark(ctxt, path, locator.getLineNumber(),
@@ -698,13 +701,11 @@ class JspDocumentParser
// ignore comments in the DTD
if (!inDTD) {
- startMark =
- new Mark(
- ctxt,
- path,
- locator.getLineNumber(),
+ startMark = new Mark(ctxt, path, locator.getLineNumber(),
locator.getColumnNumber());
- new Node.Comment(new String(buf, offset, len), startMark, current);
+ @SuppressWarnings("unused")
+ Node unused = new Node.Comment(
+ new String(buf, offset, len), startMark, current);
}
}
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Parser.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Parser.java?rev=1406589&r1=1406588&r2=1406589&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Parser.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Parser.java Wed Nov 7
12:38:14 2012
@@ -439,7 +439,8 @@ class Parser implements TagConstants {
}
}
- new Node.TaglibDirective(attrs, start, parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.TaglibDirective(attrs, start, parent);
}
/*
@@ -593,7 +594,8 @@ class Parser implements TagConstants {
*/
private void parseAttributeDirective(Node parent) throws JasperException {
Attributes attrs = parseAttributes();
- new Node.AttributeDirective(attrs, start, parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.AttributeDirective(attrs, start, parent);
}
/*
@@ -602,7 +604,8 @@ class Parser implements TagConstants {
*/
private void parseVariableDirective(Node parent) throws JasperException {
Attributes attrs = parseAttributes();
- new Node.VariableDirective(attrs, start, parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.VariableDirective(attrs, start, parent);
}
/*
@@ -615,7 +618,9 @@ class Parser implements TagConstants {
err.jspError(start, "jsp.error.unterminated", "<%--");
}
- new Node.Comment(reader.getText(start, stop), start, parent);
+ @SuppressWarnings("unused")
+ Node unused =
+ new Node.Comment(reader.getText(start, stop), start, parent);
}
/*
@@ -628,8 +633,9 @@ class Parser implements TagConstants {
err.jspError(start, "jsp.error.unterminated", "<%!");
}
- new Node.Declaration(parseScriptText(reader.getText(start, stop)),
- start, parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.Declaration(
+ parseScriptText(reader.getText(start, stop)), start, parent);
}
/*
@@ -655,7 +661,8 @@ class Parser implements TagConstants {
"<jsp:declaration>");
}
text = parseScriptText(reader.getText(start, stop));
- new Node.Declaration(text, start, parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.Declaration(text, start, parent);
if (reader.matches("![CDATA[")) {
start = reader.mark();
stop = reader.skipUntil("]]>");
@@ -663,7 +670,8 @@ class Parser implements TagConstants {
err.jspError(start, "jsp.error.unterminated", "CDATA");
}
text = parseScriptText(reader.getText(start, stop));
- new Node.Declaration(text, start, parent);
+ @SuppressWarnings("unused")
+ Node unused2 = new Node.Declaration(text, start, parent);
} else {
break;
}
@@ -686,8 +694,9 @@ class Parser implements TagConstants {
err.jspError(start, "jsp.error.unterminated", "<%=");
}
- new Node.Expression(parseScriptText(reader.getText(start, stop)),
- start, parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.Expression(
+ parseScriptText(reader.getText(start, stop)), start, parent);
}
/*
@@ -711,7 +720,8 @@ class Parser implements TagConstants {
"<jsp:expression>");
}
text = parseScriptText(reader.getText(start, stop));
- new Node.Expression(text, start, parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.Expression(text, start, parent);
if (reader.matches("![CDATA[")) {
start = reader.mark();
stop = reader.skipUntil("]]>");
@@ -719,7 +729,8 @@ class Parser implements TagConstants {
err.jspError(start, "jsp.error.unterminated", "CDATA");
}
text = parseScriptText(reader.getText(start, stop));
- new Node.Expression(text, start, parent);
+ @SuppressWarnings("unused")
+ Node unused2 = new Node.Expression(text, start, parent);
} else {
break;
}
@@ -758,7 +769,9 @@ class Parser implements TagConstants {
singleQuoted = !singleQuoted;
} while (currentChar != '}' || (singleQuoted || doubleQuoted));
- new Node.ELExpression(type, reader.getText(start, last), start,
parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.ELExpression(
+ type, reader.getText(start, last), start, parent);
}
/*
@@ -771,8 +784,9 @@ class Parser implements TagConstants {
err.jspError(start, "jsp.error.unterminated", "<%");
}
- new Node.Scriptlet(parseScriptText(reader.getText(start, stop)), start,
- parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.Scriptlet(
+ parseScriptText(reader.getText(start, stop)), start, parent);
}
/*
@@ -796,7 +810,8 @@ class Parser implements TagConstants {
"<jsp:scriptlet>");
}
text = parseScriptText(reader.getText(start, stop));
- new Node.Scriptlet(text, start, parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.Scriptlet(text, start, parent);
if (reader.matches("![CDATA[")) {
start = reader.mark();
stop = reader.skipUntil("]]>");
@@ -804,7 +819,8 @@ class Parser implements TagConstants {
err.jspError(start, "jsp.error.unterminated", "CDATA");
}
text = parseScriptText(reader.getText(start, stop));
- new Node.Scriptlet(text, start, parent);
+ @SuppressWarnings("unused")
+ Node unused2 = new Node.Scriptlet(text, start, parent);
} else {
break;
}
@@ -1240,11 +1256,13 @@ class Parser implements TagConstants {
// Parse 'CustomActionEnd' production:
if (reader.matches("/>")) {
if (tagInfo != null) {
- new Node.CustomTag(tagName, prefix, shortTagName, uri, attrs,
- start, parent, tagInfo, tagHandlerClass);
+ @SuppressWarnings("unused")
+ Node unused = new Node.CustomTag(tagName, prefix, shortTagName,
+ uri, attrs, start, parent, tagInfo, tagHandlerClass);
} else {
- new Node.CustomTag(tagName, prefix, shortTagName, uri, attrs,
- start, parent, tagFileInfo);
+ @SuppressWarnings("unused")
+ Node unused = new Node.CustomTag(tagName, prefix, shortTagName,
+ uri, attrs, start, parent, tagFileInfo);
}
return true;
}
@@ -1329,7 +1347,8 @@ class Parser implements TagConstants {
}
ttext.write(ch);
}
- new Node.TemplateText(ttext.toString(), start, parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.TemplateText(ttext.toString(), start, parent);
}
/*
@@ -1380,7 +1399,9 @@ class Parser implements TagConstants {
continue;
}
// Create a template text node
- new Node.TemplateText(ttext.toString(), start, parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.TemplateText(
+ ttext.toString(), start, parent);
// Mark and parse the EL expression and create its node:
start = reader.mark();
@@ -1393,7 +1414,9 @@ class Parser implements TagConstants {
}
}
- new Node.TemplateText(ttext.toString(), start, parent);
+ @SuppressWarnings("unused")
+ Node unused =
+ new Node.TemplateText(ttext.toString(), start, parent);
if (!reader.hasMoreInput()) {
err.jspError(start, "jsp.error.unterminated",
@@ -1599,8 +1622,9 @@ class Parser implements TagConstants {
if (bodyEnd == null) {
err.jspError(start, "jsp.error.unterminated", "<" + tag);
}
- new Node.TemplateText(reader.getText(bodyStart, bodyEnd), bodyStart,
- parent);
+ @SuppressWarnings("unused")
+ Node unused = new Node.TemplateText(reader.getText(bodyStart, bodyEnd),
+ bodyStart, parent);
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
