[weld-commits] Weld SVN: r5479 - core/trunk/impl/src/main/java/org/jboss/weld/injection.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-15 11:36:27 -0500 (Fri, 15 Jan 2010)
New Revision: 5479

Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
   core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
   core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java
   core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java
   core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java
Log:
minor

Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java	2010-01-15 13:55:00 UTC (rev 5478)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ConstructorInjectionPoint.java	2010-01-15 16:36:27 UTC (rev 5479)
@@ -240,21 +240,21 @@
          Bean<T> bean = getDeclaringBean();
          if (constructor == null || bean == null)
          {
-            throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_CONSTRUCTOR_ON_DESERIALIZATION, getDeclaringBeanId(), getWeldClass(), signature);
+            throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_CONSTRUCTOR_ON_DESERIALIZATION, getDeclaringBeanId(), getDeclaringWeldClass(), signature);
          }
          return ConstructorInjectionPoint.of(getDeclaringBean(), getWeldConstructor());
       }
       
       protected WeldConstructor<T> getWeldConstructor()
       {
-         return getWeldClass().getDeclaredWeldConstructor(signature);
+         return getDeclaringWeldClass().getDeclaredWeldConstructor(signature);
       }
       
       @SuppressWarnings("unchecked")
       @Override
-      protected WeldClass<T> getWeldClass()
+      protected WeldClass<T> getDeclaringWeldClass()
       {
-         return (WeldClass<T>) super.getWeldClass();
+         return (WeldClass<T>) super.getDeclaringWeldClass();
       }
       
    }

Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java	2010-01-15 13:55:00 UTC (rev 5478)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/FieldInjectionPoint.java	2010-01-15 16:36:27 UTC (rev 5479)
@@ -169,14 +169,14 @@
          Bean<T> bean = getDeclaringBean();
          if (field == null || bean == null)
          {
-            throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_FIELD_ON_DESERIALIZATION, getDeclaringBeanId(), getWeldClass(), fieldName);
+            throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_FIELD_ON_DESERIALIZATION, getDeclaringBeanId(), getDeclaringWeldClass(), fieldName);
          }
          return FieldInjectionPoint.of(getDeclaringBean(), getWeldField());
       }
       
       protected WeldField<T, ?> getWeldField()
       {
-         return getWeldClass().getDeclaredWeldField(fieldName);
+         return getDeclaringWeldClass().getDeclaredWeldField(fieldName);
       }
       
    }

Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java	2010-01-15 13:55:00 UTC (rev 5478)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/MethodInjectionPoint.java	2010-01-15 16:36:27 UTC (rev 5479)
@@ -330,14 +330,14 @@
          Bean<T> bean = getDeclaringBean();
          if (method == null || bean == null)
          {
-            throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_METHOD_ON_DESERIALIZATION, getDeclaringBeanId(), getWeldClass(), signature);
+            throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_METHOD_ON_DESERIALIZATION, getDeclaringBeanId(), getDeclaringWeldClass(), signature);
          }
          return MethodInjectionPoint.of(getDeclaringBean(), getWeldMethod());
       }
       
       protected WeldMethod<T, ?> getWeldMethod()
       {
-         return getWeldClass().getDeclaredWeldMethod(signature);
+         return getDeclaringWeldClass().getDeclaredWeldMethod(signature);
       }
       
    }

Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java	2010-01-15 13:55:00 UTC (rev 5478)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/ParameterInjectionPoint.java	2010-01-15 16:36:27 UTC (rev 5479)
@@ -172,7 +172,7 @@
          Bean<T> bean = getDeclaringBean();
          if (parameter == null || bean == null)
          {
-            throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_PARAMETER_ON_DESERIALIZATION, getDeclaringBeanId(), getWeldClass(), methodSignature, parameterPosition);
+            throw new ForbiddenStateException(ReflectionMessage.UNABLE_TO_GET_PARAMETER_ON_DESERIALIZATION, getDeclaringBeanId(), getDeclaringWeldClass(), methodSignature, parameterPosition);
          }
          return ParameterInjectionPoint.of(getDeclaringBean(), getWeldParameter());
       }
@@ -181,7 +181,7 @@
       {
          if (methodSignature != null)
          {
-            WeldMethod<?, ?> method = getWeldClass().getDeclaredWeldMethod(methodSignature);
+            WeldMethod<?, ?> method = getDeclaringWeldClass().getDeclaredWeldMethod(methodSignature);
             if (method.getParameters().size() > parameterPosition)
             {
                WeldParameter<?, ?> p = method.getWeldParameters().get(parameterPosition);
@@ -198,7 +198,7 @@
          }
          else if (constructorSignature != null)
          {
-            WeldConstructor<?> constructor = getWeldClass().getDeclaredWeldConstructor(constructorSignature);
+            WeldConstructor<?> constructor = getDeclaringWeldClass().getDeclaredWeldConstructor(constructorSignature);
             if (constructor.getParameters().size() > parameterPosition)
             {
                WeldParameter<?, ?> p = constructor.getWeldParameters().get(parameterPosition);

Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java	2010-01-15 13:55:00 UTC (rev 5478)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java	2010-01-15 16:36:27 UTC (rev 5479)
@@ -49,7 +49,7 @@
          return Container.instance().services().get(ContextualStore.class).<Bean<T>, T>getContextual(declaringBeanId);
       }
       
-      protected WeldClass<?> getWeldClass()
+      protected WeldClass<?> getDeclaringWeldClass()
       {
          return Container.instance().services().get(ClassTransformer.class).loadClass(declaringClass);
       }