[weld-commits] Weld SVN: r6839 - core/trunk/impl/src/main/java/org/jboss/weld/util/reflection.
Author: pete.muir(a)jboss.org
Date: 2010-07-29 12:35:36 -0400 (Thu, 29 Jul 2010)
New Revision: 6839
Modified:
core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java
Log:
minor
Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java
===================================================================
---
core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java 2010-07-29
12:21:41 UTC (rev 6838)
+++
core/trunk/impl/src/main/java/org/jboss/weld/util/reflection/Reflections.java 2010-07-29
16:35:36 UTC (rev 6839)
@@ -41,8 +41,6 @@
import org.slf4j.cal10n.LocLogger;
import org.slf4j.ext.XLogger;
-import ch.qos.cal10n.IMessageConveyor;
-
/**
* Utility class for static reflection-type operations
*
@@ -55,9 +53,6 @@
static final LocLogger log = loggerFactory().getLogger(UTIL);
static final XLogger xLog = loggerFactory().getXLogger(UTIL);
- // Exception messages
- private static final IMessageConveyor messageConveyer =
loggerFactory().getMessageConveyor();
-
public static final Type[] EMPTY_TYPES = {};
public static final Annotation[] EMPTY_ANNOTATIONS = {};
public static final Class<?>[] EMPTY_CLASSES = new Class<?>[0];
@@ -391,7 +386,7 @@
public static boolean isAssignableFrom(Type type1, Type type2)
{
- if (type1 instanceof Class)
+ if (type1 instanceof Class<?>)
{
Class<?> clazz = (Class<?>) type1;
if (isAssignableFrom(clazz, EMPTY_TYPES, type2))
@@ -402,7 +397,7 @@
if (type1 instanceof ParameterizedType)
{
ParameterizedType parameterizedType1 = (ParameterizedType) type1;
- if (parameterizedType1.getRawType() instanceof Class)
+ if (parameterizedType1.getRawType() instanceof Class<?>)
{
if (isAssignableFrom((Class<?>) parameterizedType1.getRawType(),
parameterizedType1.getActualTypeArguments(), type2))
{
@@ -458,7 +453,7 @@
if (type1 instanceof ParameterizedType)
{
ParameterizedType parameterizedType1 = (ParameterizedType) type1;
- if (parameterizedType1.getRawType() instanceof Class)
+ if (parameterizedType1.getRawType() instanceof Class<?>)
{
if (matches((Class<?>) parameterizedType1.getRawType(),
parameterizedType1.getActualTypeArguments(), type2))
{
@@ -525,7 +520,7 @@
if (type2 instanceof ParameterizedType)
{
ParameterizedType parameterizedType = (ParameterizedType) type2;
- if (parameterizedType.getRawType() instanceof Class)
+ if (parameterizedType.getRawType() instanceof Class<?>)
{
if (isAssignableFrom(rawType1, actualTypeArguments1, (Class<?>)
parameterizedType.getRawType(), parameterizedType.getActualTypeArguments()))
{
@@ -533,7 +528,7 @@
}
}
}
- else if (type2 instanceof Class)
+ else if (type2 instanceof Class<?>)
{
Class<?> clazz = (Class<?>) type2;
if (isAssignableFrom(rawType1, actualTypeArguments1, clazz, EMPTY_TYPES))
@@ -541,9 +536,9 @@
return true;
}
}
- else if (type2 instanceof TypeVariable)
+ else if (type2 instanceof TypeVariable<?>)
{
- TypeVariable typeVariable = (TypeVariable) type2;
+ TypeVariable<?> typeVariable = (TypeVariable<?>) type2;
if (isTypeBounded(rawType1, actualTypeArguments1, typeVariable.getBounds()))
{
return true;