[jboss-cvs] jboss-spring/src/main/org/jboss/spring/callback ...

[Ales J. <ale...@ge...>]

  User: alesj   
  Date: 06/07/09 09:18:48

  Modified:    src/main/org/jboss/spring/callback  
                        SpringLifecycleInterceptor.java
                        SpringPassivationInterceptor.java
  Log:
  Reformat code + Spring-MC fix.
  
  Revision  Changes    Path
  1.7       +4 -2      jboss-spring/src/main/org/jboss/spring/callback/SpringLifecycleInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SpringLifecycleInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-spring/src/main/org/jboss/spring/callback/SpringLifecycleInterceptor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- SpringLifecycleInterceptor.java	5 Jun 2006 11:08:04 -0000	1.6
  +++ SpringLifecycleInterceptor.java	9 Jul 2006 13:18:48 -0000	1.7
  @@ -22,9 +22,10 @@
   
   package org.jboss.spring.callback;
   
  +import org.jboss.spring.support.SpringInjectionSupport;
  +
   import javax.annotation.PostConstruct;
   import javax.interceptor.InvocationContext;
  -import org.jboss.spring.support.SpringInjectionSupport;
   
   /**
    * Injects Spring beans on postConstruction and postActivation.
  @@ -34,7 +35,8 @@
    * @see SpringPassivationInterceptor
    * @see SpringInjectionSupport
    */
  -public class SpringLifecycleInterceptor extends SpringPassivationInterceptor {
  +public class SpringLifecycleInterceptor extends SpringPassivationInterceptor
  +{
   
       private static final long serialVersionUID = 365239483909594775L;
   
  
  
  
  1.7       +11 -7     jboss-spring/src/main/org/jboss/spring/callback/SpringPassivationInterceptor.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SpringPassivationInterceptor.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-spring/src/main/org/jboss/spring/callback/SpringPassivationInterceptor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- SpringPassivationInterceptor.java	5 Jun 2006 11:07:46 -0000	1.6
  +++ SpringPassivationInterceptor.java	9 Jul 2006 13:18:48 -0000	1.7
  @@ -22,14 +22,15 @@
   
   package org.jboss.spring.callback;
   
  -import java.io.Serializable;
  -import java.lang.reflect.Field;
  -import java.lang.reflect.Modifier;
  +import org.jboss.spring.support.SpringInjectionSupport;
  +
   import javax.annotation.PreDestroy;
   import javax.ejb.PostActivate;
   import javax.ejb.PrePassivate;
   import javax.interceptor.InvocationContext;
  -import org.jboss.spring.support.SpringInjectionSupport;
  +import java.io.Serializable;
  +import java.lang.reflect.Field;
  +import java.lang.reflect.Modifier;
   
   /**
    * Injects Spring beans only on postActivation.
  @@ -39,7 +40,8 @@
    * @author <a href="mailto:ale...@ge...">Ales Justin</a>
    * @see org.jboss.spring.support.SpringInjectionSupport
    */
  -public class SpringPassivationInterceptor extends SpringInjectionSupport implements Serializable {
  +public class SpringPassivationInterceptor extends SpringInjectionSupport implements Serializable
  +{
   
       private static final long serialVersionUID = -7259379236645796135L;
   
  @@ -54,10 +56,12 @@
       public void prePassivate(InvocationContext ctx) throws Exception
       {
           Field[] fields = getAllFields(ctx.getTarget());
  -        for (Field f : fields) {
  +        for (Field f : fields)
  +        {
               boolean isSerializable = Serializable.class.isAssignableFrom(f.getType());
               boolean isTransient = Modifier.isTransient(f.getModifiers());
  -            if (!isSerializable && !isTransient) {
  +            if (!isSerializable && !isTransient)
  +            {
                   f.setAccessible(true);
                   f.set(ctx.getTarget(), null);
               }