You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@velocity.apache.org by jv...@locus.apache.org on 2000/11/01 18:51:13 UTC
cvs commit: jakarta-velocity/src/java/org/apache/velocity/util/introspection MethodMap.java Introspector.java
jvanzyl 00/11/01 09:51:12
Modified: src/java/org/apache/velocity/util/introspection
Introspector.java
Added: src/java/org/apache/velocity/util/introspection
MethodMap.java
Log:
- cleaning up the introspector.
Revision Changes Path
1.3 +3 -3 jakarta-velocity/src/java/org/apache/velocity/util/introspection/Introspector.java
Index: Introspector.java
===================================================================
RCS file: /home/cvs/jakarta-velocity/src/java/org/apache/velocity/util/introspection/Introspector.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Introspector.java 2000/10/31 23:44:59 1.2
+++ Introspector.java 2000/11/01 17:51:11 1.3
@@ -82,7 +82,7 @@
* This mapping is performed for all the methods in a class
* and stored for
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: Introspector.java,v 1.2 2000/10/31 23:44:59 jvanzyl Exp $
+ * @version $Id: Introspector.java,v 1.3 2000/11/01 17:51:11 jvanzyl Exp $
*/
// isAssignable checks for arguments that are subclasses
@@ -100,14 +100,14 @@
// then create a method map for this class and
// store it in Hashtable of class method maps.
if (!classMethodMaps.containsKey(c.getName()))
- classMethodMaps.put(c.getName(), new ClassMethodMap(c));
+ classMethodMaps.put(c.getName(), new ClassMap(c));
return findMethod(c, name, params);
}
private static Method findMethod(Class c, String name, Object[] params)
{
- ClassMethodMap classMethodMap = (ClassMethodMap) classMethodMaps.get(c.getName());
+ ClassMap classMethodMap = (ClassMap) classMethodMaps.get(c.getName());
return classMethodMap.findMethod(name, params);
}
1.1 jakarta-velocity/src/java/org/apache/velocity/util/introspection/MethodMap.java
Index: MethodMap.java
===================================================================
package org.apache.velocity.util.introspection;
/*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2000 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution, if
* any, must include the following acknowlegement:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowlegement may appear in the software itself,
* if and wherever such third-party acknowlegements normally appear.
*
* 4. The names "The Jakarta Project", "Velocity", and "Apache Software
* Foundation" must not be used to endorse or promote products derived
* from this software without prior written permission. For written
* permission, please contact apache@apache.org.
*
* 5. Products derived from this software may not be called "Apache"
* nor may "Apache" appear in their names without prior written
* permission of the Apache Group.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.Hashtable;
import java.lang.reflect.Method;
public class MethodMap
{
Map methodByNameMap = new Hashtable();
/**
* Add a method to a list of methods by name.
* For a particular class we are keeping track
* of all the methods with the same name.
*/
public void add(Method method)
{
String methodName = method.getName();
if (!methodByNameMap.containsKey(methodName))
methodByNameMap.put(methodName, new ArrayList());
((List) methodByNameMap.get(methodName)).add(method);
}
public Method find(String methodName, Object[] params)
{
List methodList = (List) methodByNameMap.get(methodName);
if (methodList == null)
return null;
for (int i = 0; i < methodList.size(); i++)
{
Method method = (Method) methodList.get(i);
Class[] parameterTypes = method.getParameterTypes();
// The methods we are trying to compare must
// the same number of arguments.
if (parameterTypes.length != params.length)
continue;
// Make sure the given parameter is a valid
// subclass of the method parameter in question.
for (int j = 0; j < parameterTypes.length; j++)
if (!parameterTypes[j].isAssignableFrom(params[j].getClass()))
break;
return method;
}
return null;
}
}