[Springframework-cvs] spring/src/org/springframework/beans/factory/wiring BeanWiringInfo.java, 1.3, 1.4 BeanWiringInfoResolver.java, 1.1, 1.2

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/beans/factory/wiring
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv10953/src/org/springframework/beans/factory/wiring

Modified Files:
	BeanWiringInfo.java BeanWiringInfoResolver.java 
Log Message:
revised javadoc

Index: BeanWiringInfo.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/beans/factory/wiring/BeanWiringInfo.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BeanWiringInfo.java	27 Dec 2006 14:36:25 -0000	1.3
--- BeanWiringInfo.java	28 Feb 2007 14:02:57 -0000	1.4
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2006 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 21,29 ****
  
  /**
!  * Class holding wiring metadata information about a bean definition.
   *
   * @author Rod Johnson
   * @author Juergen Hoeller
   * @since 2.0
   */
  public class BeanWiringInfo {
--- 21,34 ----
  
  /**
!  * Holder for bean wiring metadata information about a particular class. Used in
!  * conjunction with the {@link org.springframework.beans.factory.annotation.Configurable}
!  * annotation and the AspectJ <code>AnnotationBeanConfigurerAspect</code>.
   *
   * @author Rod Johnson
   * @author Juergen Hoeller
   * @since 2.0
+  * @see BeanWiringInfoResolver
+  * @see org.springframework.beans.factory.config.AutowireCapableBeanFactory
+  * @see org.springframework.beans.factory.annotation.Configurable
   */
  public class BeanWiringInfo {
***************
*** 31,45 ****
  	/**
  	 * Constant that indicates autowiring bean properties by name.
- 	 *
  	 * @see #BeanWiringInfo(int, boolean)
  	 */
! 	public static final int AUTOWIRE_BY_NAME = 1;
  
  	/**
  	 * Constant that indicates autowiring bean properties by type.
- 	 *
  	 * @see #BeanWiringInfo(int, boolean)
  	 */
! 	public static final int AUTOWIRE_BY_TYPE = 2;
  
  
--- 36,50 ----
  	/**
  	 * Constant that indicates autowiring bean properties by name.
  	 * @see #BeanWiringInfo(int, boolean)
+ 	 * @see org.springframework.beans.factory.config.AutowireCapableBeanFactory#AUTOWIRE_BY_NAME
  	 */
! 	public static final int AUTOWIRE_BY_NAME = AutowireCapableBeanFactory.AUTOWIRE_BY_NAME;
  
  	/**
  	 * Constant that indicates autowiring bean properties by type.
  	 * @see #BeanWiringInfo(int, boolean)
+ 	 * @see org.springframework.beans.factory.config.AutowireCapableBeanFactory#AUTOWIRE_BY_TYPE
  	 */
! 	public static final int AUTOWIRE_BY_TYPE = AutowireCapableBeanFactory.AUTOWIRE_BY_TYPE;
  
  
***************
*** 53,59 ****
  	/**
  	 * Create a new BeanWiringInfo that points to the given bean name.
- 	 *
  	 * @param beanName the name of the bean definition to take the property values from
! 	 * @throws IllegalArgumentException if the supplied beanName is <code>null</code>, is empty, or consists wholly of whitespace
  	 */
  	public BeanWiringInfo(String beanName) {
--- 58,64 ----
  	/**
  	 * Create a new BeanWiringInfo that points to the given bean name.
  	 * @param beanName the name of the bean definition to take the property values from
! 	 * @throws IllegalArgumentException if the supplied beanName is <code>null</code>,
! 	 * is empty, or consists wholly of whitespace
  	 */
  	public BeanWiringInfo(String beanName) {
***************
*** 64,74 ****
  	/**
  	 * Create a new BeanWiringInfo that indicates autowiring.
! 	 *
! 	 * @param autowireMode	either constant AUTOWIRE_BY_NAME or AUTOWIRE_BY_TYPE
  	 * @param dependencyCheck whether to perform a dependency check for object
! 	 *                        references in the bean instance (after autowiring)
! 	 * @throws IllegalArgumentException if the supplied autowireMode is not one of the allowed values
! 	 * @see org.springframework.beans.factory.config.AutowireCapableBeanFactory#AUTOWIRE_BY_NAME
! 	 * @see org.springframework.beans.factory.config.AutowireCapableBeanFactory#AUTOWIRE_BY_TYPE
  	 */
  	public BeanWiringInfo(int autowireMode, boolean dependencyCheck) {
--- 69,80 ----
  	/**
  	 * Create a new BeanWiringInfo that indicates autowiring.
! 	 * @param autowireMode one of the constants {@link #AUTOWIRE_BY_NAME} /
! 	 * {@link #AUTOWIRE_BY_TYPE}
  	 * @param dependencyCheck whether to perform a dependency check for object
! 	 * references in the bean instance (after autowiring)
! 	 * @throws IllegalArgumentException if the supplied <code>autowireMode</code>
! 	 * is not one of the allowed values
! 	 * @see #AUTOWIRE_BY_NAME
! 	 * @see #AUTOWIRE_BY_TYPE
  	 */
  	public BeanWiringInfo(int autowireMode, boolean dependencyCheck) {
***************
*** 92,103 ****
  	 */
  	public String getBeanName() {
! 		return beanName;
  	}
  
  	/**
! 	 * Return the constant AUTOWIRE_BY_NAME or AUTOWIRE_BY_TYPE, if autowiring is indicated.
  	 */
  	public int getAutowireMode() {
! 		return autowireMode;
  	}
  
--- 98,110 ----
  	 */
  	public String getBeanName() {
! 		return this.beanName;
  	}
  
  	/**
! 	 * Return one of the constants {@link #AUTOWIRE_BY_NAME} /
! 	 * {@link #AUTOWIRE_BY_TYPE}, if autowiring is indicated.
  	 */
  	public int getAutowireMode() {
! 		return this.autowireMode;
  	}
  
***************
*** 107,111 ****
  	 */
  	public boolean getDependencyCheck() {
! 		return dependencyCheck;
  	}
  
--- 114,118 ----
  	 */
  	public boolean getDependencyCheck() {
! 		return this.dependencyCheck;
  	}
  

Index: BeanWiringInfoResolver.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/beans/factory/wiring/BeanWiringInfoResolver.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BeanWiringInfoResolver.java	16 Jan 2006 12:11:02 -0000	1.1
--- BeanWiringInfoResolver.java	28 Feb 2007 14:02:58 -0000	1.2
***************
*** 1,4 ****
  /*
!  * Copyright 2002-2005 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
--- 1,4 ----
  /*
!  * Copyright 2002-2007 the original author or authors.
   *
   * Licensed under the Apache License, Version 2.0 (the "License");
***************
*** 20,36 ****
   * Strategy interface to be implemented by objects than can resolve bean name
   * information, given a newly instantiated bean object. Invocations to the
!  * <code>resolve(Object)</code> method on this interface will be driven by
   * the AspectJ pointcut in the relevant concrete aspect.
   *
   * <p>Metadata resolution strategy can be pluggable. A good default is
!  * ClassNameBeanWiringInfoResolver, which uses the fully-qualified class
!  * name as bean name.
   *
   * @author Rod Johnson
   * @since 2.0
   * @see ClassNameBeanWiringInfoResolver
   */
  public interface BeanWiringInfoResolver {
! 	
  	/**
  	 * Resolve the BeanWiringInfo for the given bean instance.
--- 20,38 ----
   * Strategy interface to be implemented by objects than can resolve bean name
   * information, given a newly instantiated bean object. Invocations to the
!  * {@link #resolveWiringInfo} method on this interface will be driven by
   * the AspectJ pointcut in the relevant concrete aspect.
   *
   * <p>Metadata resolution strategy can be pluggable. A good default is
!  * {@link ClassNameBeanWiringInfoResolver}, which uses the fully-qualified
!  * class name as bean name.
   *
   * @author Rod Johnson
   * @since 2.0
+  * @see BeanWiringInfo
   * @see ClassNameBeanWiringInfoResolver
+  * @see org.springframework.beans.factory.annotation.AnnotationBeanWiringInfoResolver
   */
  public interface BeanWiringInfoResolver {
! 
  	/**
  	 * Resolve the BeanWiringInfo for the given bean instance.
***************
*** 39,42 ****
  	 */
  	BeanWiringInfo resolveWiringInfo(Object beanInstance);
! 	
  }
--- 41,44 ----
  	 */
  	BeanWiringInfo resolveWiringInfo(Object beanInstance);
! 
  }