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 21:48:09 UTC
svn commit: r729106 - in
/commons/proper/digester/trunk/src/java/org/apache/commons/digester:
CallMethodRule.java FactoryCreateRule.java ObjectCreateRule.java
SetNextRule.java SetRootRule.java SetTopRule.java
Author: rahul
Date: Tue Dec 23 12:48:09 2008
New Revision: 729106
URL: http://svn.apache.org/viewvc?rev=729106&view=rev
Log:
Soothe the compiler a bit.
Modified:
commons/proper/digester/trunk/src/java/org/apache/commons/digester/CallMethodRule.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/FactoryCreateRule.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/ObjectCreateRule.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetNextRule.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetRootRule.java
commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetTopRule.java
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/CallMethodRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/CallMethodRule.java?rev=729106&r1=729105&r2=729106&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/CallMethodRule.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/CallMethodRule.java Tue Dec 23 12:48:09 2008
@@ -157,7 +157,7 @@
* Use {@link #CallMethodRule(String methodName,int paramCount, Class [] paramTypes)} instead.
*/
public CallMethodRule(Digester digester, String methodName,
- int paramCount, Class paramTypes[]) {
+ int paramCount, Class<?> paramTypes[]) {
this(methodName, paramCount, paramTypes);
}
@@ -321,7 +321,7 @@
public CallMethodRule(
String methodName,
int paramCount,
- Class paramTypes[]) {
+ Class<?> paramTypes[]) {
this(0, methodName, paramCount, paramTypes);
}
@@ -348,7 +348,7 @@
public CallMethodRule( int targetOffset,
String methodName,
int paramCount,
- Class paramTypes[]) {
+ Class<?> paramTypes[]) {
this.targetOffset = targetOffset;
this.methodName = methodName;
@@ -401,7 +401,7 @@
/**
* The parameter types of the parameters to be collected.
*/
- protected Class paramTypes[] = null;
+ protected Class<?> paramTypes[] = null;
/**
* The names of the classes of the parameters to be collected.
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/FactoryCreateRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/FactoryCreateRule.java?rev=729106&r1=729105&r2=729106&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/FactoryCreateRule.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/FactoryCreateRule.java Tue Dec 23 12:48:09 2008
@@ -76,7 +76,7 @@
* @deprecated The digester instance is now set in the {@link Digester#addRule} method.
* Use {@link #FactoryCreateRule(Class clazz)} instead.
*/
- public FactoryCreateRule(Digester digester, Class clazz) {
+ public FactoryCreateRule(Digester digester, Class<?> clazz) {
this(clazz);
@@ -120,7 +120,7 @@
* Use {@link #FactoryCreateRule(Class clazz, String attributeName)} instead.
*/
public FactoryCreateRule(Digester digester,
- Class clazz, String attributeName) {
+ Class<?> clazz, String attributeName) {
this(clazz, attributeName);
@@ -169,7 +169,7 @@
*
* @param clazz Java class name of the object creation factory class
*/
- public FactoryCreateRule(Class clazz) {
+ public FactoryCreateRule(Class<?> clazz) {
this(clazz, false);
@@ -207,7 +207,7 @@
* @param attributeName Attribute name which, if present, contains an
* override of the class name of the object creation factory to create.
*/
- public FactoryCreateRule(Class clazz, String attributeName) {
+ public FactoryCreateRule(Class<?> clazz, String attributeName) {
this(clazz, attributeName, false);
@@ -255,7 +255,7 @@
* object creation factory
* will be ignored.
*/
- public FactoryCreateRule(Class clazz, boolean ignoreCreateExceptions) {
+ public FactoryCreateRule(Class<?> clazz, boolean ignoreCreateExceptions) {
this(clazz, null, ignoreCreateExceptions);
@@ -299,7 +299,7 @@
* creation factory will be ignored.
*/
public FactoryCreateRule(
- Class clazz,
+ Class<?> clazz,
String attributeName,
boolean ignoreCreateExceptions) {
@@ -489,7 +489,7 @@
digester.log.debug("[FactoryCreateRule]{" + digester.match +
"} New factory " + realClassName);
}
- Class clazz = digester.getClassLoader().loadClass(realClassName);
+ Class<?> clazz = digester.getClassLoader().loadClass(realClassName);
creationFactory = (ObjectCreationFactory)
clazz.newInstance();
creationFactory.setDigester(digester);
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/ObjectCreateRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/ObjectCreateRule.java?rev=729106&r1=729105&r2=729106&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/ObjectCreateRule.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/ObjectCreateRule.java Tue Dec 23 12:48:09 2008
@@ -60,7 +60,7 @@
* @deprecated The digester instance is now set in the {@link Digester#addRule} method.
* Use {@link #ObjectCreateRule(Class clazz)} instead.
*/
- public ObjectCreateRule(Digester digester, Class clazz) {
+ public ObjectCreateRule(Digester digester, Class<?> clazz) {
this(clazz);
@@ -101,7 +101,7 @@
*/
public ObjectCreateRule(Digester digester,
String attributeName,
- Class clazz) {
+ Class<?> clazz) {
this(attributeName, clazz);
@@ -124,7 +124,7 @@
*
* @param clazz Java class name of the object to be created
*/
- public ObjectCreateRule(Class clazz) {
+ public ObjectCreateRule(Class<?> clazz) {
this(clazz.getName(), (String) null);
@@ -157,7 +157,7 @@
* override of the class name to create
*/
public ObjectCreateRule(String attributeName,
- Class clazz) {
+ Class<?> clazz) {
this(clazz.getName(), attributeName);
@@ -202,7 +202,7 @@
}
// Instantiate the new object and push it on the context stack
- Class clazz = digester.getClassLoader().loadClass(realClassName);
+ Class<?> clazz = digester.getClassLoader().loadClass(realClassName);
Object instance = clazz.newInstance();
digester.push(instance);
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetNextRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetNextRule.java?rev=729106&r1=729105&r2=729106&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetNextRule.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetNextRule.java Tue Dec 23 12:48:09 2008
@@ -199,7 +199,7 @@
}
// Call the specified method
- Class paramTypes[] = new Class[1];
+ Class<?> paramTypes[] = new Class<?>[1];
if (paramType != null) {
paramTypes[0] =
digester.getClassLoader().loadClass(paramType);
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetRootRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetRootRule.java?rev=729106&r1=729105&r2=729106&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetRootRule.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetRootRule.java Tue Dec 23 12:48:09 2008
@@ -192,7 +192,7 @@
}
// Call the specified method
- Class paramTypes[] = new Class[1];
+ Class<?> paramTypes[] = new Class<?>[1];
if (paramType != null) {
paramTypes[0] =
digester.getClassLoader().loadClass(paramType);
Modified: commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetTopRule.java
URL: http://svn.apache.org/viewvc/commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetTopRule.java?rev=729106&r1=729105&r2=729106&view=diff
==============================================================================
--- commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetTopRule.java (original)
+++ commons/proper/digester/trunk/src/java/org/apache/commons/digester/SetTopRule.java Tue Dec 23 12:48:09 2008
@@ -191,7 +191,7 @@
}
// Call the specified method
- Class paramTypes[] = new Class[1];
+ Class<?> paramTypes[] = new Class<?>[1];
if (paramType != null) {
paramTypes[0] =
digester.getClassLoader().loadClass(paramType);