You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by ra...@apache.org on 2008/12/23 22:21:07 UTC
svn commit: r729125 -
/commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/
Author: rahul
Date: Tue Dec 23 13:21:07 2008
New Revision: 729125
URL: http://svn.apache.org/viewvc?rev=729125&view=rev
Log:
More compiler soothing.
Modified:
commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromClass.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltClass.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltMethod.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltResource.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromFile.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromMethod.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromResource.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderSetProperties.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/LoaderFromClass.java
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromClass.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromClass.java?rev=729125&r1=729124&r2=729125&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromClass.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromClass.java Tue Dec 23 13:21:07 2008
@@ -90,7 +90,7 @@
* that class provided it has the correct prototype) as the source of
* dynamic rules for the plugged-in class.
*/
- public RuleLoader findLoader(Digester digester, Class pluginClass,
+ public RuleLoader findLoader(Digester digester, Class<?> pluginClass,
Properties p) throws PluginException {
String ruleClassName = p.getProperty(ruleClassAttr);
@@ -112,7 +112,7 @@
methodName = DFLT_METHOD_NAME;
}
- Class ruleClass;
+ Class<?> ruleClass;
try {
// load the plugin class object
ruleClass =
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltClass.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltClass.java?rev=729125&r1=729124&r2=729125&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltClass.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltClass.java Tue Dec 23 13:21:07 2008
@@ -69,12 +69,12 @@
* target method is expected to have the following prototype:
* <code> public static void xxxxx(Digester d, String patternPrefix); </code>
*/
- public RuleLoader findLoader(Digester digester, Class pluginClass, Properties p)
+ public RuleLoader findLoader(Digester digester, Class<?> pluginClass, Properties p)
throws PluginException {
String rulesClassName = pluginClass.getName() + rulesClassSuffix;
- Class rulesClass = null;
+ Class<?> rulesClass = null;
try {
rulesClass = digester.getClassLoader().loadClass(rulesClassName);
} catch(ClassNotFoundException cnfe) {
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltMethod.java?rev=729125&r1=729124&r2=729125&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltMethod.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltMethod.java Tue Dec 23 13:21:07 2008
@@ -66,7 +66,7 @@
* target method is expected to have the following prototype:
* <code> public static void xxxxx(Digester d, String patternPrefix); </code>
*/
- public RuleLoader findLoader(Digester d, Class pluginClass, Properties p)
+ public RuleLoader findLoader(Digester d, Class<?> pluginClass, Properties p)
throws PluginException {
Method rulesMethod = LoaderFromClass.locateMethod(pluginClass, methodName);
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltResource.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltResource.java?rev=729125&r1=729124&r2=729125&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltResource.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromDfltResource.java Tue Dec 23 13:21:07 2008
@@ -68,7 +68,7 @@
* The returned object (when non-null) will add the selected rules to
* the digester whenever its addRules method is invoked.
*/
- public RuleLoader findLoader(Digester d, Class pluginClass, Properties p)
+ public RuleLoader findLoader(Digester d, Class<?> pluginClass, Properties p)
throws PluginException {
String resourceName =
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromFile.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromFile.java?rev=729125&r1=729124&r2=729125&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromFile.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromFile.java Tue Dec 23 13:21:07 2008
@@ -67,7 +67,7 @@
* The returned object (when non-null) will add the selected rules to
* the digester whenever its addRules method is invoked.
*/
- public RuleLoader findLoader(Digester d, Class pluginClass, Properties p)
+ public RuleLoader findLoader(Digester d, Class<?> pluginClass, Properties p)
throws PluginException {
String rulesFileName = p.getProperty(filenameAttr);
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromMethod.java?rev=729125&r1=729124&r2=729125&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromMethod.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromMethod.java Tue Dec 23 13:21:07 2008
@@ -63,7 +63,7 @@
* target method is expected to have the following prototype:
* <code> public static void xxxxx(Digester d, String patternPrefix); </code>
*/
- public RuleLoader findLoader(Digester d, Class pluginClass, Properties p)
+ public RuleLoader findLoader(Digester d, Class<?> pluginClass, Properties p)
throws PluginException {
String methodName = p.getProperty(methodAttr);
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromResource.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromResource.java?rev=729125&r1=729124&r2=729125&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromResource.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderFromResource.java Tue Dec 23 13:21:07 2008
@@ -64,7 +64,7 @@
* The returned object (when non-null) will add the selected rules to
* the digester whenever its addRules method is invoked.
*/
- public RuleLoader findLoader(Digester d, Class pluginClass, Properties p)
+ public RuleLoader findLoader(Digester d, Class<?> pluginClass, Properties p)
throws PluginException {
String resourceName = p.getProperty(resourceAttr);
@@ -97,7 +97,7 @@
* @param resourceName is a string describing the source of the xmlrules,
* for use in generating error messages.
*/
- public static RuleLoader loadRules(Digester d, Class pluginClass,
+ public static RuleLoader loadRules(Digester d, Class<?> pluginClass,
InputStream is, String resourceName)
throws PluginException {
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderSetProperties.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderSetProperties.java?rev=729125&r1=729124&r2=729125&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderSetProperties.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/FinderSetProperties.java Tue Dec 23 13:21:07 2008
@@ -84,7 +84,7 @@
* The returned object (when non-null) will add a SetPropertiesRule to
* the digester whenever its addRules method is invoked.
*/
- public RuleLoader findLoader(Digester d, Class pluginClass, Properties p) {
+ public RuleLoader findLoader(Digester d, Class<?> pluginClass, Properties p) {
String state = p.getProperty(propsAttr);
if ((state != null) && state.equals(falseval)) {
// user has explicitly disabled automatic setting of properties.
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/LoaderFromClass.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/LoaderFromClass.java?rev=729125&r1=729124&r2=729125&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/LoaderFromClass.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/plugins/strategies/LoaderFromClass.java Tue Dec 23 13:21:07 2008
@@ -35,17 +35,17 @@
public class LoaderFromClass extends RuleLoader {
- private Class rulesClass;
+ private Class<?> rulesClass;
private Method rulesMethod;
/** Constructor. */
- public LoaderFromClass(Class rulesClass, Method rulesMethod) {
+ public LoaderFromClass(Class<?> rulesClass, Method rulesMethod) {
this.rulesClass = rulesClass;
this.rulesMethod = rulesMethod;
}
/** Constructor. */
- public LoaderFromClass(Class rulesClass, String methodName)
+ public LoaderFromClass(Class<?> rulesClass, String methodName)
throws PluginException {
Method method = locateMethod(rulesClass, methodName);
@@ -90,10 +90,10 @@
*
* @return null if no such method exists.
*/
- public static Method locateMethod(Class rulesClass, String methodName)
+ public static Method locateMethod(Class<?> rulesClass, String methodName)
throws PluginException {
- Class[] paramSpec = { Digester.class, String.class };
+ Class<?>[] paramSpec = { Digester.class, String.class };
Method rulesMethod = MethodUtils.getAccessibleMethod(
rulesClass, methodName, paramSpec);