[jboss-cvs] JBossAS SVN: r70500 - in projects/aop/trunk/aop/src/main/org/jboss/aop: metadata and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Mar 6 12:26:14 EST 2008
Author: kabir.khan at jboss.com
Date: 2008-03-06 12:26:14 -0500 (Thu, 06 Mar 2008)
New Revision: 70500
Modified:
projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java
projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java
projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java
projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ClassMetaDataBinding.java
projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ClassMetaDataLoader.java
projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ConstructorConfig.java
projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ConstructorMetaData.java
projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/FieldMetaData.java
projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/MethodConfig.java
projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/MethodMetaData.java
projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/SimpleClassMetaDataBinding.java
projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/SimpleClassMetaDataLoader.java
projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/SimpleMetaData.java
projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ThreadMetaData.java
projects/aop/trunk/aop/src/main/org/jboss/aop/util/XmlHelper.java
Log:
Generify and get rid of some warnings
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectAnnotationLoader.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -99,11 +99,11 @@
this.cl = cl;
}
- public void deployInputStreamIterator(Iterator it) throws Exception
+ public void deployInputStreamIterator(Iterator<InputStream> it) throws Exception
{
while (it.hasNext())
{
- InputStream stream = (InputStream) it.next();
+ InputStream stream = it.next();
DataInputStream dstream = new DataInputStream(stream);
ClassFile cf = null;
try
@@ -158,11 +158,11 @@
}
}
- public void undeployInputStreamIterator(Iterator it) throws Exception
+ public void undeployInputStreamIterator(Iterator<InputStream> it) throws Exception
{
while (it.hasNext())
{
- InputStream stream = (InputStream) it.next();
+ InputStream stream = it.next();
DataInputStream dstream = new DataInputStream(stream);
ClassFile cf = null;
try
@@ -396,11 +396,11 @@
{
if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("Found top-level @Precedence in: " + cf.getName());
- ArrayList entries = new ArrayList();
- Iterator fields = cf.getFields().iterator();
+ ArrayList<PrecedenceDefEntry> entries = new ArrayList<PrecedenceDefEntry>();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(PrecedenceInterceptor.class.getName());
@@ -420,7 +420,7 @@
}
}
}
- PrecedenceDefEntry[] pentries = (PrecedenceDefEntry[])entries.toArray(new PrecedenceDefEntry[entries.size()]);
+ PrecedenceDefEntry[] pentries = entries.toArray(new PrecedenceDefEntry[entries.size()]);
PrecedenceDef precedenceDef = new PrecedenceDef(cf.getName(), pentries);
manager.addPrecedence(precedenceDef);
}
@@ -438,10 +438,10 @@
private void deployAspectMethodBindings(ClassFile cf, AspectDefinition def)
throws Exception
{
- Iterator methods = cf.getMethods().iterator();
+ Iterator<MethodInfo> methods = cf.getMethods().iterator();
while (methods.hasNext())
{
- javassist.bytecode.MethodInfo minfo = (javassist.bytecode.MethodInfo) methods.next();
+ MethodInfo minfo = methods.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) minfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(Bind.class.getName());
@@ -506,10 +506,10 @@
private void undeployAspectMethodBindings(ClassFile cf)
throws Exception
{
- Iterator methods = cf.getMethods().iterator();
+ Iterator<MethodInfo> methods = cf.getMethods().iterator();
while (methods.hasNext())
{
- javassist.bytecode.MethodInfo minfo = (javassist.bytecode.MethodInfo) methods.next();
+ MethodInfo minfo = methods.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) minfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(Bind.class.getName());
@@ -569,10 +569,10 @@
private void deployPointcuts(ClassFile cf)
throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- javassist.bytecode.FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(PointcutDef.class.getName());
@@ -588,10 +588,10 @@
private void undeployPointcuts(ClassFile cf)
throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- javassist.bytecode.FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(PointcutDef.class.getName());
@@ -608,10 +608,10 @@
private void deployMixins(ClassFile cf)
throws Exception
{
- Iterator methods = cf.getMethods().iterator();
+ Iterator<MethodInfo> methods = cf.getMethods().iterator();
while (methods.hasNext())
{
- javassist.bytecode.MethodInfo minfo = (javassist.bytecode.MethodInfo) methods.next();
+ MethodInfo minfo = methods.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) minfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(Mixin.class.getName());
@@ -727,10 +727,10 @@
private void undeployMixins(ClassFile cf)
throws Exception
{
- Iterator methods = cf.getMethods().iterator();
+ Iterator<MethodInfo> methods = cf.getMethods().iterator();
while (methods.hasNext())
{
- javassist.bytecode.MethodInfo minfo = (javassist.bytecode.MethodInfo) methods.next();
+ MethodInfo minfo = methods.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) minfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(Mixin.class.getName());
@@ -744,10 +744,10 @@
private void deployIntroductions(ClassFile cf)
throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(Introduction.class.getName());
@@ -784,10 +784,10 @@
private void undeployIntroductions(ClassFile cf)
throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(Introduction.class.getName());
@@ -801,10 +801,10 @@
private void deployTypedefs(ClassFile cf) throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(TypeDef.class.getName());
@@ -821,10 +821,10 @@
private void undeployTypedefs(ClassFile cf) throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(TypeDef.class.getName());
@@ -844,10 +844,10 @@
private void deployCFlowStackDefs(ClassFile cf) throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(CFlowStackDef.class.getName());
@@ -871,10 +871,10 @@
private void undeployCFlowStackDefs(ClassFile cf) throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(CFlowStackDef.class.getName());
@@ -892,10 +892,10 @@
private void deployPrepares(ClassFile cf) throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(Prepare.class.getName());
@@ -911,10 +911,10 @@
private void undeployPrepares(ClassFile cf) throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(Prepare.class.getName());
@@ -932,10 +932,10 @@
private void deployAnnotationIntroductions(ClassFile cf) throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(AnnotationIntroductionDef.class.getName());
@@ -955,10 +955,10 @@
private void undeployAnnotationIntroductions(ClassFile cf) throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation binfo = mgroup.getAnnotation(AnnotationIntroductionDef.class.getName());
@@ -978,10 +978,10 @@
private void deployDeclares(ClassFile cf) throws Exception
{
- Iterator fields = cf.getFields().iterator();
+ Iterator<FieldInfo> fields = cf.getFields().iterator();
while (fields.hasNext())
{
- FieldInfo finfo = (javassist.bytecode.FieldInfo) fields.next();
+ FieldInfo finfo = fields.next();
AnnotationsAttribute mgroup = (AnnotationsAttribute) finfo.getAttribute(AnnotationsAttribute.visibleTag);
if (mgroup == null) continue;
javassist.bytecode.annotation.Annotation dwinfo = mgroup.getAnnotation(DeclareWarning.class.getName());
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/AspectXmlLoader.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -311,8 +311,8 @@
Type theType = Type.valueOf(type);
- ArrayList interceptors = loadInterceptors(element);
- InterceptorFactory[] inters = (InterceptorFactory[]) interceptors.toArray(new InterceptorFactory[interceptors.size()]);
+ ArrayList<InterceptorFactory> interceptors = loadInterceptors(element);
+ InterceptorFactory[] inters = interceptors.toArray(new InterceptorFactory[interceptors.size()]);
for (int i = 0 ; i < inters.length ; i++)
{
if (!inters[i].getAspect().getScope().equals(Scope.PER_VM))
@@ -588,7 +588,7 @@
{
String tag = element.getAttribute("tag");
String classname = element.getAttribute("class");
- Class clazz = getClassLoader().loadClass(classname);
+ Class<?> clazz = getClassLoader().loadClass(classname);
ClassMetaDataLoader loader = (ClassMetaDataLoader) clazz.newInstance();
if (loader instanceof XmlLoadable)
{
@@ -638,7 +638,7 @@
Pointcut p = null;
- Class pClass = null;
+ Class<?> pClass = null;
try
{
pClass = getClassLoader().loadClass(clazz);
@@ -870,10 +870,10 @@
ASTStart start = new TypeExpressionParser(new StringReader(ast)).Start();
pcut = new InterfaceIntroduction(name, start, ifaces);
}
- Iterator it = XmlHelper.getChildrenByTagName(pointcut, "mixin");
+ Iterator<Element> it = XmlHelper.getChildrenByTagName(pointcut, "mixin");
while (it.hasNext())
{
- Element mixin = (Element) it.next();
+ Element mixin = it.next();
if (mixin != null)
{
String construction = XmlHelper.getOptionalChildContent(mixin, "construction");
@@ -1212,12 +1212,12 @@
manager.removeBindings(bindings);
for (int i = 0; i < factories.size(); i++)
{
- String factory = (String) factories.get(i);
+ String factory = factories.get(i);
manager.removeInterceptorFactory(factory);
}
for (int i = 0; i < aspects.size(); i++)
{
- String aspect = (String) aspects.get(i);
+ String aspect = aspects.get(i);
manager.removeAspectDefinition(aspect);
}
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/Deployment.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -28,6 +28,7 @@
import java.io.File;
import java.io.FilenameFilter;
+import java.io.InputStream;
import java.net.URL;
import java.util.Enumeration;
import java.util.Iterator;
@@ -74,10 +75,10 @@
{
try
{
- Enumeration en = SecurityActions.getContextClassLoader().getResources("META-INF/jboss-aop.xml");
+ Enumeration<URL> en = SecurityActions.getContextClassLoader().getResources("META-INF/jboss-aop.xml");
while (en.hasMoreElements())
{
- URL url = (URL) en.nextElement();
+ URL url = en.nextElement();
if (AspectManager.verbose && logger.isDebugEnabled()) logger.debug("deploying " + url);
AspectXmlLoader.deployXML(url);
}
@@ -113,7 +114,7 @@
try
{
URL url = f.toURL();
- Iterator it = ArchiveBrowser.getBrowser(url, new ClassFileFilter());
+ Iterator<InputStream> it = ArchiveBrowser.getBrowser(url, new ClassFileFilter());
AspectAnnotationLoader loader = new AspectAnnotationLoader(AspectManager.instance());
loader.deployInputStreamIterator(it);
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ClassMetaDataBinding.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ClassMetaDataBinding.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ClassMetaDataBinding.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -41,7 +41,7 @@
protected String expr;
protected String name;
protected String tag;
- protected ArrayList advisors = new ArrayList();
+ protected ArrayList<WeakReference<Advisor>> advisors = new ArrayList<WeakReference<Advisor>>();
protected ClassMetaDataLoader loader;
public ClassMetaDataBinding(ClassMetaDataLoader loader, String name, String tag, String exp)
@@ -74,14 +74,14 @@
// we may be having in the future an Advisor per instance.
synchronized (advisors)
{
- Iterator it = advisors.iterator();
+ Iterator<WeakReference<Advisor>> it = advisors.iterator();
while (it.hasNext())
{
- WeakReference ref = (WeakReference) it.next();
- Object obj = ref.get();
- if (obj == null) it.remove();
+ WeakReference<Advisor> ref = it.next();
+ Advisor adv = ref.get();
+ if (adv == null) it.remove();
}
- advisors.add(new WeakReference(advisor));
+ advisors.add(new WeakReference<Advisor>(advisor));
}
advisor.addClassMetaData(this);
}
@@ -92,8 +92,8 @@
{
for (int i = 0; i < advisors.size(); i++)
{
- WeakReference ref = (WeakReference) advisors.get(i);
- Advisor advisor = (Advisor) ref.get();
+ WeakReference<Advisor> ref = advisors.get(i);
+ Advisor advisor = ref.get();
if (advisor != null)
advisor.removeClassMetaData(this);
}
@@ -113,7 +113,7 @@
return name.hashCode();
}
- public boolean matches(Advisor advisor, Class clazz)
+ public boolean matches(Advisor advisor, Class<?> clazz)
{
return Util.matchesClassExpr(classExpr, clazz, advisor);
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ClassMetaDataLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ClassMetaDataLoader.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ClassMetaDataLoader.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -65,5 +65,5 @@
* @param constructors
* @throws Exception
*/
- public void bind(Advisor advisor, ClassMetaDataBinding data, Method[] methods, Field[] fields, Constructor[] constructors) throws Exception;
+ public void bind(Advisor advisor, ClassMetaDataBinding data, Method[] methods, Field[] fields, Constructor<?>[] constructors) throws Exception;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ConstructorConfig.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ConstructorConfig.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ConstructorConfig.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -57,7 +57,7 @@
// Public --------------------------------------------------------
- public boolean patternMatches(Constructor constructor)
+ public boolean patternMatches(Constructor<?> constructor)
{
// the wildcard matches everything
if (signature.equals("*"))
@@ -96,11 +96,11 @@
return;
}
signature = "(";
- Iterator paramsIterator = XmlHelper.getChildrenByTagName(paramsElement,
+ Iterator<Element> paramsIterator = XmlHelper.getChildrenByTagName(paramsElement,
"constructor-param");
while (paramsIterator.hasNext())
{
- signature += XmlHelper.getElementContent((Element)paramsIterator.next()).trim();
+ signature += XmlHelper.getElementContent(paramsIterator.next()).trim();
signature += " ";
}
signature += ")";
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ConstructorMetaData.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ConstructorMetaData.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ConstructorMetaData.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -36,41 +36,39 @@
*/
public class ConstructorMetaData implements MetaDataResolver
{
- HashMap constructorMetaData = new HashMap();
+ final HashMap<String, SimpleMetaData> constructorMetaData = new HashMap<String, SimpleMetaData>();
public boolean hasTag(String tag)
{
- Iterator values = constructorMetaData.values().iterator();
- while (values.hasNext())
+ for (SimpleMetaData map : constructorMetaData.values())
{
- SimpleMetaData map = (SimpleMetaData)values.next();
if (map.hasTag(tag)) return true;
}
return false;
}
- public synchronized boolean hasTag(Constructor constructor, String tag)
+ public synchronized boolean hasTag(Constructor<?> constructor, String tag)
{
SimpleMetaData meta = getConstructorMetaData(constructor);
if (meta == null) return false;
return meta.hasTag(tag);
}
- public void tagConstructor(Constructor con, Object tag)
+ public void tagConstructor(Constructor<?> con, Object tag)
{
addConstructorMetaData(con, tag, EMPTY_TAG, new Object(), PayloadKey.TRANSIENT);
}
- public void addConstructorMetaData(Constructor constructor, Object tag, Object attr, Object value)
+ public void addConstructorMetaData(Constructor<?> constructor, Object tag, Object attr, Object value)
{
addConstructorMetaData(constructor.toString(), tag, attr, value, PayloadKey.MARSHALLED);
}
- public void addConstructorMetaData(Constructor constructor, Object tag, Object attr, Object value, PayloadKey type)
+ public void addConstructorMetaData(Constructor<?> constructor, Object tag, Object attr, Object value, PayloadKey type)
{
addConstructorMetaData(constructor.toString(), tag, attr, value, type);
}
public synchronized void addConstructorMetaData(String key, Object tag, Object attr, Object value, PayloadKey type)
{
- SimpleMetaData constructorData = (SimpleMetaData)constructorMetaData.get(key);
+ SimpleMetaData constructorData = constructorMetaData.get(key);
if (constructorData == null)
{
constructorData = new SimpleMetaData();
@@ -79,31 +77,31 @@
constructorData.addMetaData(tag, attr, value, type);
}
- public synchronized Iterator getConstructors()
+ public synchronized Iterator<String> getConstructors()
{
return constructorMetaData.keySet().iterator();
}
- public synchronized SimpleMetaData getConstructorMetaData(Constructor constructor)
+ public synchronized SimpleMetaData getConstructorMetaData(Constructor<?> constructor)
{
- return (SimpleMetaData)constructorMetaData.get(constructor.toString());
+ return constructorMetaData.get(constructor.toString());
}
public synchronized SimpleMetaData getConstructorMetaData(String constructor)
{
- return (SimpleMetaData)constructorMetaData.get(constructor);
+ return constructorMetaData.get(constructor);
}
- public synchronized Object getConstructorMetaData(Constructor constructor, Object tag, Object attr)
+ public synchronized Object getConstructorMetaData(Constructor<?> constructor, Object tag, Object attr)
{
- SimpleMetaData constructorData = (SimpleMetaData)constructorMetaData.get(constructor.toString());
+ SimpleMetaData constructorData = constructorMetaData.get(constructor.toString());
if (constructorData == null) return null;
return constructorData.getMetaData(tag, attr);
}
public synchronized Object getConstructorMetaData(String constructor, Object tag, Object attr)
{
- SimpleMetaData constructorData = (SimpleMetaData)constructorMetaData.get(constructor);
+ SimpleMetaData constructorData = constructorMetaData.get(constructor);
if (constructorData == null) return null;
return constructorData.getMetaData(tag, attr);
}
@@ -115,14 +113,14 @@
public Object resolve(Invocation invocation, Object tag, Object attr)
{
- Constructor constructor = ((ConstructorInvocation)invocation).getConstructor();
+ Constructor<?> constructor = ((ConstructorInvocation)invocation).getConstructor();
return getConstructorMetaData(constructor, tag, attr);
}
public synchronized SimpleMetaData getAllMetaData(Invocation invocation)
{
- Constructor constructor = ((ConstructorInvocation)invocation).getConstructor();
- return (SimpleMetaData)constructorMetaData.get(constructor);
+ Constructor<?> constructor = ((ConstructorInvocation)invocation).getConstructor();
+ return constructorMetaData.get(constructor);
}
// temporary interface so that loader/compiler can get annotations
@@ -139,7 +137,7 @@
public synchronized boolean hasGroup(CtConstructor constructor, String tag)
{
- SimpleMetaData meta = (SimpleMetaData)constructorMetaData.get(constructor.getSignature());
+ SimpleMetaData meta = constructorMetaData.get(constructor.getSignature());
if (meta == null) return false;
return meta.hasTag(tag);
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/FieldMetaData.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/FieldMetaData.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/FieldMetaData.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -35,14 +35,12 @@
*/
public class FieldMetaData implements MetaDataResolver
{
- HashMap fieldMetaData = new HashMap();
+ HashMap<String, SimpleMetaData> fieldMetaData = new HashMap<String, SimpleMetaData>();
public boolean hasTag(String tag)
{
- Iterator values = fieldMetaData.values().iterator();
- while (values.hasNext())
+ for (SimpleMetaData map : fieldMetaData.values())
{
- SimpleMetaData map = (SimpleMetaData)values.next();
if (map.hasTag(tag)) return true;
}
return false;
@@ -87,7 +85,7 @@
public synchronized void addFieldMetaData(String key, Object tag, Object attr, Object value, PayloadKey type)
{
String fieldName = key;
- SimpleMetaData fieldData = (SimpleMetaData)fieldMetaData.get(fieldName);
+ SimpleMetaData fieldData = fieldMetaData.get(fieldName);
if (fieldData == null)
{
fieldData = new SimpleMetaData();
@@ -105,19 +103,19 @@
public synchronized Object getFieldMetaData(String fieldName, Object tag, Object attr)
{
- SimpleMetaData fieldData = (SimpleMetaData)fieldMetaData.get(fieldName);
+ SimpleMetaData fieldData = fieldMetaData.get(fieldName);
if (fieldData == null) return null;
return fieldData.getMetaData(tag, attr);
}
- public synchronized Iterator getFields()
+ public synchronized Iterator<String> getFields()
{
return fieldMetaData.keySet().iterator();
}
public synchronized SimpleMetaData getFieldMetaData(String field)
{
- return (SimpleMetaData)fieldMetaData.get(field);
+ return fieldMetaData.get(field);
}
public synchronized void clear()
@@ -134,6 +132,6 @@
public synchronized SimpleMetaData getAllMetaData(Invocation invocation)
{
Field field = ((FieldInvocation)invocation).getField();
- return (SimpleMetaData)fieldMetaData.get(field);
+ return fieldMetaData.get(field);
}
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/MethodConfig.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/MethodConfig.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/MethodConfig.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -106,11 +106,11 @@
Element paramsElement = XmlHelper.getOptionalChild(element, "method-params");
if (paramsElement != null)
{
- Iterator paramsIterator = XmlHelper.getChildrenByTagName(paramsElement,
+ Iterator<Element> paramsIterator = XmlHelper.getChildrenByTagName(paramsElement,
"method-param");
while (paramsIterator.hasNext())
{
- signature += XmlHelper.getElementContent((Element)paramsIterator.next());
+ signature += XmlHelper.getElementContent(paramsIterator.next());
signature += " ";
}
}
@@ -127,13 +127,13 @@
return buf.toString();
}
- public static String getSignature(Class[] source)
+ public static String getSignature(Class<?>[] source)
{
StringBuffer sig = new StringBuffer("(");
for( int i=0; i < source.length; i++ )
{
String brackets = "";
- Class cls = source[i];
+ Class<?> cls = source[i];
while(cls.isArray())
{
brackets += "[]";
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/MethodMetaData.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/MethodMetaData.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/MethodMetaData.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -39,15 +39,13 @@
*/
public class MethodMetaData implements MetaDataResolver
{
- volatile Map methodMetaData = UnmodifiableEmptyCollections.EMPTY_CONCURRENT_HASHMAP;
- HashMap inexactMatches;
+ volatile Map<String, SimpleMetaData> methodMetaData = UnmodifiableEmptyCollections.EMPTY_CONCURRENT_HASHMAP;
+ HashMap<String, HashMap<Object, HashMap<Object, Boolean>>> inexactMatches;
public boolean hasTag(String group)
{
- Iterator values = methodMetaData.values().iterator();
- while (values.hasNext())
+ for (SimpleMetaData map : methodMetaData.values())
{
- SimpleMetaData map = (SimpleMetaData)values.next();
if (map.hasTag(group)) return true;
}
return false;
@@ -75,7 +73,7 @@
private synchronized void addMethodMetaData(String key, Object tag, Object attr, Object value, PayloadKey type, boolean exactMatch)
{
- SimpleMetaData methodData = (SimpleMetaData)methodMetaData.get(key);
+ SimpleMetaData methodData = methodMetaData.get(key);
if (methodData == null)
{
methodData = new SimpleMetaData();
@@ -92,20 +90,20 @@
{
if (inexactMatches == null)
{
- inexactMatches = new HashMap();
+ inexactMatches = new HashMap<String, HashMap<Object, HashMap<Object, Boolean>>>();
}
- HashMap tags = (HashMap)inexactMatches.get(key);
+ HashMap<Object, HashMap<Object, Boolean>> tags = inexactMatches.get(key);
if (tags == null)
{
- tags = new HashMap();
+ tags = new HashMap<Object, HashMap<Object, Boolean>>();
inexactMatches.put(key, tags);
}
- HashMap attrs = (HashMap)tags.get(tag);
+ HashMap<Object, Boolean> attrs = tags.get(tag);
if (attrs == null)
{
- attrs = new HashMap();
+ attrs = new HashMap<Object, Boolean>();
tags.put(tag, attrs);
}
attrs.put(attr, Boolean.TRUE);
@@ -113,9 +111,9 @@
else
{
if (inexactMatches == null)return;
- HashMap tags = (HashMap)inexactMatches.get(key);
+ HashMap<Object, HashMap<Object, Boolean>> tags = inexactMatches.get(key);
if (tags == null) return;
- HashMap attrs = (HashMap)tags.get(tag);
+ HashMap<Object, Boolean> attrs = tags.get(tag);
if (attrs == null) return;
attrs.remove(attr);
}
@@ -125,9 +123,9 @@
public synchronized boolean tagWasMatchedInexactly(Method method, Object tag, Object attr)
{
if (inexactMatches == null) return false;
- HashMap tags = (HashMap)inexactMatches.get(method.toString());
+ HashMap<Object, HashMap<Object, Boolean>> tags = inexactMatches.get(method.toString());
if (tags == null) return false;
- HashMap attrs = (HashMap)tags.get(tag);
+ HashMap<Object, Boolean> attrs = tags.get(tag);
if (attrs == null) return false;
return (attrs.get(attr) != null);
}
@@ -139,7 +137,7 @@
return meta.hasTag(tag);
}
- public Iterator getMethods()
+ public Iterator<String> getMethods()
{
return methodMetaData.keySet().iterator();
}
@@ -151,7 +149,7 @@
*/
public SimpleMetaData getMethodMetaData(String method)
{
- return (SimpleMetaData)methodMetaData.get(method);
+ return methodMetaData.get(method);
}
public SimpleMetaData getMethodMetaData(Method method)
@@ -161,7 +159,7 @@
public Object getMethodMetaData(Method method, Object tag, Object attr)
{
- SimpleMetaData methodData = (SimpleMetaData)methodMetaData.get(method.toString());
+ SimpleMetaData methodData = methodMetaData.get(method.toString());
if (methodData == null) return null;
return methodData.getMetaData(tag, attr);
}
@@ -180,7 +178,7 @@
public SimpleMetaData getAllMetaData(Invocation invocation)
{
MethodInvocation methodInvocation = (MethodInvocation)invocation;
- return (SimpleMetaData)methodMetaData.get(methodInvocation.getMethod().toString());
+ return methodMetaData.get(methodInvocation.getMethod().toString());
}
//--- temporary interface until metadata is bound to actual class, this is needed for loader/compiler to
@@ -215,7 +213,7 @@
{
if (methodMetaData == UnmodifiableEmptyCollections.EMPTY_CONCURRENT_HASHMAP)
{
- methodMetaData = new ConcurrentHashMap();
+ methodMetaData = new ConcurrentHashMap<String, SimpleMetaData>();
}
}
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/SimpleClassMetaDataBinding.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/SimpleClassMetaDataBinding.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/SimpleClassMetaDataBinding.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -95,9 +95,9 @@
protected SimpleMetaData defaultMetaData = new SimpleMetaData();
protected SimpleMetaData classMetaData = new SimpleMetaData();
- protected ArrayList queuedMethodMetaData = new ArrayList();
- protected ArrayList queuedFieldMetaData = new ArrayList();
- protected ArrayList queuedConstructorMetaData = new ArrayList();
+ protected ArrayList<QueuedMethodMetaData> queuedMethodMetaData = new ArrayList<QueuedMethodMetaData>();
+ protected ArrayList<QueuedMetaData> queuedFieldMetaData = new ArrayList<QueuedMetaData>();
+ protected ArrayList<QueuedConstructorMetaData> queuedConstructorMetaData = new ArrayList<QueuedConstructorMetaData>();
public SimpleClassMetaDataBinding(ClassMetaDataLoader loader, String name, String tag, String expr)
{
@@ -122,7 +122,7 @@
queuedMethodMetaData.add(new QueuedMethodMetaData(methodExpr, tag, attr, value));
}
- public ArrayList getQueuedMethodMetaData()
+ public ArrayList<QueuedMethodMetaData> getQueuedMethodMetaData()
{
return queuedMethodMetaData;
}
@@ -135,7 +135,7 @@
queuedFieldMetaData.add(new QueuedMetaData(fieldExpr, tag, attr, value));
}
- public ArrayList getQueuedFieldMetaData()
+ public ArrayList<QueuedMetaData> getQueuedFieldMetaData()
{
return queuedFieldMetaData;
}
@@ -148,7 +148,7 @@
queuedConstructorMetaData.add(new QueuedConstructorMetaData(constructorExpr, tag, attr, value));
}
- public ArrayList getQueuedConstructorMetaData()
+ public ArrayList<QueuedConstructorMetaData> getQueuedConstructorMetaData()
{
return queuedConstructorMetaData;
}
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/SimpleClassMetaDataLoader.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/SimpleClassMetaDataLoader.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/SimpleClassMetaDataLoader.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -95,10 +95,10 @@
}
}
- Iterator it = XmlHelper.getChildrenByTagName(element, "method");
+ Iterator<Element> it = XmlHelper.getChildrenByTagName(element, "method");
while (it.hasNext())
{
- Element method = (Element) it.next();
+ Element method = it.next();
String methodName = method.getAttribute("name");
String expr = method.getAttribute("expr");
if (methodName != null && methodName.equals(""))
@@ -140,7 +140,7 @@
it = XmlHelper.getChildrenByTagName(element, "field");
while (it.hasNext())
{
- Element field = (Element) it.next();
+ Element field = it.next();
String fieldName = field.getAttribute("name");
NodeList children = field.getChildNodes();
boolean hadTag = false;
@@ -164,7 +164,7 @@
it = XmlHelper.getChildrenByTagName(element, "constructor");
while (it.hasNext())
{
- Element field = (Element) it.next();
+ Element field = it.next();
String expr = field.getAttribute("expr");
NodeList children = field.getChildNodes();
boolean hadTag = false;
@@ -188,7 +188,7 @@
return data;
}
- public void bind(Advisor advisor, ClassMetaDataBinding data, Method[] methods, Field[] fields, Constructor[] constructors) throws Exception
+ public void bind(Advisor advisor, ClassMetaDataBinding data, Method[] methods, Field[] fields, Constructor<?>[] constructors) throws Exception
{
SimpleClassMetaDataBinding meta = (SimpleClassMetaDataBinding) data;
SimpleMetaData defaultData = advisor.getDefaultMetaData();
@@ -225,10 +225,10 @@
}
boolean exactMatch = data.matches(advisor, advisor.getClazz());
- ArrayList queuedData = data.getQueuedMethodMetaData();
+ ArrayList<SimpleClassMetaDataBinding.QueuedMethodMetaData> queuedData = data.getQueuedMethodMetaData();
for (int i = 0; i < queuedData.size(); i++)
{
- SimpleClassMetaDataBinding.QueuedMethodMetaData queued = (SimpleClassMetaDataBinding.QueuedMethodMetaData) queuedData.get(i);
+ SimpleClassMetaDataBinding.QueuedMethodMetaData queued = queuedData.get(i);
for (int j = 0; j < advisedMethods.length; j++)
{
if (queued.expr.matches(advisedMethods[j]))
@@ -264,10 +264,10 @@
protected void bindFieldMetaData(SimpleClassMetaDataBinding data, FieldMetaData fieldMetaData, Field[] advisedFields)
{
- ArrayList queuedData = data.getQueuedFieldMetaData();
+ ArrayList<SimpleClassMetaDataBinding.QueuedMetaData> queuedData = data.getQueuedFieldMetaData();
for (int i = 0; i < queuedData.size(); i++)
{
- SimpleClassMetaDataBinding.QueuedMetaData queued = (SimpleClassMetaDataBinding.QueuedMetaData) queuedData.get(i);
+ SimpleClassMetaDataBinding.QueuedMetaData queued = queuedData.get(i);
for (int j = 0; j < advisedFields.length; j++)
{
String fieldName = advisedFields[j].getName();
@@ -279,12 +279,12 @@
}
}
- protected void bindConstructorMetaData(SimpleClassMetaDataBinding data, ConstructorMetaData conMetaData, Constructor[] advisedCons)
+ protected void bindConstructorMetaData(SimpleClassMetaDataBinding data, ConstructorMetaData conMetaData, Constructor<?>[] advisedCons)
{
- ArrayList queuedData = data.getQueuedConstructorMetaData();
+ ArrayList<SimpleClassMetaDataBinding.QueuedConstructorMetaData> queuedData = data.getQueuedConstructorMetaData();
for (int i = 0; i < queuedData.size(); i++)
{
- SimpleClassMetaDataBinding.QueuedConstructorMetaData queued = (SimpleClassMetaDataBinding.QueuedConstructorMetaData) queuedData.get(i);
+ SimpleClassMetaDataBinding.QueuedConstructorMetaData queued = queuedData.get(i);
ConstructorExpression expression = queued.expr;
for (int j = 0; j < advisedCons.length; j++)
{
@@ -324,10 +324,10 @@
protected void bindMethodMetaData(SimpleClassMetaDataBinding data, MethodMetaData methodMetaData, CtMethod[] advisedMethods) throws NotFoundException
{
- ArrayList queuedData = data.getQueuedMethodMetaData();
+ ArrayList<SimpleClassMetaDataBinding.QueuedMethodMetaData> queuedData = data.getQueuedMethodMetaData();
for (int i = 0; i < queuedData.size(); i++)
{
- SimpleClassMetaDataBinding.QueuedMethodMetaData queued = (SimpleClassMetaDataBinding.QueuedMethodMetaData) queuedData.get(i);
+ SimpleClassMetaDataBinding.QueuedMethodMetaData queued = queuedData.get(i);
for (int j = 0; j < advisedMethods.length; j++)
{
if (queued.expr.matches(advisedMethods[j]))
@@ -340,10 +340,10 @@
protected void bindFieldMetaData(SimpleClassMetaDataBinding data, FieldMetaData fieldMetaData, CtField[] advisedFields)
{
- ArrayList queuedData = data.getQueuedFieldMetaData();
+ ArrayList<SimpleClassMetaDataBinding.QueuedMetaData> queuedData = data.getQueuedFieldMetaData();
for (int i = 0; i < queuedData.size(); i++)
{
- SimpleClassMetaDataBinding.QueuedMetaData queued = (SimpleClassMetaDataBinding.QueuedMetaData) queuedData.get(i);
+ SimpleClassMetaDataBinding.QueuedMetaData queued = queuedData.get(i);
for (int j = 0; j < advisedFields.length; j++)
{
String fieldName = advisedFields[j].getName();
@@ -357,10 +357,10 @@
protected void bindConstructorMetaData(SimpleClassMetaDataBinding data, ConstructorMetaData conMetaData, CtConstructor[] advisedCons) throws NotFoundException
{
- ArrayList queuedData = data.getQueuedConstructorMetaData();
+ ArrayList<SimpleClassMetaDataBinding.QueuedConstructorMetaData> queuedData = data.getQueuedConstructorMetaData();
for (int i = 0; i < queuedData.size(); i++)
{
- SimpleClassMetaDataBinding.QueuedConstructorMetaData queued = (SimpleClassMetaDataBinding.QueuedConstructorMetaData) queuedData.get(i);
+ SimpleClassMetaDataBinding.QueuedConstructorMetaData queued = queuedData.get(i);
ConstructorExpression expression = queued.expr;
for (int j = 0; j < advisedCons.length; j++)
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/SimpleMetaData.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/SimpleMetaData.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/SimpleMetaData.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -131,11 +131,11 @@
* @param name tag of the queried metadata
* @return a map containing all the metadata tagged with {@code name}
*/
- public synchronized HashMap tag(String name)
+ public synchronized HashMap<Object, MetaDataValue> tag(String name)
{
- HashMap map = (HashMap) metaData.get(name);
+ HashMap<Object, MetaDataValue> map = metaData.get(name);
if (map == null) return null;
- return (HashMap) map.clone();
+ return (HashMap<Object, MetaDataValue>) map.clone();
}
/**
@@ -228,7 +228,7 @@
*/
public synchronized void removeMetaData(Object tag, Object attr)
{
- HashMap groupData = (HashMap) metaData.get(tag);
+ HashMap<Object, MetaDataValue> groupData = metaData.get(tag);
if (groupData != null)
{
groupData.remove(attr);
@@ -263,7 +263,7 @@
*/
public synchronized void mergeIn(SimpleMetaData data)
{
- Iterator it = data.metaData.keySet().iterator();
+ Iterator<Object> it = data.metaData.keySet().iterator();
while (it.hasNext())
{
Object tag = it.next();
@@ -295,17 +295,17 @@
while (it.hasNext())
{
Object group = it.next();
- HashMap map = (HashMap) metaData.get(group);
+ HashMap<Object, MetaDataValue> map = metaData.get(group);
//System.out.println("******** marshalling group " + group + " size = " + map.size());
if (map != null && map.size() > 0)
{
boolean groupWritten = false;
- Iterator attrs = map.keySet().iterator();
+ Iterator<Object> attrs = map.keySet().iterator();
while (attrs.hasNext())
{
Object attr = attrs.next();
//System.out.println("******** marshalling attr: " + group + "." + attr);
- MetaDataValue value = (MetaDataValue) map.get(attr);
+ MetaDataValue value = map.get(attr);
if (value.type == PayloadKey.TRANSIENT) continue;
if (!groupWritten)
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ThreadMetaData.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ThreadMetaData.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/metadata/ThreadMetaData.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -37,7 +37,7 @@
*/
public class ThreadMetaData implements MetaDataResolver
{
- ThreadLocal metaData = new ThreadLocal();
+ ThreadLocal<SimpleMetaData> metaData = new ThreadLocal<SimpleMetaData>();
public void addMetaData(Object tag, Object attr, Object value)
{
@@ -46,7 +46,7 @@
public void addMetaData(Object tag, Object attr, Object value, PayloadKey type)
{
- SimpleMetaData data = (SimpleMetaData)metaData.get();
+ SimpleMetaData data = metaData.get();
if (data == null)
{
data = new SimpleMetaData();
@@ -57,21 +57,21 @@
public Object getMetaData(Object tag, Object attr)
{
- SimpleMetaData data = (SimpleMetaData)metaData.get();
+ SimpleMetaData data = metaData.get();
if (data == null) return null;
return data.getMetaData(tag, attr);
}
public synchronized void removeMetaData(Object tag, Object attr)
{
- SimpleMetaData data = (SimpleMetaData)metaData.get();
+ SimpleMetaData data = metaData.get();
if (data == null) return;
data.removeMetaData(tag, attr);
}
public synchronized void removeGroupData(Object tag)
{
- SimpleMetaData data = (SimpleMetaData)metaData.get();
+ SimpleMetaData data = metaData.get();
if (data == null) return;
data.removeGroupData(tag);
}
@@ -83,7 +83,7 @@
public SimpleMetaData getAllMetaData(Invocation invocation)
{
- return (SimpleMetaData)metaData.get();
+ return metaData.get();
}
public void clear()
{
Modified: projects/aop/trunk/aop/src/main/org/jboss/aop/util/XmlHelper.java
===================================================================
--- projects/aop/trunk/aop/src/main/org/jboss/aop/util/XmlHelper.java 2008-03-06 17:05:13 UTC (rev 70499)
+++ projects/aop/trunk/aop/src/main/org/jboss/aop/util/XmlHelper.java 2008-03-06 17:26:14 UTC (rev 70500)
@@ -44,7 +44,7 @@
* @param tagName The name of the desired child
* @return An interator of children or null if element is null.
*/
- public static Iterator getChildrenByTagName(Element element,
+ public static Iterator<Element> getChildrenByTagName(Element element,
String tagName)
{
if (element == null) return null;
@@ -52,12 +52,12 @@
// descendance. We want only children
NodeList children = element.getChildNodes();
- ArrayList goodChildren = new ArrayList();
+ ArrayList<Element> goodChildren = new ArrayList<Element>();
for (int i=0; i<children.getLength(); i++) {
Node currentChild = children.item(i);
if (currentChild.getNodeType() == Node.ELEMENT_NODE &&
((Element)currentChild).getTagName().equals(tagName)) {
- goodChildren.add(currentChild);
+ goodChildren.add((Element)currentChild);
}
}
return goodChildren.iterator();
@@ -77,10 +77,10 @@
public static Element getUniqueChild(Element element, String tagName)
throws Exception
{
- Iterator goodChildren = getChildrenByTagName(element, tagName);
+ Iterator<Element> goodChildren = getChildrenByTagName(element, tagName);
if (goodChildren != null && goodChildren.hasNext()) {
- Element child = (Element)goodChildren.next();
+ Element child = goodChildren.next();
if (goodChildren.hasNext()) {
throw new Exception
("expected only one " + tagName + " tag");
@@ -123,10 +123,10 @@
Element defaultElement)
throws Exception
{
- Iterator goodChildren = getChildrenByTagName(element, tagName);
+ Iterator<Element> goodChildren = getChildrenByTagName(element, tagName);
if (goodChildren != null && goodChildren.hasNext()) {
- Element child = (Element)goodChildren.next();
+ Element child = goodChildren.next();
if (goodChildren.hasNext()) {
throw new Exception
("expected only one " + tagName + " tag");
More information about the jboss-cvs-commits
mailing list