geirm 01/11/26 08:01:14
Modified: src/java/org/apache/velocity/util/introspection
ClassMap.java Introspector.java
Log:
Changes to support having MethodMap be able to log ambiguities. Will be
backed out but wanted to get it checked in.
Revision Changes Path
1.16 +11 -4
jakarta-velocity/src/java/org/apache/velocity/util/introspection/ClassMap.java
Index: ClassMap.java
===================================================================
RCS file:
/home/cvs/jakarta-velocity/src/java/org/apache/velocity/util/introspection/ClassMap.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- ClassMap.java 2001/11/02 05:09:37 1.15
+++ ClassMap.java 2001/11/26 16:01:14 1.16
@@ -61,6 +61,8 @@
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
+import org.apache.velocity.runtime.RuntimeServices;
+
/**
* A cache of introspection information for a specific class instance.
* Keys {@link java.lang.Method} objects by a concatenation of the
@@ -70,7 +72,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Bob McWhirter</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Attila Szegedi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Geir Magnusson Jr.</a>
- * @version $Id: ClassMap.java,v 1.15 2001/11/02 05:09:37 dlr Exp $
+ * @version $Id: ClassMap.java,v 1.16 2001/11/26 16:01:14 geirm Exp $
*/
public class ClassMap
{
@@ -91,17 +93,22 @@
*/
private Map methodCache = new Hashtable();
- private MethodMap methodMap = new MethodMap();
+ private MethodMap methodMap = null;
/**
* Standard constructor
*/
- public ClassMap(Class clazz)
+ public ClassMap( RuntimeServices rsvc, Class clazz)
{
this.clazz = clazz;
+ methodMap = new MethodMap( rsvc, clazz );
populateMethodCache();
}
-
+
+ private ClassMap()
+ {
+ }
+
/**
* @return the class object whose methods are cached by this map.
*/
1.18 +2 -2
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- Introspector.java 2001/10/22 03:53:27 1.17
+++ Introspector.java 2001/11/26 16:01:14 1.18
@@ -89,7 +89,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Bob McWhirter</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Attila Szegedi</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Paulo Gaspar</a>
- * @version $Id: Introspector.java,v 1.17 2001/10/22 03:53:27 jon Exp $
+ * @version $Id: Introspector.java,v 1.18 2001/11/26 16:01:14 geirm Exp $
*/
public class Introspector
{
@@ -177,7 +177,7 @@
*/
private ClassMap createClassMap(Class c)
{
- ClassMap classMap = new ClassMap(c);
+ ClassMap classMap = new ClassMap( rsvc, c );
classMethodMaps.put(c, classMap);
cachedClassNames.add( c.getName() );
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
