[webbeans-commits] Webbeans SVN: r941 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: bean and 7 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Tue Jan 13 21:04:15 EST 2009
Author: pete.muir at jboss.org
Date: 2009-01-13 21:04:15 -0500 (Tue, 13 Jan 2009)
New Revision: 941
Modified:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SimpleBeanMap.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/AbstractNaming.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/DeploymentProperties.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationIterator.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java
Log:
more generics tidyup
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -311,7 +311,6 @@
* @param beans The beans to filter
* @return A set of filtered beans
*/
- @SuppressWarnings("unchecked")
private <T> Set<Bean<T>> getMatchingBeans(AnnotatedItem<T, ?> element, List<Bean<?>> beans)
{
Set<Bean<T>> resolvedBeans = new HashSet<Bean<T>>();
@@ -319,7 +318,9 @@
{
if (element.isAssignableFrom(bean.getTypes()) && containsAllBindingBindingTypes(element, bean.getBindings()))
{
- resolvedBeans.add((Bean<T>) bean);
+ @SuppressWarnings("unchecked")
+ Bean<T> b = (Bean<T>) bean;
+ resolvedBeans.add(b);
}
}
return resolvedBeans;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -68,6 +68,7 @@
*
* @return The type parameter
*/
+ // TODO This ain't right!
@SuppressWarnings("unchecked")
protected Class<P> getTypeParameter()
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -172,7 +172,7 @@
ProxyFactory proxyFactory = Proxies.getProxyFactory(getTypes());
@SuppressWarnings("unchecked")
- Class<T> proxyClass = proxyFactory.createClass();
+ Class<T> proxyClass = proxyFactory.createClass().asSubclass(getType());
this.proxyClass = proxyClass;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EventBean.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -116,22 +116,27 @@
*
* @return an event instance
*/
- @SuppressWarnings("unchecked")
@Override
public Event<T> create()
{
try
{
DependentContext.INSTANCE.setActive(true);
- Class eventType = null;
+ Class<?> clazz;
if (this.getAnnotatedItem() instanceof AnnotatedParameter)
{
- eventType = Object.class;
- } else
+ clazz = Object.class;
+ }
+ else
{
- eventType = (Class<T>) getAnnotatedItem().getActualTypeArguments()[0];
+ clazz = Class.class.cast(getAnnotatedItem().getActualTypeArguments()[0]);
}
- return new EventImpl(eventType, manager, getBindingTypesArray());
+ // TODO should be able to move this up into annotated item?!
+
+ @SuppressWarnings("unchecked")
+ Class<T> eventType = (Class<T>) clazz;
+
+ return new EventImpl<T>(eventType, manager, getBindingTypesArray());
}
finally
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InjectionPointBean.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -49,11 +49,11 @@
super(field, manager);
}
- @SuppressWarnings("unchecked")
@Override
public T create()
{
- return (T) manager.getInjectionPointProvider().getPreviousInjectionPoint();
+ // TODO Why do we need to cast here?
+ return getType().cast(manager.getInjectionPointProvider().getPreviousInjectionPoint());
}
@Override
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -229,7 +229,6 @@
* @param bean The bean representation
* @param beans The set of created beans
*/
- @SuppressWarnings("unchecked")
protected void createBean(AbstractClassBean<?> bean, AnnotatedClass<?> annotatedClass, Set<AbstractBean<?, ?>> beans)
{
beans.add(bean);
@@ -248,7 +247,7 @@
beans.add(producerFieldBean);
log.info("Web Bean: " + producerFieldBean);
}
- for (AnnotatedItem injectionPoint : bean.getAnnotatedInjectionPoints())
+ for (AnnotatedItem<?, ?> injectionPoint : bean.getAnnotatedInjectionPoints())
{
if (injectionPoint.isAnnotationPresent(Fires.class))
{
@@ -256,7 +255,9 @@
}
if (injectionPoint.isAnnotationPresent(Obtains.class))
{
- InstanceBean<Object, Field> instanceBean = InstanceBean.of(injectionPoint, getManager());
+ // TODO FIx this
+ @SuppressWarnings("unchecked")
+ InstanceBean<Object, Field> instanceBean = InstanceBean.of((AnnotatedItem) injectionPoint, getManager());
beans.add(instanceBean);
log.info("Web Bean: " + instanceBean);
}
@@ -320,10 +321,12 @@
* @param eventType The event type to observe
* @param bindings The binding types to observe on
*/
- @SuppressWarnings("unchecked")
private <T> void registerObserver(Observer<T> observer, Class<?> eventType, Annotation[] bindings)
{
- getManager().addObserver(observer, (Class<T>) eventType, bindings);
+ // TODO Fix this!
+ @SuppressWarnings("unchecked")
+ Class<T> clazz = (Class<T>) eventType;
+ getManager().addObserver(observer, clazz, bindings);
}
/**
@@ -333,21 +336,21 @@
* @param injectionPoints A set of injection points to inspect
* @param beans A set of beans to add the Event beans to
*/
- @SuppressWarnings("unchecked")
private void registerEvents(Set<AnnotatedItem<?, ?>> injectionPoints, Set<AbstractBean<?, ?>> beans)
{
- for (AnnotatedItem injectionPoint : injectionPoints)
+ for (AnnotatedItem<?, ?> injectionPoint : injectionPoints)
{
registerEvent(injectionPoint, beans);
}
}
- @SuppressWarnings("unchecked")
- private void registerEvent(AnnotatedItem injectionPoint, Set<AbstractBean<?, ?>> beans)
+ private void registerEvent(AnnotatedItem<?, ?> injectionPoint, Set<AbstractBean<?, ?>> beans)
{
if (injectionPoint.isAnnotationPresent(Fires.class))
{
- EventBean<Object, Method> eventBean = EventBean.of(injectionPoint, getManager());
+ // TODO Fix this!
+ @SuppressWarnings("unchecked")
+ EventBean<Object, Method> eventBean = EventBean.of((AnnotatedItem) injectionPoint, getManager());
beans.add(eventBean);
log.info("Web Bean: " + eventBean);
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/AbstractBeanMap.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -67,10 +67,9 @@
/**
* Clears the bean map
*/
- @SuppressWarnings("unchecked")
public void clear()
{
- Enumeration names = getAttributeNames();
+ Enumeration<String> names = getAttributeNames();
while (names.hasMoreElements())
{
String name = (String) names.nextElement();
@@ -85,11 +84,10 @@
*
* @return The beans
*/
- @SuppressWarnings("unchecked")
public Iterable<Contextual<? extends Object>> keySet()
{
List<Contextual<?>> beans = new ArrayList<Contextual<?>>();
- Enumeration names = getAttributeNames();
+ Enumeration<String> names = getAttributeNames();
while (names.hasMoreElements())
{
String name = (String) names.nextElement();
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SimpleBeanMap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SimpleBeanMap.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/context/beanmap/SimpleBeanMap.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -57,9 +57,9 @@
*
* @see org.jboss.webbeans.context.beanmap.BeanMap#get(Bean)
*/
- @SuppressWarnings("unchecked")
public <T extends Object> T get(Contextual<? extends T> bean)
{
+ @SuppressWarnings("unchecked")
T instance = (T) super.get(bean);
log.trace("Searched bean map for " + bean + " and got " + instance);
return instance;
@@ -84,9 +84,9 @@
*
* @see org.jboss.webbeans.context.beanmap.BeanMap#remove(Bean)
*/
- @SuppressWarnings("unchecked")
public <T extends Object> T remove(Contextual<? extends T> bean)
{
+ @SuppressWarnings("unchecked")
T instance = (T) super.remove(bean);
log.trace("Removed instace " + instance + " for bean " + bean + " from the bean map");
return instance;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/SessionBeanInterceptor.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -74,13 +74,15 @@
* @param invocationContext The invocation context
* @return The found bean or null if the bean was not an enterprise bean
*/
- @SuppressWarnings("unchecked")
private static <T> EnterpriseBean<T> getBean(Class<? extends T> beanClass)
{
Bean<?> bean = CurrentManager.rootManager().getBeanMap().get(beanClass);
if (bean instanceof EnterpriseBean)
{
- return (EnterpriseBean<T>) bean;
+ @SuppressWarnings("unchecked")
+ // TODO shift this into the map!
+ EnterpriseBean<T> enterpriseBean = (EnterpriseBean<T>) bean;
+ return enterpriseBean;
}
else
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -154,7 +154,6 @@
* @return A set of Observers. An empty set is returned if there are no
* matches.
*/
- @SuppressWarnings("unchecked")
public <T> Set<Observer<T>> getObservers(T event, Annotation... bindings)
{
Set<Observer<T>> interestedObservers = new HashSet<Observer<T>>();
@@ -164,7 +163,10 @@
{
if (observer.isObserverInterested(bindings))
{
- interestedObservers.add((Observer<T>) observer.getObserver());
+ // TODO Fix this!
+ @SuppressWarnings("unchecked")
+ Observer<T> o = (Observer<T>) observer.getObserver();
+ interestedObservers.add(o);
}
}
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -163,7 +163,6 @@
return result;
}
- @SuppressWarnings("unchecked")
@Override
public boolean equals(Object other)
{
@@ -171,6 +170,7 @@
{
return false;
}
+ @SuppressWarnings("unchecked")
EventObserver<T> otherObserver = (EventObserver<T>) other;
if (!eventType.equals(otherObserver.getEventType()))
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -28,6 +28,7 @@
import java.util.Set;
import javax.webbeans.BindingType;
+
import org.jboss.webbeans.binding.CurrentBinding;
import org.jboss.webbeans.introspector.AnnotatedItem;
import org.jboss.webbeans.util.Proxies;
@@ -233,10 +234,9 @@
*
* @see org.jboss.webbeans.introspector.AnnotatedItem#getAnnotation(Class)
*/
- @SuppressWarnings("unchecked")
public <A extends Annotation> A getAnnotation(Class<? extends A> annotationType)
{
- return (A) annotationMap.get(annotationType);
+ return annotationType.cast(annotationMap.get(annotationType));
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -44,14 +44,13 @@
*
* @param annotationMap The annotation map
*/
- @SuppressWarnings("unchecked")
public AbstractAnnotatedType(AnnotationMap annotationMap, Class<T> type)
{
super(annotationMap);
this.name = type.getName();
if (type.getSuperclass() != null)
{
- this.superclass = new AnnotatedClassImpl(type.getSuperclass());
+ this.superclass = AnnotatedClassImpl.of(type.getSuperclass());
}
else
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -250,7 +250,6 @@
* @param type The type of the class
* @param annotations The array of annotations on the class
*/
- @SuppressWarnings("unchecked")
public AnnotatedClassImpl(Class<T> rawType, Type type, Annotation[] annotations)
{
super(buildAnnotationMap(annotations), rawType);
@@ -294,7 +293,9 @@
this.annotatedConstructors = new AnnotatedConstructorMap();
for (Constructor<?> constructor : clazz.getDeclaredConstructors())
{
- AnnotatedConstructor<T> annotatedConstructor = new AnnotatedConstructorImpl<T>((Constructor<T>) constructor, this);
+ @SuppressWarnings("unchecked")
+ Constructor<T> c = (Constructor<T>) constructor;
+ AnnotatedConstructor<T> annotatedConstructor = AnnotatedConstructorImpl.of(c, this);
if (!constructor.isAccessible())
{
constructor.setAccessible(true);
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -59,6 +59,11 @@
// Cached string representation
private String toString;
+
+ public static <T> AnnotatedConstructor<T> of(Constructor<T> constructor, AnnotatedType<T> declaringClass)
+ {
+ return new AnnotatedConstructorImpl<T>(constructor, declaringClass);
+ }
/**
* Constructor
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -74,7 +74,6 @@
* @param method The underlying method
* @param declaringClass The declaring class abstraction
*/
- @SuppressWarnings("unchecked")
public AnnotatedMethodImpl(Method method, AnnotatedType<?> declaringClass)
{
super(buildAnnotationMap(method), method);
@@ -245,22 +244,19 @@
* @see org.jboss.webbeans.introspector.AnnotatedMethod#invoke(ManagerImpl,
* Object)
*/
- @SuppressWarnings("unchecked")
public T invoke(Object instance, ManagerImpl manager)
{
- return (T) Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, manager));
+ return getType().cast(Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, manager)));
}
- @SuppressWarnings("unchecked")
public T invokeOnInstance(Object instance, ManagerImpl manager)
{
- return (T) Reflections.invokeAndWrap(getName(), getParameterTypesAsArray(), instance, getParameterValues(parameters, manager));
+ return getType().cast(Reflections.invokeAndWrap(getName(), getParameterTypesAsArray(), instance, getParameterValues(parameters, manager)));
}
- @SuppressWarnings("unchecked")
public T invokeWithSpecialValue(Object instance, Class<? extends Annotation> specialParam, Object specialVal, ManagerImpl manager)
{
- return (T) Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, specialVal, specialParam, manager));
+ return getType().cast(Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, specialVal, specialParam, manager)));
}
/**
@@ -272,10 +268,9 @@
* @see org.jboss.webbeans.introspector.AnnotatedMethod#invoke(Object,
* Object...)
*/
- @SuppressWarnings("unchecked")
public T invoke(Object instance, Object... parameters)
{
- return (T) Reflections.invokeAndWrap(getDelegate(), instance, parameters);
+ return getType().cast(Reflections.invokeAndWrap(getDelegate(), instance, parameters));
}
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/AbstractNaming.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/AbstractNaming.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/resource/AbstractNaming.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -45,7 +45,6 @@
* @param expectedType The expected return type
* @return The found item
*/
- @SuppressWarnings("unchecked")
public <T> T lookup(String name, Class<? extends T> expectedType)
{
Object instance;
@@ -59,7 +58,7 @@
}
try
{
- return (T) instance;
+ return expectedType.cast(instance);
}
catch (ClassCastException e)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/ConcurrentCache.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -51,10 +51,12 @@
* @param key The key to look for
* @return The Future instance of the value
*/
- @SuppressWarnings("unchecked")
+
public <T extends V> Future<T> getFuture(K key)
{
- return (Future<T>) super.get(key);
+ @SuppressWarnings("unchecked")
+ Future<T> future = (Future<T>) super.get(key);
+ return future;
}
/**
@@ -63,9 +65,9 @@
* @param key The key to look for
* @return The value
*/
- @SuppressWarnings("unchecked")
public <T extends V> T getValue(K key)
{
+ @SuppressWarnings("unchecked")
Future<T> value = (Future<T>) map.get(key);
if (value != null)
{
@@ -110,15 +112,18 @@
* @param callable The item, wrapped in a Callable instance
* @return The item added
*/
- @SuppressWarnings("unchecked")
public <E> E putIfAbsent(K key, Callable<E> callable)
{
- Future<E> value = (Future<E>) map.get(key);
+ @SuppressWarnings("unchecked")
+ Future<E> future = (Future<E>) map.get(key);
+ Future<E> value = future;
if (value == null)
{
FutureTask<E> task = new FutureTask<E>(callable);
value = task;
- map.put(key, (Future<V>) task);
+ @SuppressWarnings("unchecked")
+ Future<V> t = (Future<V>) task;
+ map.put(key, t);
task.run();
}
boolean interrupted = false;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/DeploymentProperties.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/DeploymentProperties.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/DeploymentProperties.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -153,7 +153,6 @@
* @param propertyName The name of the property to load
* @return A set of classes specified
*/
- @SuppressWarnings("unchecked")
public static <T> Set<Class<? extends T>> getClasses(DeploymentProperties deploymentProperties, ResourceLoader resourceLoader, String propertyName, Class<T> expectedType)
{
Set<Class<? extends T>> classes = new HashSet<Class<? extends T>>();
@@ -161,7 +160,9 @@
{
try
{
- classes.add((Class<? extends T>) resourceLoader.classForName(className));
+ @SuppressWarnings("unchecked")
+ Class<? extends T> classForName = (Class<? extends T>) resourceLoader.classForName(className);
+ classes.add(classForName);
}
catch (ResourceLoadingException e)
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationIterator.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationIterator.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/EnumerationIterator.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -25,18 +25,17 @@
*
* @author Pete Muir
*/
- at SuppressWarnings("unchecked")
public class EnumerationIterator<T> implements Iterator<T>
{
// The enumeration
- private Enumeration e;
+ private Enumeration<T> e;
/**
* Constructor
*
* @param e The enumeration
*/
- public EnumerationIterator(Enumeration e)
+ public EnumerationIterator(Enumeration<T> e)
{
this.e = e;
}
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-01-14 01:24:09 UTC (rev 940)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/Reflections.java 2009-01-14 02:04:15 UTC (rev 941)
@@ -256,7 +256,6 @@
* @return A list of matching constructors. An empty list is returned if no
* matches are found
*/
- @SuppressWarnings("unchecked")
public static <T> List<Constructor<T>> getAnnotatedConstructors(Class<? extends T> clazz, Class<? extends Annotation> annotationType)
{
List<Constructor<T>> constructors = new ArrayList<Constructor<T>>();
@@ -264,7 +263,9 @@
{
if (constructor.isAnnotationPresent(annotationType))
{
- constructors.add((Constructor<T>) constructor);
+ @SuppressWarnings("unchecked")
+ Constructor<T> c = (Constructor<T>) constructor;
+ constructors.add(c);
}
}
return constructors;
@@ -279,7 +280,6 @@
* @return A list of matching constructors. An empty list is returned if no
* matches are found
*/
- @SuppressWarnings("unchecked")
public static <T> List<Constructor<T>> getConstructorsForAnnotatedParameter(Class<? extends T> clazz, Class<? extends Annotation> parameterAnnotationType)
{
List<Constructor<T>> constructors = new ArrayList<Constructor<T>>();
@@ -291,7 +291,9 @@
{
if (annotation.annotationType().equals(parameterAnnotationType))
{
- constructors.add((Constructor<T>) constructor);
+ @SuppressWarnings("unchecked")
+ Constructor<T> c = (Constructor<T>) constructor;
+ constructors.add(c);
}
}
}
@@ -308,7 +310,6 @@
* @return A list of matching constructors. An empty list is returned if no
* matches are found
*/
- @SuppressWarnings("unchecked")
public static <T> List<Constructor<T>> getConstructorsForMetaAnnotatedParameter(Class<? extends T> clazz, Class<? extends Annotation> metaAnnotationType)
{
List<Constructor<T>> constructors = new ArrayList<Constructor<T>>();
@@ -320,7 +321,9 @@
{
if (annotation.annotationType().isAnnotationPresent(metaAnnotationType))
{
- constructors.add((Constructor<T>) constructor);
+ @SuppressWarnings("unchecked")
+ Constructor<T> c = (Constructor<T>) constructor;
+ constructors.add(c);
}
}
}
More information about the weld-commits
mailing list