avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From blorit...@apache.org
Subject cvs commit: avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory AbstractObjectFactory.java BCELCodeGenerator.java BCELWrapperGenerator.java ProxyManager.java ProxyObjectFactory.java WrapperObjectFactory.java
Date Tue, 22 Apr 2003 16:12:49 GMT
bloritsch    2003/04/22 09:12:49

  Modified:    fortress/src/java/org/apache/avalon/fortress/impl/factory
                        AbstractObjectFactory.java BCELCodeGenerator.java
                        BCELWrapperGenerator.java ProxyManager.java
                        ProxyObjectFactory.java WrapperObjectFactory.java
  Log:
  Reformat
  
  Revision  Changes    Path
  1.2       +14 -14    avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory/AbstractObjectFactory.java
  
  Index: AbstractObjectFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory/AbstractObjectFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractObjectFactory.java	22 Apr 2003 16:11:23 -0000	1.1
  +++ AbstractObjectFactory.java	22 Apr 2003 16:12:48 -0000	1.2
  @@ -49,25 +49,25 @@
   */
   package org.apache.avalon.fortress.impl.factory;
   
  -import org.apache.excalibur.mpool.ObjectFactory;
  -import org.apache.excalibur.instrument.Instrumentable;
  -import org.apache.excalibur.instrument.Instrument;
  -import org.apache.avalon.framework.logger.Loggable;
  -import org.apache.avalon.framework.logger.LogEnabled;
  -import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.context.Recontextualizable;
  +import org.apache.avalon.framework.activity.Disposable;
  +import org.apache.avalon.framework.activity.Initializable;
  +import org.apache.avalon.framework.activity.Startable;
  +import org.apache.avalon.framework.activity.Suspendable;
  +import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.Composable;
   import org.apache.avalon.framework.component.Recomposable;
  -import org.apache.avalon.framework.component.Component;
  -import org.apache.avalon.framework.service.Serviceable;
   import org.apache.avalon.framework.configuration.Configurable;
   import org.apache.avalon.framework.configuration.Reconfigurable;
  +import org.apache.avalon.framework.context.Contextualizable;
  +import org.apache.avalon.framework.context.Recontextualizable;
  +import org.apache.avalon.framework.logger.LogEnabled;
  +import org.apache.avalon.framework.logger.Loggable;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Reparameterizable;
  -import org.apache.avalon.framework.activity.Initializable;
  -import org.apache.avalon.framework.activity.Startable;
  -import org.apache.avalon.framework.activity.Suspendable;
  -import org.apache.avalon.framework.activity.Disposable;
  +import org.apache.avalon.framework.service.Serviceable;
  +import org.apache.excalibur.instrument.Instrument;
  +import org.apache.excalibur.instrument.Instrumentable;
  +import org.apache.excalibur.mpool.ObjectFactory;
   
   import java.io.Serializable;
   import java.util.ArrayList;
  @@ -109,7 +109,7 @@
        */
       protected final ObjectFactory m_delegateFactory;
   
  -    public AbstractObjectFactory(final ObjectFactory objectFactory )
  +    public AbstractObjectFactory( final ObjectFactory objectFactory )
       {
           if ( null == objectFactory )
           {
  
  
  
  1.2       +10 -10    avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory/BCELCodeGenerator.java
  
  Index: BCELCodeGenerator.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory/BCELCodeGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BCELCodeGenerator.java	22 Apr 2003 16:11:23 -0000	1.1
  +++ BCELCodeGenerator.java	22 Apr 2003 16:12:48 -0000	1.2
  @@ -49,17 +49,17 @@
   */
   package org.apache.avalon.fortress.impl.factory;
   
  -import org.apache.bcel.classfile.JavaClass;
  +import org.apache.bcel.Constants;
  +import org.apache.bcel.classfile.ExceptionTable;
   import org.apache.bcel.classfile.Field;
  +import org.apache.bcel.classfile.JavaClass;
   import org.apache.bcel.classfile.Method;
  -import org.apache.bcel.classfile.ExceptionTable;
   import org.apache.bcel.generic.*;
  -import org.apache.bcel.Constants;
   
  -import java.util.List;
   import java.util.ArrayList;
  -import java.util.Set;
   import java.util.HashSet;
  +import java.util.List;
  +import java.util.Set;
   
   /**
    * <p>
  @@ -587,14 +587,14 @@
           }
   
           Set methods = new HashSet();
  -        extractMethods(interfaceToImplement, methods);
  -        JavaClass[] interfaces  = interfaceToImplement.getInterfaces();
  -        for (int i = 0; i < interfaces.length; i++)
  +        extractMethods( interfaceToImplement, methods );
  +        JavaClass[] interfaces = interfaceToImplement.getInterfaces();
  +        for ( int i = 0; i < interfaces.length; i++ )
           {
  -            extractMethods(interfaces[i], methods);
  +            extractMethods( interfaces[i], methods );
           }
   
  -        return (Method[])methods.toArray(new Method[] {});
  +        return (Method[]) methods.toArray( new Method[]{} );
       }
   
       private static final void extractMethods( final JavaClass interfaceToImplement, final
Set methods )
  
  
  
  1.2       +2 -3      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory/BCELWrapperGenerator.java
  
  Index: BCELWrapperGenerator.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory/BCELWrapperGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- BCELWrapperGenerator.java	22 Apr 2003 16:11:23 -0000	1.1
  +++ BCELWrapperGenerator.java	22 Apr 2003 16:12:48 -0000	1.2
  @@ -49,12 +49,11 @@
   */
   package org.apache.avalon.fortress.impl.factory;
   
  +import org.apache.bcel.Constants;
  +import org.apache.bcel.Repository;
   import org.apache.bcel.classfile.JavaClass;
   import org.apache.bcel.classfile.Method;
   import org.apache.bcel.generic.ClassGen;
  -import org.apache.bcel.Constants;
  -import org.apache.bcel.Repository;
  -import org.apache.avalon.fortress.impl.factory.BCELCodeGenerator;
   
   /**
    * Create the BCELWrapper for the component
  
  
  
  1.2       +8 -8      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory/ProxyManager.java
  
  Index: ProxyManager.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory/ProxyManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProxyManager.java	22 Apr 2003 16:11:23 -0000	1.1
  +++ ProxyManager.java	22 Apr 2003 16:12:48 -0000	1.2
  @@ -88,31 +88,31 @@
   
       public ProxyManager()
       {
  -        this(false);
  +        this( false );
       }
   
  -    public ProxyManager(final boolean useBCEL)
  +    public ProxyManager( final boolean useBCEL )
       {
           m_useBCELPreference = useBCEL;
       }
   
  -    public ObjectFactory getWrappedObjectFactory(final ObjectFactory source) throws Exception
  +    public ObjectFactory getWrappedObjectFactory( final ObjectFactory source ) throws Exception
       {
           if ( null == m_factoryClass )
           {
               final ClassLoader loader = source.getClass().getClassLoader();
   
  -            if (m_useBCELPreference && m_isBCELPresent)
  +            if ( m_useBCELPreference && m_isBCELPresent )
               {
  -                m_factoryClass = loader.loadClass(BCEL_WRAPPER);
  +                m_factoryClass = loader.loadClass( BCEL_WRAPPER );
               }
               else
               {
  -                m_factoryClass = loader.loadClass(PROXY_WRAPPER);
  +                m_factoryClass = loader.loadClass( PROXY_WRAPPER );
               }
           }
   
  -        final Constructor constr = m_factoryClass.getConstructor(new Class[] {ObjectFactory.class});
  -        return (ObjectFactory) constr.newInstance(new Object[] {source});
  +        final Constructor constr = m_factoryClass.getConstructor( new Class[]{ObjectFactory.class}
);
  +        return (ObjectFactory) constr.newInstance( new Object[]{source} );
       }
   }
  
  
  
  1.2       +3 -3      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory/ProxyObjectFactory.java
  
  Index: ProxyObjectFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory/ProxyObjectFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ProxyObjectFactory.java	22 Apr 2003 16:11:23 -0000	1.1
  +++ ProxyObjectFactory.java	22 Apr 2003 16:12:49 -0000	1.2
  @@ -49,8 +49,8 @@
   */
   package org.apache.avalon.fortress.impl.factory;
   
  -import org.apache.excalibur.mpool.ObjectFactory;
   import org.apache.avalon.framework.component.Component;
  +import org.apache.excalibur.mpool.ObjectFactory;
   
   import java.lang.reflect.Proxy;
   
  @@ -71,7 +71,7 @@
        */
       public ProxyObjectFactory( final ObjectFactory objectFactory ) throws NullPointerException
       {
  -        super(objectFactory);
  +        super( objectFactory );
       }
   
       /**
  
  
  
  1.2       +0 -2      avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory/WrapperObjectFactory.java
  
  Index: WrapperObjectFactory.java
  ===================================================================
  RCS file: /home/cvs/avalon-excalibur/fortress/src/java/org/apache/avalon/fortress/impl/factory/WrapperObjectFactory.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- WrapperObjectFactory.java	22 Apr 2003 16:11:23 -0000	1.1
  +++ WrapperObjectFactory.java	22 Apr 2003 16:12:49 -0000	1.2
  @@ -50,8 +50,6 @@
   package org.apache.avalon.fortress.impl.factory;
   
   import org.apache.excalibur.mpool.ObjectFactory;
  -import org.apache.avalon.fortress.impl.factory.BCELWrapperGenerator;
  -import org.apache.avalon.fortress.impl.factory.WrapperClass;
   
   /**
    * An object factory that delegates all calls to another object factory and
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org


Mime
View raw message