[jboss-cvs] JBossAS SVN: r71280 - in projects/aop/trunk/aspects/src: main/org/jboss/aspects and 12 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Mar 25 19:26:51 EDT 2008
Author: kabir.khan at jboss.com
Date: 2008-03-25 19:26:51 -0400 (Tue, 25 Mar 2008)
New Revision: 71280
Modified:
projects/aop/trunk/aspects/src/main/org/jboss/aop/junit/AOPTest.java
projects/aop/trunk/aspects/src/main/org/jboss/aop/junit/AOPTestDelegate.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/NullOrZero.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/AsynchronousFacadeFieldsThreadLocalImpl.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/Utils.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/jboss/AsynchronousAspect.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/jboss/AsynchronousInvokeTask.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/jboss/TraceThreadAspect.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/concurrent/MutexAspectFactory.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/DesignByContractAspect.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/Condition.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ConditionManager.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ConstructorCondition.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ConstructorConditionManager.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ExecutableCondition.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/InvariantCondition.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/MethodCondition.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/MethodConditionManager.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/jmx/JmxIntrospectingMixin.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/logging/InvocationLogClientInterceptor.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/logging/InvocationLogInterceptor.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/logging/ThreadLocalAppender.java
projects/aop/trunk/aspects/src/main/org/jboss/aspects/patterns/observable/SubjectImpl.java
projects/aop/trunk/aspects/src/test/test/dbc/java/Sorter.java
projects/aop/trunk/aspects/src/test/test/dbc/office/OfficeManager.java
projects/aop/trunk/aspects/src/test/test/dbc/stack/StackImpl.java
Log:
Remove warnings, add generics
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aop/junit/AOPTest.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aop/junit/AOPTest.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aop/junit/AOPTest.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -39,7 +39,7 @@
* @return the delegate
* @throws Exception for any error
*/
- public static AbstractTestDelegate getDelegate(Class clazz) throws Exception
+ public static AbstractTestDelegate getDelegate(Class<?> clazz) throws Exception
{
return new AOPTestDelegate(clazz);
}
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aop/junit/AOPTestDelegate.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aop/junit/AOPTestDelegate.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aop/junit/AOPTestDelegate.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -37,7 +37,7 @@
public class AOPTestDelegate extends AbstractTestDelegate
{
/** The deployed urls */
- private static final CopyOnWriteArrayList urls = new CopyOnWriteArrayList();
+ private static final CopyOnWriteArrayList<URL> urls = new CopyOnWriteArrayList<URL>();
/**
* Create a new AOPTestDelegate.
@@ -45,7 +45,7 @@
* @param clazz the test class
* @throws Exception for any error
*/
- public AOPTestDelegate(Class clazz) throws Exception
+ public AOPTestDelegate(Class<?> clazz) throws Exception
{
super(clazz);
}
@@ -100,9 +100,9 @@
protected void undeploy()
{
- for (Iterator i = urls.iterator(); i.hasNext();)
+ for (Iterator<URL> i = urls.iterator(); i.hasNext();)
{
- URL url = (URL) i.next();
+ URL url = i.next();
undeploy(url);
}
}
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/NullOrZero.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/NullOrZero.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/NullOrZero.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -39,7 +39,7 @@
private static final Boolean BOOLEAN_ZERO = Boolean.FALSE;
- public static Object nullOrZero(Class type)
+ public static Object nullOrZero(Class<?> type)
{
if (!type.isPrimitive()) return null;
if (type.equals(void.class)) return null;
@@ -50,6 +50,7 @@
if (type.equals(double.class)) return DOUBLE_ZERO;
if (type.equals(char.class)) return CHAR_ZERO;
if (type.equals(byte.class)) return BYTE_ZERO;
+ if (type.equals(boolean.class)) return BOOLEAN_ZERO;
return null;
}
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/AsynchronousFacadeFieldsThreadLocalImpl.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/AsynchronousFacadeFieldsThreadLocalImpl.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/AsynchronousFacadeFieldsThreadLocalImpl.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -34,7 +34,7 @@
implements AsynchronousFacadeFields
{
- private ThreadLocal threadLocal = new ThreadLocal();
+ private ThreadLocal<AsynchronousFacadeFields> threadLocal = new ThreadLocal<AsynchronousFacadeFields>();
public AsynchronousFacadeFieldsThreadLocalImpl()
{
@@ -57,7 +57,7 @@
init();
- return (AsynchronousFacadeFields) threadLocal.get();
+ return threadLocal.get();
}
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/Utils.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/Utils.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/Utils.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -30,7 +30,7 @@
public class Utils
{
- static public Object returnInitObject(Class returnType)
+ static public Object returnInitObject(Class<?> returnType)
{
if (!returnType.isPrimitive())
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/jboss/AsynchronousAspect.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/jboss/AsynchronousAspect.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/jboss/AsynchronousAspect.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -76,7 +76,7 @@
new InvokeTaskInputParameters((MethodInvocation) invocation.copy()),
asynchronousInvokeTask,
asynchronousResult.getTimeout())));
- Class returnType = invocation.getActualMethod().getReturnType();
+ Class<?> returnType = invocation.getActualMethod().getReturnType();
return Utils.returnInitObject(returnType);
}
}
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/jboss/AsynchronousInvokeTask.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/jboss/AsynchronousInvokeTask.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/jboss/AsynchronousInvokeTask.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -74,17 +74,17 @@
private boolean invoke(Object targetedObject,
- Class[] paramemeterTypes,
+ Class<?>[] paramemeterTypes,
Object[] parameterObjects,
- Class stringName)
+ Class<?> stringName)
{
try
{
- Class aClass = null;
+ Class<?> aClass = null;
if (targetedObject == null)
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/jboss/TraceThreadAspect.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/jboss/TraceThreadAspect.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/aspects/jboss/TraceThreadAspect.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -75,7 +75,7 @@
.append("(");
- Class[] parameterTypes =
+ Class<?>[] parameterTypes =
methodInvocation.getActualMethod().getParameterTypes();
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AdapterTask.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -37,9 +37,10 @@
* @version <tt>$Revision$</tt>
*/
+ at SuppressWarnings("unchecked")
final class AdapterTask
-implements Callable, AsynchronousConstants, ProcessingTime
+implements Callable, AsynchronousConstants, ProcessingTime
{
private AsynchronousParameters _inputParametersImpl = null;
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/AsynchronousTaskImpl.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -51,8 +51,10 @@
private AsynchronousUserTask _oneInstance = null;
//private FutureResult _futureResult = null;
+ @SuppressWarnings("unchecked")
private FutureTask _futureResult = null;
+ @SuppressWarnings("unchecked")
private Callable _callable = null;
private String _id = null;
@@ -75,7 +77,7 @@
try
{
- Class aClass = Class.forName(taskImpl);
+ Class<?> aClass = Class.forName(taskImpl);
_oneInstance = (AsynchronousUserTask) aClass.newInstance();
@@ -218,6 +220,7 @@
}
+ @SuppressWarnings("unchecked")
public Runnable add() throws Exception
{
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/asynchronous/concurrent/TimedCallableImpl.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -35,7 +35,7 @@
* @author <a href="mailto:chussenet at yahoo.com">{Claude Hussenet Independent Consultant}</a>.
* @version <tt>$Revision$</tt>
*/
-
+ at SuppressWarnings("unchecked")
public class TimedCallableImpl implements Callable, ProcessingTime
{
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/concurrent/MutexAspectFactory.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/concurrent/MutexAspectFactory.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/concurrent/MutexAspectFactory.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -52,7 +52,7 @@
public Object createPerJoinpoint(Advisor advisor, Joinpoint jp)
{
MethodJoinpoint mj = (MethodJoinpoint)jp;
- MutexLocked props = (MutexLocked)advisor.resolveTypedAnnotation(mj.getMethod(), MutexLocked.class);
+ MutexLocked props = advisor.resolveTypedAnnotation(mj.getMethod(), MutexLocked.class);
if (props.timeout() < 0)
{
return new MutexAspect.BlockingMutex();
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/DesignByContractAspect.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/DesignByContractAspect.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/DesignByContractAspect.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -55,7 +55,7 @@
InvariantCondition[] invariants;
Method method;
- Constructor constructor;
+ Constructor<?> constructor;
boolean isPublic;
boolean isStatic;
boolean isSynchronized;
@@ -64,7 +64,7 @@
//Keep track of if this checks have already been made for this joinpoint
//as the result of previous checks on the stack
- ThreadLocal done = new ThreadLocal();
+ ThreadLocal<Boolean> done = new ThreadLocal<Boolean>();
public DesignByContractAspect()
{
@@ -168,7 +168,7 @@
{
logStart();
Object ret = null;
- boolean wasDone = ((Boolean)done.get()).booleanValue();
+ boolean wasDone = done.get().booleanValue();
try
{
@@ -248,7 +248,7 @@
}
}
- private void initialise(Constructor c)
+ private void initialise(Constructor<?> c)
{
constructor = c;
int modifiers = c.getModifiers();
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/Condition.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/Condition.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/Condition.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -49,15 +49,15 @@
//Map of valid java identifiers to the original $tgt, $ret, $0, $1, $2 etc.
//used for the condition strings in the annotations
- protected HashMap parameterLookup = new HashMap();
+ protected HashMap<String, String> parameterLookup = new HashMap<String, String>();
protected String originalExpr;
protected String condExpr;
- protected Class clazz;
+ protected Class<?> clazz;
//If this condition is for a static method or is a static invariant condition
protected boolean isStatic;
- public Condition(String condExpr, Class clazz, boolean isStatic)
+ public Condition(String condExpr, Class<?> clazz, boolean isStatic)
{
this.isStatic = isStatic;
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ConditionManager.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ConditionManager.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ConditionManager.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -21,6 +21,7 @@
*/
package org.jboss.aspects.dbc.condition;
+import java.lang.reflect.AccessibleObject;
import java.util.ArrayList;
import java.util.HashMap;
@@ -36,26 +37,28 @@
*/
public class ConditionManager
{
- public static HashMap preConditions = new HashMap();
- public static HashMap postConditions = new HashMap();
- public static HashMap invariants = new HashMap();
+ protected static HashMap<AccessibleObject, ExecutableCondition[]> preConditions = new HashMap<AccessibleObject, ExecutableCondition[]>();
- public static synchronized InvariantCondition[] getInvariants(Class clazz)
+ protected static HashMap<AccessibleObject, ExecutableCondition[]> postConditions = new HashMap<AccessibleObject, ExecutableCondition[]>();
+
+ protected static HashMap<Class<?>, InvariantCondition[]> invariants = new HashMap<Class<?>, InvariantCondition[]>();
+
+ public static synchronized InvariantCondition[] getInvariants(Class<?> clazz)
{
- InvariantCondition[] inv = (InvariantCondition[])invariants.get(clazz);
+ InvariantCondition[] inv = invariants.get(clazz);
if (inv != null)
{
return inv;
}
initialise(clazz);
- return (InvariantCondition[])invariants.get(clazz);
+ return invariants.get(clazz);
}
- protected static void initialise(Class clazz)
+ protected static void initialise(Class<?> clazz)
{
- ArrayList invConds = new ArrayList();
+ ArrayList<InvariantCondition> invConds = new ArrayList<InvariantCondition>();
if (invariants.get(clazz) != null)
{
@@ -65,13 +68,13 @@
if (DesignByContractAspect.verbose)System.out.println("[dbc] ===== Initialising invariants for class: " + clazz);
//We need the @Invariant for this class and the super classes
- Class curClazz = clazz;
+ Class<?> curClazz = clazz;
while (curClazz != null)
{
addInvariantConditions(invConds, curClazz);
- Class[] interfaces = curClazz.getInterfaces();
+ Class<?>[] interfaces = curClazz.getInterfaces();
for (int i = 0; i < interfaces.length ; i++)
{
addInvariantConditions(invConds, interfaces[i]);
@@ -80,11 +83,11 @@
curClazz = curClazz.getSuperclass();
}
- InvariantCondition[] inv = (InvariantCondition[])invConds.toArray(new InvariantCondition[invConds.size()]);
+ InvariantCondition[] inv = invConds.toArray(new InvariantCondition[invConds.size()]);
invariants.put(clazz, inv);
}
- private static void addInvariantConditions(ArrayList conditions, Class clazz)
+ private static void addInvariantConditions(ArrayList<InvariantCondition> conditions, Class<?> clazz)
{
Invariant inv = (Invariant)AnnotationElement.getAnyAnnotation(clazz, Invariant.class);
if (inv != null)
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ConstructorCondition.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ConstructorCondition.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ConstructorCondition.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -32,9 +32,9 @@
*/
public class ConstructorCondition extends ExecutableCondition
{
- Constructor constructor;
+ Constructor<?> constructor;
- public ConstructorCondition(Constructor constructor, String condExpr)
+ public ConstructorCondition(Constructor<?> constructor, String condExpr)
{
super(condExpr, constructor.getClass(), false);
this.constructor = constructor;
@@ -59,7 +59,7 @@
return constructor;
}
- protected Class[] parameterTypes()
+ protected Class<?>[] parameterTypes()
{
return constructor.getParameterTypes();
}
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ConstructorConditionManager.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ConstructorConditionManager.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ConstructorConditionManager.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -37,49 +37,49 @@
*/
public class ConstructorConditionManager extends ConditionManager
{
- public static synchronized ExecutableCondition[] getPreConditions(Constructor constructor)
+ public static synchronized ExecutableCondition[] getPreConditions(Constructor<?> constructor)
{
- ExecutableCondition[] pre = (ExecutableCondition[])preConditions.get(constructor);
+ ExecutableCondition[] pre = preConditions.get(constructor);
if (pre != null)
{
return pre;
}
initialise(constructor);
- return (ExecutableCondition[])preConditions.get(constructor);
+ return preConditions.get(constructor);
}
- public static synchronized ExecutableCondition[] getPostConditions(Constructor constructor)
+ public static synchronized ExecutableCondition[] getPostConditions(Constructor<?> constructor)
{
- ExecutableCondition[] post = (ExecutableCondition[])postConditions.get(constructor);
+ ExecutableCondition[] post = postConditions.get(constructor);
if (post != null)
{
return post;
}
initialise(constructor);
- return (ExecutableCondition[])postConditions.get(constructor);
+ return postConditions.get(constructor);
}
- public static synchronized InvariantCondition[] getInvariants(Constructor constructor)
+ public static synchronized InvariantCondition[] getInvariants(Constructor<?> constructor)
{
return getInvariants(constructor.getDeclaringClass());
}
- private static void initialise(Constructor constructor)
+ private static void initialise(Constructor<?> constructor)
{
if (DesignByContractAspect.verbose) System.out.println("[dbc] ===== Intitalising constructor: " + constructor);
- ArrayList preConds = new ArrayList();
- ArrayList postConds = new ArrayList();
+ ArrayList<ExecutableCondition> preConds = new ArrayList<ExecutableCondition>();
+ ArrayList<ExecutableCondition> postConds = new ArrayList<ExecutableCondition>();
//Need @PreCond and @PostCond for this constructor, and all the super
//declarations of the constructor.
boolean first = true;
- Class clazz = constructor.getDeclaringClass();
- Class curClazz = clazz;
- Constructor superConstructor = constructor;
+ Class<?> clazz = constructor.getDeclaringClass();
+ Class<?> curClazz = clazz;
+ Constructor<?> superConstructor = constructor;
while (curClazz != null)
{
@@ -100,14 +100,14 @@
curClazz = curClazz.getSuperclass();
}
- ExecutableCondition[] pre = (ExecutableCondition[])preConds.toArray(new ExecutableCondition[preConds.size()]);
+ ExecutableCondition[] pre = preConds.toArray(new ExecutableCondition[preConds.size()]);
preConditions.put(constructor, pre);
- ExecutableCondition[] post = (ExecutableCondition[])postConds.toArray(new ExecutableCondition[postConds.size()]);
+ ExecutableCondition[] post = postConds.toArray(new ExecutableCondition[postConds.size()]);
postConditions.put(constructor, post);
}
- private static void addConstructorConditions(Constructor realConstructor, Constructor currentConstructor, ArrayList preConds, ArrayList postConds)
+ private static void addConstructorConditions(Constructor<?> realConstructor, Constructor<?> currentConstructor, ArrayList<ExecutableCondition> preConds, ArrayList<ExecutableCondition> postConds)
{
PreCond pre = (PreCond)AnnotationElement.getAnyAnnotation(currentConstructor, PreCond.class);
if (pre != null)
@@ -125,7 +125,7 @@
}
- private static ArrayList addConstructorConditions(Constructor realConstructor, ArrayList conditions, String[] exprs)
+ private static ArrayList<ExecutableCondition> addConstructorConditions(Constructor<?> realConstructor, ArrayList<ExecutableCondition> conditions, String[] exprs)
{
if (exprs == null)
{
@@ -140,16 +140,16 @@
return conditions;
}
- private static Constructor findConstructorInClass(Class clazz, Constructor constructor)
+ private static Constructor<?> findConstructorInClass(Class<?> clazz, Constructor<?> constructor)
{
String name = constructor.getName();
- Constructor[] constructors = clazz.getDeclaredConstructors();
+ Constructor<?>[] constructors = clazz.getDeclaredConstructors();
for (int i = 0 ; i < constructors.length ; i++)
{
if (constructors[i].getName().equals(name))
{
- Class[] soughtParams = constructor.getParameterTypes();
- Class[] foundParams = constructors[i].getParameterTypes();
+ Class<?>[] soughtParams = constructor.getParameterTypes();
+ Class<?>[] foundParams = constructors[i].getParameterTypes();
if (soughtParams.length == foundParams.length)
{
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ExecutableCondition.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ExecutableCondition.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/ExecutableCondition.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -36,7 +36,7 @@
*/
public abstract class ExecutableCondition extends Condition
{
- public ExecutableCondition(String condExpr, Class clazz, boolean isStatic)
+ public ExecutableCondition(String condExpr, Class<?> clazz, boolean isStatic)
{
super(condExpr, clazz, isStatic);
}
@@ -48,10 +48,10 @@
if (DesignByContractAspect.verbose) System.out.println("[dbc] Evaluate condition : '" + originalExpr + "' for: " + executableObject());
Interpreter interpreter = new Interpreter();
- for (Iterator it = parameterLookup.keySet().iterator() ; it.hasNext() ; )
+ for (Iterator<String> it = parameterLookup.keySet().iterator() ; it.hasNext() ; )
{
- String beanshellname = (String)it.next();
- String originalname = (String)parameterLookup.get(beanshellname);
+ String beanshellname = it.next();
+ String originalname = parameterLookup.get(beanshellname);
Object value = getValueForToken(inv, args, ret, originalname);
interpreter.set(beanshellname, value);
if (DesignByContractAspect.verbose) System.out.println("[dbc] Setting $" + originalname + " to " + value +
@@ -103,6 +103,6 @@
protected abstract boolean isPredefinedToken(String token);
protected abstract Object getValueForPredefinedToken(Invocation invocation, Object rtn, String token);
protected abstract Object executableObject();
- protected abstract Class[] parameterTypes();
+ protected abstract Class<?>[] parameterTypes();
}
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/InvariantCondition.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/InvariantCondition.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/InvariantCondition.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -36,7 +36,7 @@
*/
public class InvariantCondition extends Condition
{
- public InvariantCondition(Class clazz, String condExpr, boolean isStatic)
+ public InvariantCondition(Class<?> clazz, String condExpr, boolean isStatic)
{
super(condExpr, clazz, isStatic);
}
@@ -56,10 +56,10 @@
Interpreter interpreter = new Interpreter();
Object target = (constructor) ? ret : getTarget(inv, staticCall);
- for (Iterator it = parameterLookup.keySet().iterator() ; it.hasNext() ; )
+ for (Iterator<String> it = parameterLookup.keySet().iterator() ; it.hasNext() ; )
{
- String bsname = (String)it.next();
- String originalname = (String)parameterLookup.get(bsname);
+ String bsname = it.next();
+ String originalname = parameterLookup.get(bsname);
if (originalname.equals(Condition.TARGET))
{
interpreter.set(bsname, target);
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/MethodCondition.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/MethodCondition.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/MethodCondition.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -59,7 +59,7 @@
return method;
}
- protected Class[] parameterTypes()
+ protected Class<?>[] parameterTypes()
{
return method.getParameterTypes();
}
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/MethodConditionManager.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/MethodConditionManager.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/dbc/condition/MethodConditionManager.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -38,28 +38,29 @@
*/
public class MethodConditionManager extends ConditionManager
{
+
public static synchronized ExecutableCondition[] getPreConditions(Method method)
{
- ExecutableCondition[] pre = (ExecutableCondition[])preConditions.get(method);
+ ExecutableCondition[] pre = preConditions.get(method);
if (pre != null)
{
return pre;
}
initialise(method);
- return (ExecutableCondition[])preConditions.get(method);
+ return preConditions.get(method);
}
public static synchronized ExecutableCondition[] getPostConditions(Method method)
{
- ExecutableCondition[] post = (ExecutableCondition[])postConditions.get(method);
+ ExecutableCondition[] post = postConditions.get(method);
if (post != null)
{
return post;
}
initialise(method);
- return (ExecutableCondition[])postConditions.get(method);
+ return postConditions.get(method);
}
public static synchronized InvariantCondition[] getInvariants(Method method)
@@ -70,8 +71,8 @@
private static void initialise(Method method)
{
if (DesignByContractAspect.verbose) System.out.println("[dbc] ===== Intitalising method: " + method);
- ArrayList preConds = new ArrayList();
- ArrayList postConds = new ArrayList();
+ ArrayList<ExecutableCondition> preConds = new ArrayList<ExecutableCondition>();
+ ArrayList<ExecutableCondition> postConds = new ArrayList<ExecutableCondition>();
//Need @PreCond and @PostCond for this method, and all the super
@@ -79,8 +80,8 @@
//Likewise we need the @Invariant for this class and the super classes
boolean first = true;
- Class clazz = method.getDeclaringClass();
- Class curClazz = clazz;
+ Class<?> clazz = method.getDeclaringClass();
+ Class<?> curClazz = clazz;
Method superMethod = method;
while (curClazz != null)
@@ -104,16 +105,16 @@
curClazz = curClazz.getSuperclass();
}
- ExecutableCondition[] pre = (ExecutableCondition[])preConds.toArray(new ExecutableCondition[preConds.size()]);
+ ExecutableCondition[] pre = preConds.toArray(new ExecutableCondition[preConds.size()]);
preConditions.put(method, pre);
- ExecutableCondition[] post = (ExecutableCondition[])postConds.toArray(new ExecutableCondition[postConds.size()]);
+ ExecutableCondition[] post = postConds.toArray(new ExecutableCondition[postConds.size()]);
postConditions.put(method, post);
}
- private static void addMethodConditionsForInterfaces(ArrayList preConds, ArrayList postConds, Class clazz, Method method)
+ private static void addMethodConditionsForInterfaces(ArrayList<ExecutableCondition> preConds, ArrayList<ExecutableCondition> postConds, Class<?> clazz, Method method)
{
- Class[] interfaces = clazz.getInterfaces();
+ Class<?>[] interfaces = clazz.getInterfaces();
for (int i = 0 ; i < interfaces.length ; i++)
{
//System.out.println("Checking interface: " + interfaces[i]);
@@ -127,7 +128,7 @@
}
}
- private static void addMethodConditions(Method realMethod, Method currentMethod, ArrayList preConds, ArrayList postConds)
+ private static void addMethodConditions(Method realMethod, Method currentMethod, ArrayList<ExecutableCondition> preConds, ArrayList<ExecutableCondition> postConds)
{
PreCond pre = (PreCond)AnnotationElement.getAnyAnnotation(currentMethod, PreCond.class);
if (pre != null)
@@ -145,7 +146,7 @@
}
- private static ArrayList addMethodConditions(Method realMethod, ArrayList conditions, String[] exprs)
+ private static ArrayList<ExecutableCondition> addMethodConditions(Method realMethod, ArrayList<ExecutableCondition> conditions, String[] exprs)
{
if (exprs == null)
{
@@ -162,7 +163,7 @@
return conditions;
}
- private static Method findMethodInClass(Class clazz, Method method)
+ private static Method findMethodInClass(Class<?> clazz, Method method)
{
String name = method.getName();
Method[] methods = clazz.getDeclaredMethods();
@@ -170,8 +171,8 @@
{
if (methods[i].getName().equals(name))
{
- Class[] soughtParams = method.getParameterTypes();
- Class[] foundParams = methods[i].getParameterTypes();
+ Class<?>[] soughtParams = method.getParameterTypes();
+ Class<?>[] foundParams = methods[i].getParameterTypes();
if (soughtParams.length == foundParams.length)
{
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/jmx/JmxIntrospectingMixin.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/jmx/JmxIntrospectingMixin.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/jmx/JmxIntrospectingMixin.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -97,9 +97,9 @@
}
private final Object target;
- private final HashMap ops = new HashMap();
- private final HashMap gets = new HashMap();
- private final HashMap sets = new HashMap();
+ private final HashMap<OpsKey, Method> ops = new HashMap<OpsKey, Method>();
+ private final HashMap<String, Method> gets = new HashMap<String, Method>();
+ private final HashMap<String, Method> sets = new HashMap<String, Method>();
private MBeanInfo mbeanInfo;
@@ -110,7 +110,7 @@
public Object getAttribute(String attribute) throws AttributeNotFoundException, MBeanException, ReflectionException
{
- Method get = (Method) gets.get(attribute);
+ Method get = gets.get(attribute);
if (get == null) throw new AttributeNotFoundException(attribute);
try
{
@@ -129,7 +129,7 @@
public void setAttribute(Attribute attribute) throws AttributeNotFoundException, InvalidAttributeValueException, MBeanException, ReflectionException
{
- Method set = (Method) sets.get(attribute.getName());
+ Method set = sets.get(attribute.getName());
if (set == null) throw new AttributeNotFoundException(attribute.getName());
try
{
@@ -204,7 +204,7 @@
public Object invoke(String actionName, Object params[], String signature[]) throws MBeanException, ReflectionException
{
OpsKey key = new OpsKey(actionName, signature);
- Method m = (Method) ops.get(key);
+ Method m = ops.get(key);
if (m == null) throw new NoSuchMethodError(actionName);
try
{
@@ -278,12 +278,12 @@
}
}
- HashMap attributes = new HashMap();
- Iterator it = gets.keySet().iterator();
+ HashMap<String, MBeanAttributeInfo> attributes = new HashMap<String, MBeanAttributeInfo>();
+ Iterator<String> it = gets.keySet().iterator();
while (it.hasNext())
{
- String attribute = (String) it.next();
- Method m = (Method) gets.get(attribute);
+ String attribute = it.next();
+ Method m = gets.get(attribute);
//System.out.println("*** creating get: " + attribute);
boolean isWritable = sets.containsKey(attribute);
boolean isIs = m.getName().startsWith("is");
@@ -293,23 +293,23 @@
it = sets.keySet().iterator();
while (it.hasNext())
{
- String attribute = (String) it.next();
+ String attribute = it.next();
if (gets.containsKey(attribute)) continue;
//System.out.println("*** creating set: " + attribute);
- Method m = (Method) sets.get(attribute);
+ Method m = sets.get(attribute);
MBeanAttributeInfo info = new MBeanAttributeInfo(attribute, m.getReturnType().getName(), target.getClass().getName() + "." + attribute, false, true, false);
attributes.put(attribute, info);
}
MBeanOperationInfo[] operations = new MBeanOperationInfo[ops.size()];
- it = ops.values().iterator();
+ Iterator<Method> itops = ops.values().iterator();
int i = 0;
while (it.hasNext())
{
- Method m = (Method) it.next();
+ Method m = itops.next();
operations[i++] = new MBeanOperationInfo(m.toString(), m);
}
- MBeanAttributeInfo[] attrs = (MBeanAttributeInfo[]) attributes.values().toArray(new MBeanAttributeInfo[attributes.size()]);
+ MBeanAttributeInfo[] attrs = attributes.values().toArray(new MBeanAttributeInfo[attributes.size()]);
mbeanInfo = new MBeanInfo(target.getClass().getName(), target.getClass().getName(),
attrs, null, operations, null);
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/logging/InvocationLogClientInterceptor.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/logging/InvocationLogClientInterceptor.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/logging/InvocationLogClientInterceptor.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -74,6 +74,7 @@
return response;
}
+ @SuppressWarnings("unchecked")
public void dumpLog(org.jboss.aop.joinpoint.Invocation invocation)
{
Logger root = Logger.getRootLogger();
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/logging/InvocationLogInterceptor.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/logging/InvocationLogInterceptor.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/logging/InvocationLogInterceptor.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -23,6 +23,8 @@
import java.util.ArrayList;
+import org.apache.log4j.spi.LoggingEvent;
+
/**
* An interceptor that tests whether logging should be done to
* the invocation response.
@@ -55,7 +57,7 @@
{
Object started = invocation.getMetaData(ThreadLocalAppender.LOG, ThreadLocalAppender.LOG);
- ArrayList log = null;
+ ArrayList<LoggingEvent> log = null;
if (started != null)
{
// Some earlier invocation started the logging
@@ -64,7 +66,7 @@
else
{
// We are the first, start the logging
- log = new ArrayList();
+ log = new ArrayList<LoggingEvent>();
ThreadLocalAppender.setList(log);
}
}
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/logging/ThreadLocalAppender.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/logging/ThreadLocalAppender.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/logging/ThreadLocalAppender.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -39,7 +39,7 @@
public static final String LOG = "InvocationLog";
- private static ThreadLocal loggingTL = new ThreadLocal();
+ private static ThreadLocal<ArrayList<LoggingEvent>> loggingTL = new ThreadLocal<ArrayList<LoggingEvent>>();
// Attributes ----------------------------------------------------
@@ -50,9 +50,9 @@
*
* @param list the new list
*/
- public static ArrayList getList()
+ public static ArrayList<LoggingEvent> getList()
{
- return (ArrayList) loggingTL.get();
+ return loggingTL.get();
}
/**
@@ -60,7 +60,7 @@
*
* @param list the new list
*/
- public static void setList(ArrayList list)
+ public static void setList(ArrayList<LoggingEvent> list)
{
loggingTL.set(list);
}
@@ -73,7 +73,7 @@
protected void append(LoggingEvent event)
{
- ArrayList logging = getList();
+ ArrayList<LoggingEvent> logging = getList();
if (logging == null)
return;
Modified: projects/aop/trunk/aspects/src/main/org/jboss/aspects/patterns/observable/SubjectImpl.java
===================================================================
--- projects/aop/trunk/aspects/src/main/org/jboss/aspects/patterns/observable/SubjectImpl.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/main/org/jboss/aspects/patterns/observable/SubjectImpl.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -23,7 +23,6 @@
import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
/**
@@ -35,7 +34,7 @@
public class SubjectImpl implements Subject
{
/** The observers */
- private Set observers = Collections.synchronizedSet(new HashSet());
+ private Set<Observer> observers = Collections.synchronizedSet(new HashSet<Observer>());
/** The subject */
private Object subject;
@@ -63,9 +62,8 @@
synchronized (observers)
{
- for (Iterator i = observers.iterator(); i.hasNext();)
+ for (Observer observer : observers)
{
- Observer observer = (Observer) i.next();
observer.fireChange(obj);
}
}
Modified: projects/aop/trunk/aspects/src/test/test/dbc/java/Sorter.java
===================================================================
--- projects/aop/trunk/aspects/src/test/test/dbc/java/Sorter.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/test/test/dbc/java/Sorter.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -31,6 +31,7 @@
* @version $Revision$
* @@org.jboss.aspects.dbc.Dbc
*/
+ at SuppressWarnings("unchecked")
public class Sorter
{
/**
Modified: projects/aop/trunk/aspects/src/test/test/dbc/office/OfficeManager.java
===================================================================
--- projects/aop/trunk/aspects/src/test/test/dbc/office/OfficeManager.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/test/test/dbc/office/OfficeManager.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -30,6 +30,7 @@
* @@org.jboss.aspects.dbc.Dbc
* @@org.jboss.aspects.dbc.Invariant ({"$tgt.computers != null", "$tgt.developers != null", "forall test.dbc.office.Computer c in $tgt.computers | c != null", "forall d in $tgt.developers | d != null"})
*/
+ at SuppressWarnings("unchecked")
public class OfficeManager
{
ArrayList computers = new ArrayList();
Modified: projects/aop/trunk/aspects/src/test/test/dbc/stack/StackImpl.java
===================================================================
--- projects/aop/trunk/aspects/src/test/test/dbc/stack/StackImpl.java 2008-03-25 22:56:03 UTC (rev 71279)
+++ projects/aop/trunk/aspects/src/test/test/dbc/stack/StackImpl.java 2008-03-25 23:26:51 UTC (rev 71280)
@@ -28,6 +28,7 @@
* @author <a href="mailto:kabir.khan at jboss.org">Kabir Khan </a>
* @version $Revision$
*/
+ at SuppressWarnings("unchecked")
public class StackImpl implements Stack
{
private final LinkedList elements = new LinkedList();
More information about the jboss-cvs-commits
mailing list