Author: nbubna
Date: Wed Mar 8 15:19:30 2006
New Revision: 384374
URL: http://svn.apache.org/viewcvs?rev=384374&view=rev
Log:
use ClassUtils methods where appropriate
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/FieldMethodizer.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/texen/Generator.java
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/FieldMethodizer.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/FieldMethodizer.java?rev=384374&r1=384373&r2=384374&view=diff
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/FieldMethodizer.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/app/FieldMethodizer.java
Wed Mar 8 15:19:30 2006
@@ -1,7 +1,7 @@
package org.apache.velocity.app;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.HashMap;
+import org.apache.velocity.util.ClassUtils;
/**
* <p>
@@ -120,7 +121,7 @@
public void addObject ( String s )
throws Exception
{
- inspect(Class.forName(s));
+ inspect(ClassUtils.getClass(s));
}
/**
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java?rev=384374&r1=384373&r2=384374&view=diff
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/runtime/RuntimeInstance.java
Wed Mar 8 15:19:30 2006
@@ -640,7 +640,7 @@
{
Object o = null;
try {
- o = Class.forName(classname).newInstance();
+ o = ClassUtils.getNewInstance(classname);
}
catch (ClassNotFoundException cnfe )
{
Modified:
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/texen/Generator.java
URL:
http://svn.apache.org/viewcvs/jakarta/velocity/engine/trunk/src/java/org/apache/velocity/texen/Generator.java?rev=384374&r1=384373&r2=384374&view=diff
==============================================================================
---
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/texen/Generator.java
(original)
+++
jakarta/velocity/engine/trunk/src/java/org/apache/velocity/texen/Generator.java
Wed Mar 8 15:19:30 2006
@@ -1,7 +1,7 @@
package org.apache.velocity.texen;
/*
- * Copyright 2001-2004 The Apache Software Foundation.
+ * Copyright 2001-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License")
* you may not use this file except in compliance with the License.
@@ -37,6 +37,7 @@
import org.apache.velocity.context.Context;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.util.ClassUtils;
/**
* A text/code generator class
@@ -498,8 +499,7 @@
try
{
- Class cls = Class.forName (contextObj);
- Object o = cls.newInstance();
+ Object o = ClassUtils.getNewInstance(contextObj);
context.put (contextName,o);
}
catch (Exception e)
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
