Re: svn commit: r791139 - in /tomcat/trunk/java/org/apache/jasper/el: ELContextWrapper.java ExpressionEvaluatorImpl.java

2009-07-05 Thread Konstantin Kolinko 
2009/7/5 Mark Thomas :
> Konstantin Kolinko wrote:
>
>> Fixed it myself, in rev.791186. Don't worry.
>
> Thanks, but I am going to have to revert. Those are spec classes. I
> should not have made my original change.
>

Oh, I see that now.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r791139 - in /tomcat/trunk/java/org/apache/jasper/el: ELContextWrapper.java ExpressionEvaluatorImpl.java

2009-07-05 Thread Mark Thomas 
Konstantin Kolinko wrote:

> Fixed it myself, in rev.791186. Don't worry.

Thanks, but I am going to have to revert. Those are spec classes. I
should not have made my original change.

Mark



-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r791139 - in /tomcat/trunk/java/org/apache/jasper/el: ELContextWrapper.java ExpressionEvaluatorImpl.java

2009-07-04 Thread Konstantin Kolinko 
2009/7/4 Konstantin Kolinko :
> 2009/7/4  :
>> Author: markt
>> Date: Sat Jul  4 15:46:47 2009
>> New Revision: 791139
>>
>> URL: http://svn.apache.org/viewvc?rev=791139&view=rev
>> Log:
>> Fix generics warnings
>>
>> Modified:
>>    tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
>>    tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
>>
>
> Eclipse IDE has two complaints after this change (and flags them as
> compilation errors), that
>
> * Name clash: The method getContext(Class) of type ELContextWrapper
> has the same erasure as getContext(Class) of type ELContext but does
> not override it
> * Name clash: The method putContext(Class, Object) of type
> ELContextWrapper has the same erasure as putContext(Class, Object) of
> type ELContext but does not override it
>
> It can be solved by updating declarations of those methods in class ELContext,
> s/ Class / Class /
>
> Maybe you have already done so, but have not committed yet?
>

Fixed it myself, in rev.791186. Don't worry.

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Re: svn commit: r791139 - in /tomcat/trunk/java/org/apache/jasper/el: ELContextWrapper.java ExpressionEvaluatorImpl.java

2009-07-04 Thread Konstantin Kolinko 
2009/7/4  :
> Author: markt
> Date: Sat Jul  4 15:46:47 2009
> New Revision: 791139
>
> URL: http://svn.apache.org/viewvc?rev=791139&view=rev
> Log:
> Fix generics warnings
>
> Modified:
>    tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
>    tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
>

Eclipse IDE has two complaints after this change (and flags them as
compilation errors), that

* Name clash: The method getContext(Class) of type ELContextWrapper
has the same erasure as getContext(Class) of type ELContext but does
not override it
* Name clash: The method putContext(Class, Object) of type
ELContextWrapper has the same erasure as putContext(Class, Object) of
type ELContext but does not override it

It can be solved by updating declarations of those methods in class ELContext,
s/ Class / Class /

Maybe you have already done so, but have not committed yet?

Best regards,
Konstantin Kolinko

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

svn commit: r791139 - in /tomcat/trunk/java/org/apache/jasper/el: ELContextWrapper.java ExpressionEvaluatorImpl.java

2009-07-04 Thread markt 
Author: markt
Date: Sat Jul  4 15:46:47 2009
New Revision: 791139

URL: http://svn.apache.org/viewvc?rev=791139&view=rev
Log:
Fix generics warnings

Modified:
tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java

Modified: tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java?rev=791139&r1=791138&r2=791139&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java (original)
+++ tomcat/trunk/java/org/apache/jasper/el/ELContextWrapper.java Sat Jul  4 
15:46:47 2009
@@ -51,7 +51,7 @@
 return this.target.getVariableMapper();
 }
 
-public Object getContext(Class key) {
+public Object getContext(Class key) {
 return this.target.getContext(key);
 }
 
@@ -63,7 +63,7 @@
 return this.target.isPropertyResolved();
 }
 
-public void putContext(Class key, Object contextObject) throws 
NullPointerException {
+public void putContext(Class key, Object contextObject) throws 
NullPointerException {
 this.target.putContext(key, contextObject);
 }
 

Modified: tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java?rev=791139&r1=791138&r2=791139&view=diff
==
--- tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java 
(original)
+++ tomcat/trunk/java/org/apache/jasper/el/ExpressionEvaluatorImpl.java Sat Jul 
 4 15:46:47 2009
@@ -34,7 +34,7 @@
this.factory = factory;
}
 
-   public Expression parseExpression(String expression, Class expectedType,
+   public Expression parseExpression(String expression, Class 
expectedType,
FunctionMapper fMapper) throws ELException {
try {
ELContextImpl ctx =
@@ -49,7 +49,7 @@
}
}
 
-   public Object evaluate(String expression, Class expectedType,
+   public Object evaluate(String expression, 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