You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2009/08/21 02:33:49 UTC
svn commit: r806404 - in
/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection:
IntrospectorBase.java MethodKey.java MethodMap.java
Author: sebb
Date: Fri Aug 21 00:33:49 2009
New Revision: 806404
URL: http://svn.apache.org/viewvc?rev=806404&view=rev
Log:
JEXL-88 MethodKey.java - name clash getMostSpecific() with Java 1.5.0
Modified:
commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/IntrospectorBase.java
commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/MethodKey.java
commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/MethodMap.java
Modified: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/IntrospectorBase.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/IntrospectorBase.java?rev=806404&r1=806403&r2=806404&view=diff
==============================================================================
--- commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/IntrospectorBase.java (original)
+++ commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/IntrospectorBase.java Fri Aug 21 00:33:49 2009
@@ -174,7 +174,7 @@
l.add(ictor);
}
// try to find one
- ctor = key.getMostSpecific(l);
+ ctor = key.getMostSpecificConstructor(l);
if (ctor != null) {
constructorsMap.put(key, ctor);
} else {
Modified: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/MethodKey.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/MethodKey.java?rev=806404&r1=806403&r2=806404&view=diff
==============================================================================
--- commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/MethodKey.java (original)
+++ commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/MethodKey.java Fri Aug 21 00:33:49 2009
@@ -186,7 +186,7 @@
* @return the most specific method.
* @throws MethodKey.AmbiguousException if there is more than one.
*/
- public Method getMostSpecific(List<Method> methods) {
+ public Method getMostSpecificMethod(List<Method> methods) {
return METHODS.getMostSpecific(methods, params);
}
@@ -196,7 +196,7 @@
* @return the most specific constructor.
* @throws MethodKey.AmbiguousException if there is more than one.
*/
- public Constructor<?> getMostSpecific(List<Constructor<?>> methods) {
+ public Constructor<?> getMostSpecificConstructor(List<Constructor<?>> methods) {
return CONSTRUCTORS.getMostSpecific(methods, params);
}
Modified: commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/MethodMap.java
URL: http://svn.apache.org/viewvc/commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/MethodMap.java?rev=806404&r1=806403&r2=806404&view=diff
==============================================================================
--- commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/MethodMap.java (original)
+++ commons/proper/jexl/branches/2.0/src/main/java/org/apache/commons/jexl/util/introspection/MethodMap.java Fri Aug 21 00:33:49 2009
@@ -122,7 +122,7 @@
if (methodList == null) {
return null;
}
- return methodKey.getMostSpecific(methodList);
+ return methodKey.getMostSpecificMethod(methodList);
} // CSON: RedundantThrows
}
\ No newline at end of file