[jboss-cvs] jboss-persistence/src/main/org/jboss/persistence/jbossdo/store StoreManager.java StoreManagerImpl.java

[Alexey L. <lou...@us...>]

  User: loubyansky
  Date: 03/06/12 05:18:43

  Modified:    src/main/org/jboss/persistence/jbossdo/store
                        StoreManager.java StoreManagerImpl.java
  Log:
  cleanup
  
  Revision  Changes    Path
  1.3       +1 -2      jboss-persistence/src/main/org/jboss/persistence/jbossdo/store/StoreManager.java
  
  Index: StoreManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-persistence/src/main/org/jboss/persistence/jbossdo/store/StoreManager.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- StoreManager.java	3 Jun 2003 17:19:01 -0000	1.2
  +++ StoreManager.java	12 Jun 2003 12:18:43 -0000	1.3
  @@ -11,6 +11,7 @@
   
   import javax.jdo.spi.PersistenceCapable;
   
  +
   /**
    *
    * @author <a href="mailto:al...@jb...">Alex Loubyansky</a>
  @@ -30,6 +31,4 @@
      PersistenceCapable load(JBossStateManager sm);
   
      PersistenceCapable loadById(JBossStateManager sm);
  -
  -   PersistenceCapable loadByFK(JBossStateManager sm, int fkFieldIndex);
   }
  
  
  
  1.5       +0 -35     jboss-persistence/src/main/org/jboss/persistence/jbossdo/store/StoreManagerImpl.java
  
  Index: StoreManagerImpl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-persistence/src/main/org/jboss/persistence/jbossdo/store/StoreManagerImpl.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StoreManagerImpl.java	9 Jun 2003 18:51:43 -0000	1.4
  +++ StoreManagerImpl.java	12 Jun 2003 12:18:43 -0000	1.5
  @@ -7,7 +7,6 @@
   package org.jboss.persistence.jbossdo.store;
   
   import org.jboss.persistence.jbossdo.JBossStateManager;
  -import org.jboss.persistence.jbossdo.identity.Identity;
   import org.jboss.persistence.jbossdo.command.JDOInsert;
   import org.jboss.persistence.jbossdo.command.JDODelete;
   import org.jboss.persistence.jbossdo.command.JDOUpdate;
  @@ -155,40 +154,6 @@
   
         // read identity first and then default-fetch-group
         jdoClass.getIdentity().getResults(command, sm);
  -      jdoClass.getResults(command, sm);
  -      sm.jdoPostLoad();
  -      return sm.getPersistenceCapable();
  -   }
  -
  -   public PersistenceCapable loadByFK(JBossStateManager sm, int fkFieldIndex)
  -   {
  -      PersistenceCapable pc = sm.getPersistenceCapable();
  -      JDOClass jdoClass = schemaMapper.getJDOClassByName(pc.getClass().getName());
  -
  -      JDOLoad command = new JDOLoad();
  -      command.setClass(jdoClass);
  -      command.setParameterMask(
  -         JBossStateManager.JBOSS_FIELD_LOAD_REQUIRED | JBossStateManager.JBOSS_FIELD_LOADED);
  -      command.setParameterFlags(JBossStateManager.JBOSS_FIELD_LOAD_REQUIRED);
  -
  -      int loadParameters = 0;
  -      boolean loadIdentity = sm.getObjectId(pc) == null;
  -      if(loadIdentity)
  -         loadParameters += jdoClass.getIdentity().setLoadParameters(command, sm);
  -      loadParameters += jdoClass.setLoadParameters(command, sm);
  -      if(loadParameters == 0)
  -         return sm.getPersistenceCapable();
  -      jdoClass.getField(fkFieldIndex).setFilterParameters(command, sm);
  -
  -      command.generate(schemaMapper, generator);
  -      log.debug("loadByFK command: " + command);
  -      command.executeQuery();
  -
  -      if(loadIdentity)
  -      {
  -         final Object identityValue = jdoClass.getIdentity().getResults(command, sm);
  -         sm.replaceObjectId(new Identity(pc.getClass(), identityValue));
  -      }
         jdoClass.getResults(command, sm);
         sm.jdoPostLoad();
         return sm.getPersistenceCapable();