You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2011/09/23 23:41:04 UTC
svn commit: r1175042 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/el/parser/
Author: kkolinko
Date: Fri Sep 23 21:41:03 2011
New Revision: 1175042
URL: http://svn.apache.org/viewvc?rev=1175042&view=rev
Log:
Merged revision 1174983 from tomcat/trunk:
Ignore warnings in classes generated with JavaCC/JJTree
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParser.java
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/JJTELParserState.java
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/SimpleCharStream.java
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/Token.java
tomcat/tc7.0.x/trunk/java/org/apache/el/parser/TokenMgrError.java
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Sep 23 21:41:03 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447,1170647,1171692,1172233-1172234,1172236,1172269,1172278,1172282,1172610,1172664,1172689,1172711,1173020-1173021,1173082,1173088,1173090,1173096,1173241,1173256,1173288,1173461
,1173614,1173630,1173659,1173722,1174061,1174239,1174330,1174337-1174338,1174343,1174353,1174882,1174884,1174983
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParser.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParser.java?rev=1175042&r1=1175041&r2=1175042&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParser.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParser.java Fri Sep 23 21:41:03 2011
@@ -3,6 +3,8 @@ package org.apache.el.parser;
import java.io.StringReader;
import javax.el.ELException;
+
+@SuppressWarnings("all") // Ignore warnings in generated code
public class ELParser/*@bgen(jjtree)*/implements ELParserTreeConstants, ELParserConstants {/*@bgen(jjtree)*/
protected JJTELParserState jjtree = new JJTELParserState();public static Node parse(String ref) throws ELException
{
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java?rev=1175042&r1=1175041&r2=1175042&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/parser/ELParserTokenManager.java Fri Sep 23 21:41:03 2011
@@ -2,6 +2,7 @@
package org.apache.el.parser;
/** Token Manager. */
+@SuppressWarnings("all") // Ignore warnings in generated code
public class ELParserTokenManager implements ELParserConstants
{
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/parser/JJTELParserState.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/JJTELParserState.java?rev=1175042&r1=1175041&r2=1175042&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/el/parser/JJTELParserState.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/parser/JJTELParserState.java Fri Sep 23 21:41:03 2011
@@ -1,6 +1,7 @@
/* Generated By:JavaCC: Do not edit this line. JJTELParserState.java Version 5.0 */
package org.apache.el.parser;
+@SuppressWarnings("all") // Ignore warnings in generated code
public class JJTELParserState {
private java.util.List<Node> nodes;
private java.util.List<Integer> marks;
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/parser/SimpleCharStream.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/SimpleCharStream.java?rev=1175042&r1=1175041&r2=1175042&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/el/parser/SimpleCharStream.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/parser/SimpleCharStream.java Fri Sep 23 21:41:03 2011
@@ -6,7 +6,7 @@ package org.apache.el.parser;
* An implementation of interface CharStream, where the stream is assumed to
* contain only ASCII characters (without unicode processing).
*/
-
+@SuppressWarnings("all") // Ignore warnings in generated code
public class SimpleCharStream
{
/** Whether parser is static. */
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/parser/Token.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/Token.java?rev=1175042&r1=1175041&r2=1175042&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/el/parser/Token.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/parser/Token.java Fri Sep 23 21:41:03 2011
@@ -5,7 +5,7 @@ package org.apache.el.parser;
/**
* Describes the input token stream.
*/
-
+@SuppressWarnings("all") // Ignore warnings in generated code
public class Token implements java.io.Serializable {
/**
Modified: tomcat/tc7.0.x/trunk/java/org/apache/el/parser/TokenMgrError.java
URL: http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/java/org/apache/el/parser/TokenMgrError.java?rev=1175042&r1=1175041&r2=1175042&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/java/org/apache/el/parser/TokenMgrError.java (original)
+++ tomcat/tc7.0.x/trunk/java/org/apache/el/parser/TokenMgrError.java Fri Sep 23 21:41:03 2011
@@ -3,6 +3,7 @@
package org.apache.el.parser;
/** Token Manager Error. */
+@SuppressWarnings("all") // Ignore warnings in generated code
public class TokenMgrError extends Error
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org