[jboss-cvs] jboss/src/main/org/jboss/ejb/plugins/jaws JAWSPersistenceManager.java JPMCommandFactory.java JPMFindEntitiesCommand.java

[Dain S. <dsu...@us...>]

  User: dsundstrom
  Date: 02/05/25 16:36:37

  Modified:    src/main/org/jboss/ejb/plugins/jaws Tag: Branch_3_0
                        JAWSPersistenceManager.java JPMCommandFactory.java
                        JPMFindEntitiesCommand.java
  Log:
  Replaced FinderResults with Collection.
  
  Removed reference to deleted load entities command objects.
  
  Revision  Changes    Path
  No                   revision
  
  
  No                   revision
  
  
  1.39.2.2  +8 -12     jboss/src/main/org/jboss/ejb/plugins/jaws/JAWSPersistenceManager.java
  
  Index: JAWSPersistenceManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/JAWSPersistenceManager.java,v
  retrieving revision 1.39.2.1
  retrieving revision 1.39.2.2
  diff -u -r1.39.2.1 -r1.39.2.2
  --- JAWSPersistenceManager.java	3 May 2002 23:35:09 -0000	1.39.2.1
  +++ JAWSPersistenceManager.java	25 May 2002 23:36:36 -0000	1.39.2.2
  @@ -11,6 +11,7 @@
   
   import java.rmi.RemoteException;
   
  +import java.util.Collection;
   import java.util.Iterator;
   
   import javax.ejb.CreateException;
  @@ -28,8 +29,6 @@
   
   import org.jboss.metadata.EntityMetaData;
   
  -import org.jboss.ejb.FinderResults;
  -
   /**
    *   Just Another Web Store - an O/R mapper
    *
  @@ -39,7 +38,7 @@
    * @author <a href="mailto:mar...@te...">Marc Fleury</a>
    * @author <a href="mailto:she...@kp...">Joe Shevland</a>
    * @author <a href="mailto:ju...@j-...">Justin Forder</a>
  - * @version $Revision: 1.39.2.1 $
  + * @version $Revision: 1.39.2.2 $
    *
    *   <p><b>Revisions:</b>
    *
  @@ -51,6 +50,11 @@
    *   <ul>
    *   <li> Added createBeanInstance and initEntity methods
    *   </ul>
  + *   <p><b>20020525 Dain Sundstrom:</b>
  + *   <ul>
  + *   <li> Replaced FinderResults with Collection
  + *   <li> Removed unused loadEntities method
  + *   </ul>
    *
    */
   public class JAWSPersistenceManager
  @@ -72,7 +76,6 @@
      JPMCreateEntityCommand createEntityCommand;
      JPMRemoveEntityCommand removeEntityCommand;
      JPMLoadEntityCommand loadEntityCommand;
  -   JPMLoadEntitiesCommand loadEntitiesCommand;
      JPMStoreEntityCommand storeEntityCommand;
   
      JPMActivateEntityCommand activateEntityCommand;
  @@ -110,7 +113,6 @@
         createEntityCommand = commandFactory.createCreateEntityCommand();
         removeEntityCommand = commandFactory.createRemoveEntityCommand();
         loadEntityCommand = commandFactory.createLoadEntityCommand();
  -      loadEntitiesCommand = commandFactory.createLoadEntitiesCommand();
         storeEntityCommand = commandFactory.createStoreEntityCommand();
   
         activateEntityCommand = commandFactory.createActivateEntityCommand();
  @@ -261,7 +263,7 @@
         return findEntityCommand.execute(finderMethod, args, ctx);
      }
   
  -   public FinderResults findEntities(Method finderMethod,
  +   public Collection findEntities(Method finderMethod,
                                     Object[] args,
                                     EntityEnterpriseContext ctx)
         throws Exception
  @@ -281,12 +283,6 @@
         loadEntityCommand.execute(ctx);
      }
      
  -   public void loadEntities(FinderResults keys) 
  -      throws RemoteException
  -   {
  -      loadEntitiesCommand.execute(keys);
  -   }
  -
      public boolean isModified(EntityEnterpriseContext ctx) throws Exception 
      {
         if(isModified == null) 
  
  
  
  1.4.4.2   +1 -3      jboss/src/main/org/jboss/ejb/plugins/jaws/JPMCommandFactory.java
  
  Index: JPMCommandFactory.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/JPMCommandFactory.java,v
  retrieving revision 1.4.4.1
  retrieving revision 1.4.4.2
  diff -u -r1.4.4.1 -r1.4.4.2
  --- JPMCommandFactory.java	3 May 2002 23:35:09 -0000	1.4.4.1
  +++ JPMCommandFactory.java	25 May 2002 23:36:37 -0000	1.4.4.2
  @@ -10,7 +10,7 @@
    * Interface for JAWSPersistenceManager Command Factories 
    *    
    * @author <a href="mailto:ju...@j-...">Justin Forder</a>
  - * @version $Revision: 1.4.4.1 $
  + * @version $Revision: 1.4.4.2 $
    */
   public interface JPMCommandFactory
   {
  @@ -41,8 +41,6 @@
      public JPMRemoveEntityCommand createRemoveEntityCommand();
      
      public JPMLoadEntityCommand createLoadEntityCommand();
  -   
  -   public JPMLoadEntitiesCommand createLoadEntitiesCommand();
      
      public JPMStoreEntityCommand createStoreEntityCommand();
      
  
  
  
  1.7.2.1   +3 -3      jboss/src/main/org/jboss/ejb/plugins/jaws/JPMFindEntitiesCommand.java
  
  Index: JPMFindEntitiesCommand.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/ejb/plugins/jaws/JPMFindEntitiesCommand.java,v
  retrieving revision 1.7
  retrieving revision 1.7.2.1
  diff -u -r1.7 -r1.7.2.1
  --- JPMFindEntitiesCommand.java	16 Feb 2002 10:37:55 -0000	1.7
  +++ JPMFindEntitiesCommand.java	25 May 2002 23:36:37 -0000	1.7.2.1
  @@ -8,20 +8,20 @@
   package org.jboss.ejb.plugins.jaws;
   
   import java.lang.reflect.Method;
  +import java.util.Collection;
   import org.jboss.ejb.EntityEnterpriseContext;
  -import org.jboss.ejb.FinderResults;
   
   /**
    * Interface for JAWSPersistenceManager FindEntities Command.
    *      
    * @author <a href="mailto:ju...@j-...">Justin Forder</a>
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.7.2.1 $
    */
   public interface JPMFindEntitiesCommand
   {
      // Public --------------------------------------------------------
      
  -   public FinderResults execute(Method finderMethod, 
  +   public Collection execute(Method finderMethod, 
                                Object[] args, 
                                EntityEnterpriseContext ctx)
         throws Exception;