Author: markt Date: Tue Feb 23 12:52:51 2010 New Revision: 915316 URL: http://svn.apache.org/viewvc?rev=915316&view=rev Log: Supress deprecation and generics warnings
Modified: tomcat/tc6.0.x/trunk/ (props changed) tomcat/tc6.0.x/trunk/STATUS.txt tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/VariableResolver.java tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/TagSupport.java tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java Propchange: tomcat/tc6.0.x/trunk/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Feb 23 12:52:51 2010 @@ -1,2 +1,2 @@ /tomcat:883362 -/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,903916,905020,905151,905722,905728,905735,907825,908721,908759,909636,910442,910471 +/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77 0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901 39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,903916,905020,905151,905722,905728,905735,907825,908721,908759,909636,910442,910471 Modified: tomcat/tc6.0.x/trunk/STATUS.txt URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=915316&r1=915315&r2=915316&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/STATUS.txt (original) +++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Feb 23 12:52:51 2010 @@ -77,10 +77,6 @@ (http://ant.apache.org/manual/OptionalTasks/scp.html) * Fix various EL TCK failures - http://svn.apache.org/viewvc?view=rev&rev=899653 (signatures) - +1: markt, kkolinko, fhanik - -1: - http://svn.apache.org/viewvc?view=rev&rev=899769 (CCE expected) http://svn.apache.org/viewvc?view=rev&rev=899770 (CCE expected) +1: markt, kkolinko, fhanik Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java?rev=915316&r1=915315&r2=915316&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELException.java Tue Feb 23 12:52:51 2010 @@ -25,12 +25,8 @@ * @since 2.0 * @deprecated */ -public class ELException - extends Exception -{ - //------------------------------------- - // Member variables - //------------------------------------- +...@suppresswarnings("dep-ann") // TCK signature test fails with annotation +public class ELException extends Exception { private Throwable mRootCause; Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java?rev=915316&r1=915315&r2=915316&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ELParseException.java Tue Feb 23 12:52:51 2010 @@ -24,7 +24,7 @@ * @since 2.0 * @deprecated */ - +...@suppresswarnings("dep-ann") // TCK signature test fails with annotation public class ELParseException extends ELException { //------------------------------------- Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java?rev=915316&r1=915315&r2=915316&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/Expression.java Tue Feb 23 12:52:51 2010 @@ -32,6 +32,7 @@ * @since 2.0 * @deprecated */ +...@suppresswarnings("dep-ann") // TCK signature test fails with annotation public abstract class Expression { /** Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java?rev=915316&r1=915315&r2=915316&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ExpressionEvaluator.java Tue Feb 23 12:52:51 2010 @@ -53,6 +53,7 @@ * @since 2.0 * @deprecated */ +...@suppresswarnings("dep-ann") // TCK signature test fails with annotation public abstract class ExpressionEvaluator { /** @@ -76,9 +77,10 @@ * * @exception ELException Thrown if parsing errors were found. */ - public abstract Expression parseExpression( String expression, - Class expectedType, - FunctionMapper fMapper ) + public abstract Expression parseExpression( String expression, + @SuppressWarnings("unchecked") // TCK signature fails with generics + Class expectedType, + FunctionMapper fMapper) throws ELException; @@ -98,11 +100,12 @@ * @return The result of the expression evaluation. * * @exception ELException Thrown if the expression evaluation failed. - */ - public abstract Object evaluate( String expression, - Class expectedType, - VariableResolver vResolver, - FunctionMapper fMapper ) + */ + public abstract Object evaluate( String expression, + @SuppressWarnings("unchecked") // TCK signature fails with generics + Class expectedType, + VariableResolver vResolver, + FunctionMapper fMapper) throws ELException; } Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java?rev=915316&r1=915315&r2=915316&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/FunctionMapper.java Tue Feb 23 12:52:51 2010 @@ -26,6 +26,7 @@ * @since 2.0 * @deprecated */ +...@suppresswarnings("dep-ann") // TCK signature test fails with annotation public interface FunctionMapper { /** * Resolves the specified local name and prefix into a Java.lang.Method. Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java?rev=915316&r1=915315&r2=915316&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/ImplicitObjectELResolver.java Tue Feb 23 12:52:51 2010 @@ -119,6 +119,7 @@ return null; } + @SuppressWarnings("unchecked") // TCK signature test fails with generics public Class getType(ELContext context, Object base, Object property) throws NullPointerException, PropertyNotFoundException, ELException { if (context == null) { Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/VariableResolver.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/VariableResolver.java?rev=915316&r1=915315&r2=915316&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/VariableResolver.java (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/el/VariableResolver.java Tue Feb 23 12:52:51 2010 @@ -31,6 +31,7 @@ * @since 2.0 * @deprecated */ +...@suppresswarnings("dep-ann") // TCK signature test fails with annotation public interface VariableResolver { //------------------------------------- Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java?rev=915316&r1=915315&r2=915316&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/BodyTag.java Tue Feb 23 12:52:51 2010 @@ -122,7 +122,7 @@ * @deprecated As of Java JSP API 1.2, use BodyTag.EVAL_BODY_BUFFERED * or IterationTag.EVAL_BODY_AGAIN. */ - + @SuppressWarnings("dep-ann") // TCK signature test fails with annotation public final static int EVAL_BODY_TAG = 2; /** Modified: tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/TagSupport.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/TagSupport.java?rev=915316&r1=915315&r2=915316&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/TagSupport.java (original) +++ tomcat/tc6.0.x/trunk/java/javax/servlet/jsp/tagext/TagSupport.java Tue Feb 23 12:52:51 2010 @@ -72,9 +72,11 @@ * @return the nearest ancestor that implements the interface * or is an instance of the class specified */ - - public static final Tag findAncestorWithClass(Tag from, Class klass) { - boolean isInterface = false; + public static final Tag findAncestorWithClass(Tag from, + // TCK signature test fails with generics + @SuppressWarnings("unchecked") + Class klass) { + boolean isInterface = false; if (from == null || klass == null || Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java URL: http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java?rev=915316&r1=915315&r2=915316&view=diff ============================================================================== --- tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java (original) +++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java Tue Feb 23 12:52:51 2010 @@ -35,7 +35,9 @@ this.factory = factory; } - public Expression parseExpression(String expression, Class expectedType, + public Expression parseExpression(String expression, + @SuppressWarnings("unchecked") // API does not use generics + Class expectedType, FunctionMapper fMapper) throws ELException { try { ELContextImpl ctx = @@ -50,7 +52,9 @@ } } - public Object evaluate(String expression, Class expectedType, + public Object evaluate(String expression, + @SuppressWarnings("unchecked") // API does not use generics + Class expectedType, VariableResolver vResolver, FunctionMapper fMapper) throws ELException { return this.parseExpression(expression, expectedType, fMapper).evaluate(vResolver); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org