[jboss-cvs] jboss-seam/src/main/org/jboss/seam/contexts ...

[Gavin King]

  User: gavin   
  Date: 07/06/16 12:30:13

  Modified:    src/main/org/jboss/seam/contexts   EntityBean.java
                        PassivatedEntity.java
  Log:
  javadoc, and minor refactor
  
  Revision  Changes    Path
  1.8       +11 -1     jboss-seam/src/main/org/jboss/seam/contexts/EntityBean.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityBean.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/EntityBean.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- EntityBean.java	16 Jun 2007 16:16:05 -0000	1.7
  +++ EntityBean.java	16 Jun 2007 16:30:13 -0000	1.8
  @@ -2,9 +2,19 @@
   
   import org.jboss.seam.core.Mutable;
   
  +/**
  + * Swizzles entities held in the conversation context at
  + * the end of each request.
  + * 
  + * @see PassivatedEntity
  + * 
  + * @author Gavin King
  + *
  + */
   public class EntityBean implements Mutable
   {
      private static final long serialVersionUID = -2884601453783925804L;
  +   
      private Object instance;
      private PassivatedEntity passivatedEntity;
      
  @@ -32,7 +42,7 @@
         {
            if ( !PassivatedEntity.isTransactionRolledBackOrMarkedRollback() )
            {
  -            passivatedEntity = PassivatedEntity.createPassivatedEntity(instance, null);
  +            passivatedEntity = PassivatedEntity.createPassivatedEntity(instance);
               if (passivatedEntity!=null)
               {
                  instance = null;
  
  
  
  1.10      +14 -13    jboss-seam/src/main/org/jboss/seam/contexts/PassivatedEntity.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PassivatedEntity.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/contexts/PassivatedEntity.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -b -r1.9 -r1.10
  --- PassivatedEntity.java	16 Jun 2007 09:08:57 -0000	1.9
  +++ PassivatedEntity.java	16 Jun 2007 16:30:13 -0000	1.10
  @@ -1,6 +1,3 @@
  -/**
  - * 
  - */
   package org.jboss.seam.contexts;
   
   import java.io.Serializable;
  @@ -14,19 +11,28 @@
   import org.jboss.seam.persistence.PersistenceProvider;
   import org.jboss.seam.transaction.Transaction;
   
  +/**
  + * A swizzled entity reference, consisting of the class,
  + * id and persistence context name.
  + * 
  + * @see EntityBean
  + * @see org.jboss.seam.interceptors.ManagedEntityIdentityInterceptor
  + * 
  + * @author Gavin King
  + *
  + */
   public class PassivatedEntity implements Serializable
   {
      private static final long serialVersionUID = 6565440294007267788L;
  +   
      private Object id;
      private String persistenceContext;
  -   private String fieldName;
      private Class<?> entityClass; //TODO: make this transient, and serialize only the class name..
      
  -   private PassivatedEntity(Object id, Class<?> entityClass, String persistenceContext, String fieldName)
  +   private PassivatedEntity(Object id, Class<?> entityClass, String persistenceContext)
      {
         this.id = id;
         this.persistenceContext = persistenceContext;
  -      this.fieldName = fieldName;
         this.entityClass = entityClass;
      }
      
  @@ -40,11 +46,6 @@
         return id;
      }
      
  -   public String getFieldName()
  -   {
  -      return fieldName;
  -   }
  -   
      public Class<?> getEntityClass()
      {
         return entityClass;
  @@ -74,7 +75,7 @@
         }
      }
   
  -   public static PassivatedEntity createPassivatedEntity(Object value, String fieldName)
  +   public static PassivatedEntity createPassivatedEntity(Object value)
      {
         Class entityClass = Seam.getEntityClass( value.getClass() );
         if (entityClass!=null)
  @@ -121,7 +122,7 @@
                  }
                  else
                  {
  -                  return new PassivatedEntity( id, entityClass, persistenceContextName, fieldName );
  +                  return new PassivatedEntity(id, entityClass, persistenceContextName);
                  }
               }
            }