[jboss-cvs] jboss-seam/examples/spring/src/org/jboss/seam/ioc/spring ...

[Norman Richards]

  User: nrichards
  Date: 07/02/15 02:34:59

  Modified:    examples/spring/src/org/jboss/seam/ioc/spring  
                        SeamNamespaceHandler.java SeamFactoryBean.java
  Log:
  cleanup
  
  Revision  Changes    Path
  1.2       +26 -24    jboss-seam/examples/spring/src/org/jboss/seam/ioc/spring/SeamNamespaceHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamNamespaceHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/spring/src/org/jboss/seam/ioc/spring/SeamNamespaceHandler.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SeamNamespaceHandler.java	9 Feb 2007 17:37:18 -0000	1.1
  +++ SeamNamespaceHandler.java	15 Feb 2007 07:34:59 -0000	1.2
  @@ -7,9 +7,9 @@
   /**
    * @author youngm
    */
  -public class SeamNamespaceHandler extends NamespaceHandlerSupport
  +public class SeamNamespaceHandler 
  +    extends NamespaceHandlerSupport
   {
  -
      /**
       * @see org.springframework.beans.factory.xml.NamespaceHandler#init()
       */
  @@ -18,7 +18,8 @@
         registerBeanDefinitionParser("instance", new SeamBeanBeanDefinitionParser());
      }
   
  -   private static class SeamBeanBeanDefinitionParser extends AbstractSimpleBeanDefinitionParser
  +    private static class SeamBeanBeanDefinitionParser 
  +        extends AbstractSimpleBeanDefinitionParser
      {
   
         protected Class getBeanClass(Element element)
  @@ -26,10 +27,11 @@
            return SeamFactoryBean.class;
         }
   
  -/*		protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
  +        /*              
  +        protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) {
   			String id = super.resolveId(element, definition, parserContext);
   			return id;
  -		}*/
      }
  -
  +       */
  +    }
   }
  
  
  
  1.2       +91 -96    jboss-seam/examples/spring/src/org/jboss/seam/ioc/spring/SeamFactoryBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamFactoryBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/examples/spring/src/org/jboss/seam/ioc/spring/SeamFactoryBean.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- SeamFactoryBean.java	9 Feb 2007 17:37:18 -0000	1.1
  +++ SeamFactoryBean.java	15 Feb 2007 07:34:59 -0000	1.2
  @@ -10,17 +10,19 @@
    *
    * @author youngm
    */
  -public class SeamFactoryBean extends AbstractFactoryBean implements InitializingBean
  +public class SeamFactoryBean 
  +    extends AbstractFactoryBean 
  +    implements InitializingBean
   {
  +    private ScopeType scope;
  +    private String name;
  +    private Boolean create;
   
      public SeamFactoryBean()
      {
         setSingleton(false);
      }
   
  -   private ScopeType scope;
  -   private String name;
  -   private Boolean create;
   
      /**
       * Ensure name is not null
  @@ -28,10 +30,10 @@
       * @see org.springframework.beans.factory.config.AbstractFactoryBean#afterPropertiesSet()
       */
      @Override
  -   public void afterPropertiesSet() throws Exception
  -   {
  -      if (name == null)
  +    public void afterPropertiesSet() 
  +        throws Exception
         {
  +        if (name == null) {
            throw new IllegalArgumentException("name must not be null");
         }
         super.afterPropertiesSet();
  @@ -43,22 +45,16 @@
       * @see org.springframework.beans.factory.config.AbstractFactoryBean#createInstance()
       */
      @Override
  -   protected Object createInstance() throws Exception
  -   {
  -      if (scope == null && create == null)
  +    protected Object createInstance() 
  +        throws Exception
         {
  +        if (scope == null && create == null) {
            return Component.getInstance(name);
  -      }
  -      else if (scope == null)
  -      {
  +        } else if (scope == null) {
            return Component.getInstance(name, create);
  -      }
  -      else if (create == null)
  -      {
  +        } else if (create == null) {
            return Component.getInstance(name, scope);
  -      }
  -      else
  -      {
  +        } else {
            return Component.getInstance(name, scope, create);
         }
      }
  @@ -72,8 +68,7 @@
      public Class getObjectType()
      {
         Component component = Component.forName(name);
  -      if (component == null)
  -      {
  +        if (component == null) {
            return null;
         }
         return component.getBeanClass();