[jboss-cvs] JBossAS SVN: r70820 - projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference.

[jboss-cvs-commits at lists.jboss.org]

Author: kabir.khan at jboss.com
Date: 2008-03-13 09:54:12 -0400 (Thu, 13 Mar 2008)
New Revision: 70820

Modified:
   projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference/ArgumentPersistentReference.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference/ConstructorPersistentReference.java
   projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference/PersistentReference.java
Log:
Tidyup, add generics and get rid of warnings

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference/ArgumentPersistentReference.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference/ArgumentPersistentReference.java	2008-03-13 13:45:00 UTC (rev 70819)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference/ArgumentPersistentReference.java	2008-03-13 13:54:12 UTC (rev 70820)
@@ -33,22 +33,22 @@
  */
 public abstract class ArgumentPersistentReference extends PersistentReference 
 {
-	public ArgumentPersistentReference(Class clazz, Object referencedObject, int referenceType) {
+	public ArgumentPersistentReference(Class<?> clazz, Object referencedObject, int referenceType) {
 		super(clazz, referencedObject, referenceType);
 	}
 
-	WeakReference[] arguments;
+	WeakReference<Class<?>>[] arguments;
 	
-	public void setArguments(Class[] parguments)
+	public void setArguments(Class<?>[] parguments)
 	{
 		this.arguments = new WeakReference[parguments.length];
 		for (int i=0;i<arguments.length;i++)
 		{
-			this.arguments[i] = new WeakReference(parguments[i]);
+			this.arguments[i] = new WeakReference<Class<?>>(parguments[i]);
 		}
 	}
 	
-	public Class[] getArguments()
+	public Class<?>[] getArguments()
 	{
 		if (arguments==null)
 		{
@@ -56,10 +56,10 @@
 		}
 		else
 		{
-			Class argumentsReturn[] = new Class[arguments.length];
+			Class<?> argumentsReturn[] = new Class[arguments.length];
 			for (int i=0;i<arguments.length;i++)
 			{
-				argumentsReturn[i] = (Class)arguments[i].get();
+				argumentsReturn[i] = arguments[i].get();
 			}
 			return argumentsReturn;
 		}

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference/ConstructorPersistentReference.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference/ConstructorPersistentReference.java	2008-03-13 13:45:00 UTC (rev 70819)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference/ConstructorPersistentReference.java	2008-03-13 13:54:12 UTC (rev 70820)
@@ -30,7 +30,7 @@
  */
 public class ConstructorPersistentReference extends ArgumentPersistentReference
 {
-   public ConstructorPersistentReference (Constructor constructor, int referenceType)
+   public ConstructorPersistentReference (Constructor<?> constructor, int referenceType)
    {
       super(constructor !=null ? constructor.getDeclaringClass() : null, constructor, referenceType);
       if (constructor != null)
@@ -46,13 +46,13 @@
       Object returnValue = null;
       if ((returnValue = internalGet())!=null) return returnValue;
       
-      Constructor constructor = getMappedClass().getDeclaredConstructor(getArguments());
+      Constructor<?> constructor = getMappedClass().getDeclaredConstructor(getArguments());
       buildReference(constructor);
       return constructor;
    }
 
-   public Constructor getConstructor()
+   public Constructor<?> getConstructor()
    {
-      return (Constructor) get();
+      return (Constructor<?>) get();
    }
 }

Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference/PersistentReference.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference/PersistentReference.java	2008-03-13 13:45:00 UTC (rev 70819)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/util/reference/PersistentReference.java	2008-03-13 13:54:12 UTC (rev 70820)
@@ -40,8 +40,8 @@
 	public static final int REFERENCE_WEAK=1;
 	public static final int REFERENCE_SOFT=2;
 
-   private WeakReference classReference;
-  	private Reference referencedObject;
+   private WeakReference<Class<?>> classReference;
+  	private Reference<Object> referencedObject;
 	private int referenceType=0;
 
    	/**
@@ -50,12 +50,12 @@
    	 * @param referencedObject  The reflection object being used
    	 * @param referenceType if REFERENCE_WEAK will use a WeakReference, and if REFERENCE_SOFT will use a SoftReference for referencedObject
    	 */
-   	public PersistentReference(Class clazz, Object referencedObject, int referenceType)
+   	public PersistentReference(Class<?> clazz, Object referencedObject, int referenceType)
 	{
    		this.referenceType=referenceType;
 		if (clazz!=null)
 		{
-			classReference = new WeakReference(clazz);
+			classReference = new WeakReference<Class<?>>(clazz);
 		}
 		buildReference(referencedObject);
 	}
@@ -104,24 +104,24 @@
 		{
 			if (referenceType==REFERENCE_WEAK)
 			{
-				referencedObject = new WeakReference(obj);
+				referencedObject = new WeakReference<Object>(obj);
 			}
 			else
 			{
-				referencedObject = new SoftReference(obj);
+				referencedObject = new SoftReference<Object>(obj);
 			}
 		}
 	}
 	
-	public Class getMappedClass()
+	public Class<?> getMappedClass()
 	{
 		if (classReference==null) return null;
-		Class returnClass = (Class)classReference.get();
+		Class<?> returnClass = classReference.get();
 		if (returnClass==null)
 		{
 			throw new RuntimeException("Class was already unloaded");
 		}
-		return (Class)returnClass;
+		return returnClass;
 	}
 	
 }