[Nodal-cvs] nodal/j-src/storage/framework GeneratedNode.java,1.6,1.7 AbstractRepository.java,1.19,1.20 AbstractNode.java,1.12,1.13

[Lee I. <le...@us...>]

Update of /cvsroot/nodal/nodal/j-src/storage/framework
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3193/storage/framework

Modified Files:
	GeneratedNode.java AbstractRepository.java AbstractNode.java 
Log Message:
Eliminate passing of AbstractNode.Backend and AbstractRepository.Backend together.
Large-scale renaming of classes in storage.memory to conform to Java standards.

Index: AbstractNode.java
===================================================================
RCS file: /cvsroot/nodal/nodal/j-src/storage/framework/AbstractNode.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** AbstractNode.java	8 Jan 2005 00:51:12 -0000	1.12
--- AbstractNode.java	14 Jan 2005 18:22:50 -0000	1.13
***************
*** 29,33 ****
     */
    protected final NodeType type;
!   protected final AbstractRepository repo;
    protected Path path;
    private Name id;
--- 29,33 ----
     */
    protected final NodeType type;
!   protected final AbstractRepository.Backend repoBackend;
    protected Path path;
    private Name id;
***************
*** 46,49 ****
--- 46,55 ----
      
      /**
+      * The Backend of the AbstractRepository controlling this Node.
+      * @return the AbstractRepository.Backend for this Node.
+      */
+     AbstractRepository.Backend repoBackend();
+     
+     /**
       * Called when a local transaction {@link org.nodal.model.Txn} has initiated a
       * commit() but has not yet completed this.  If this method returns false then
***************
*** 86,89 ****
--- 92,99 ----
      public final AbstractNode node () { return node; }
  
+     public final AbstractRepository.Backend repoBackend() {
+       return node.repoBackend;
+     }
+     
      public boolean localPrecommit() {
        return true;
***************
*** 106,111 ****
    }
    
!   protected AbstractNode(AbstractRepository repo, NodeType type, Name id) {
!     this.repo = repo;
      this.type = type;
      this.backend = createBackend();
--- 116,121 ----
    }
    
!   protected AbstractNode(AbstractRepository.Backend repoBackend, NodeType type, Name id) {
!     this.repoBackend = repoBackend;
      this.type = type;
      this.backend = createBackend();
***************
*** 131,140 ****
        }
        this.id = id;
!       repo.associateID(this);
      }
    }
  
    public final Repository repository() {
!     return repo;
    }
  
--- 141,150 ----
        }
        this.id = id;
!       repoBackend.repository().associateID(this);
      }
    }
  
    public final Repository repository() {
!     return repoBackend.repository();
    }
  

Index: GeneratedNode.java
===================================================================
RCS file: /cvsroot/nodal/nodal/j-src/storage/framework/GeneratedNode.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** GeneratedNode.java	8 Jan 2005 00:51:12 -0000	1.6
--- GeneratedNode.java	14 Jan 2005 18:22:49 -0000	1.7
***************
*** 22,31 ****
   * 
   * Created on Jan 14, 2004
   * @author leei
   */
  public abstract class GeneratedNode extends AbstractNode implements Node {
    /**
!    * A private editor used for updating content.  Not to be provided to
!    * the outside world!
     */
    private NodeContent.Editor updateEditor;
--- 22,32 ----
   * 
   * Created on Jan 14, 2004
+  * 
   * @author leei
   */
  public abstract class GeneratedNode extends AbstractNode implements Node {
    /**
!    * A private editor used for updating content. Not to be provided to the
!    * outside world!
     */
    private NodeContent.Editor updateEditor;
***************
*** 40,44 ****
     * @param type
     */
!   protected GeneratedNode(AbstractRepository repo, NodeType type, Name id) {
      super(repo, type, id);
    }
--- 41,46 ----
     * @param type
     */
!   protected GeneratedNode(AbstractRepository.Backend repo, NodeType type,
!       Name id) {
      super(repo, type, id);
    }
***************
*** 49,57 ****
          // Create returnable content
          AbstractContent content = AbstractContent.create(type);
!         nodeContent = content.nodeContent(backend, repo.backend, null);
  
          // Create and update content from generator
!         Capability cap = CapabilityImpl.createOwner(repo.user());
!         updateEditor = content.nodeContent(backend, repo.backend, cap).edit();
          updateContent(updateEditor);
        } else if (outofdate()) {
--- 51,59 ----
          // Create returnable content
          AbstractContent content = AbstractContent.create(type);
!         nodeContent = content.nodeContent(backend, null);
  
          // Create and update content from generator
!         Capability cap = CapabilityImpl.createOwner(repoBackend.user());
!         updateEditor = content.nodeContent(backend, cap).edit();
          updateContent(updateEditor);
        } else if (outofdate()) {
***************
*** 67,70 ****
  
    protected abstract boolean outofdate();
    protected abstract void updateContent(NodeContent.Editor editor);
! }
--- 69,73 ----
  
    protected abstract boolean outofdate();
+ 
    protected abstract void updateContent(NodeContent.Editor editor);
! }
\ No newline at end of file

Index: AbstractRepository.java
===================================================================
RCS file: /cvsroot/nodal/nodal/j-src/storage/framework/AbstractRepository.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** AbstractRepository.java	8 Jan 2005 00:51:12 -0000	1.19
--- AbstractRepository.java	14 Jan 2005 18:22:50 -0000	1.20
***************
*** 243,246 ****
--- 243,252 ----
  
      /**
+      * The User associated with the Repository.
+      * @return a User object logged in to the Repository
+      */
+     User user();
+     
+     /**
       * A TxnManager if this Repository type creates an audit trail via the
       * NodeHistory interface.
***************
*** 334,337 ****
--- 340,347 ----
      }
  
+     public final User user () {
+       return repo.user();
+     }
+     
      /**
       * Recover a Node from a backing store.