[Nodal-cvs] nodal/j-src/storage/file FileDirMap.java,1.7,1.8 FileNode.java,1.12,1.13

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

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

Modified Files:
	FileDirMap.java FileNode.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: FileDirMap.java
===================================================================
RCS file: /cvsroot/nodal/nodal/j-src/storage/file/FileDirMap.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FileDirMap.java	8 Jan 2005 00:51:12 -0000	1.7
--- FileDirMap.java	14 Jan 2005 18:22:49 -0000	1.8
***************
*** 28,34 ****
  
  /**
!  * A Node that contains the Map that is the root Node of a FileDirectory.
!  * It is a GeneratedNode that reads the contents of the File as a directory,
!  * and updates by rereading...
   * 
   * @author leei
--- 28,34 ----
  
  /**
!  * A Node that contains the Map that is the root Node of a FileDirectory. It is
!  * a GeneratedNode that reads the contents of the File as a directory, and
!  * updates by rereading...
   * 
   * @author leei
***************
*** 40,48 ****
    private Path docPath;
    private long updated;
-   private FileRepository.Backend repoBackend;
  
!   FileDirMap(FileRepository.Backend repoBackend, Path docPath, Name id, File file) {
!     super(repoBackend.repository(), (NodeType) Types.DIRTYPE.fieldType("root"), id);
!     this.repoBackend = repoBackend;
      this.file = file;
      this.docPath = docPath;
--- 40,47 ----
    private Path docPath;
    private long updated;
  
!   FileDirMap(FileRepository.Backend repoBackend, Path docPath, Name id,
!       File file) {
!     super(repoBackend, (NodeType) Types.DIRTYPE.fieldType("root"), id);
      this.file = file;
      this.docPath = docPath;
***************
*** 50,66 ****
      boolean canRead = file.canRead();
      boolean canWrite = file.canWrite();
!     this.cap = CapabilityImpl.createReadWrite(repoBackend.repository().user(), canRead, canWrite);
    }
  
    private static class BackendImpl extends AbstractNode.BackendImpl {
!     BackendImpl (FileDirMap node) {
!       super (node);
      }
!     
      public boolean localPrecommit() {
        // TODO Check for permission to perform action(s)
        return true;
      }
!     
      public boolean localPostcommit() {
        // TODO Perform the particular action!
--- 49,66 ----
      boolean canRead = file.canRead();
      boolean canWrite = file.canWrite();
!     this.cap = CapabilityImpl.createReadWrite(repoBackend.repository().user(),
!         canRead, canWrite);
    }
  
    private static class BackendImpl extends AbstractNode.BackendImpl {
!     BackendImpl(FileDirMap node) {
!       super(node);
      }
! 
      public boolean localPrecommit() {
        // TODO Check for permission to perform action(s)
        return true;
      }
! 
      public boolean localPostcommit() {
        // TODO Perform the particular action!
***************
*** 68,76 ****
      }
    }
!   
!   protected AbstractNode.Backend createBackend () {
!     return new BackendImpl (this);
    }
!   
    protected boolean outofdate() {
      long mod = file.lastModified();
--- 68,76 ----
      }
    }
! 
!   protected AbstractNode.Backend createBackend() {
!     return new BackendImpl(this);
    }
! 
    protected boolean outofdate() {
      long mod = file.lastModified();
***************
*** 79,82 ****
--- 79,83 ----
  
    protected synchronized void updateContent(Editor editor) {
+     FileRepository repo = (FileRepository) repository();
      long mod = file.lastModified();
      if (mod > updated) {
***************
*** 96,100 ****
            } else {
              // No match: Document added.
!             Document doc = FileDocument.loadDocument(repoBackend.fileRepository(), f);
              mapEditor.setValue(f.getName()).setNode(doc.docNode());
            }
--- 97,101 ----
            } else {
              // No match: Document added.
!             Document doc = FileDocument.loadDocument(repo, f);
              mapEditor.setValue(f.getName()).setNode(doc.docNode());
            }
***************
*** 105,109 ****
          for (Iterator i = files.iterator(); i.hasNext();) {
            File f = (File) i.next();
!           Document doc = FileDocument.loadDocument(repoBackend.fileRepository(), f);
            mapEditor.removeKey(doc.docNode());
          }
--- 106,110 ----
          for (Iterator i = files.iterator(); i.hasNext();) {
            File f = (File) i.next();
!           Document doc = FileDocument.loadDocument(repo, f);
            mapEditor.removeKey(doc.docNode());
          }
***************
*** 127,131 ****
    }
  
!   /* (non-Javadoc)
     * @see storage.file.FileNodeContext#docPath()
     */
--- 128,134 ----
    }
  
!   /*
!    * (non-Javadoc)
!    * 
     * @see storage.file.FileNodeContext#docPath()
     */
***************
*** 134,145 ****
    }
  
!   /* (non-Javadoc)
     * @see storage.file.FileNodeContext#fileRepository()
     */
    public FileRepository fileRepository() {
!     return (FileRepository) repo;
    }
  
!   /* (non-Javadoc)
     * @see storage.file.FileNodeContext#fileContext()
     */
--- 137,152 ----
    }
  
!   /*
!    * (non-Javadoc)
!    * 
     * @see storage.file.FileNodeContext#fileRepository()
     */
    public FileRepository fileRepository() {
!     return (FileRepository) repository();
    }
  
!   /*
!    * (non-Javadoc)
!    * 
     * @see storage.file.FileNodeContext#fileContext()
     */
***************
*** 147,149 ****
      return file;
    }
! }
--- 154,156 ----
      return file;
    }
! }
\ No newline at end of file

Index: FileNode.java
===================================================================
RCS file: /cvsroot/nodal/nodal/j-src/storage/file/FileNode.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** FileNode.java	8 Jan 2005 00:51:12 -0000	1.12
--- FileNode.java	14 Jan 2005 18:22:49 -0000	1.13
***************
*** 33,37 ****
    protected final Path docPath;
    protected final File fileContext;
-   protected final FileRepository.Backend repoBackend;
    protected final AbstractContent bareContent;
    private NodeContent content;
--- 33,36 ----
***************
*** 69,73 ****
      AbstractContent c = AbstractContent.create(t);
      FileNode fnode = new FileNode((FileRepository.Backend) svc, docPath, id, c, fileContext);
!     return c.initEdit(fnode.backend, svc);
    }
  
--- 68,72 ----
      AbstractContent c = AbstractContent.create(t);
      FileNode fnode = new FileNode((FileRepository.Backend) svc, docPath, id, c, fileContext);
!     return c.initEdit(fnode.backend);
    }
  
***************
*** 81,90 ****
     * @return a new FileNode with the cloned context
     */
!   static NodeContent.Editor cloneNode(AbstractRepository.Backend services,
        Path docPath, Name id, Node node, FileNode fcontext) {
      AbstractContent c = AbstractContent.ingest(node.content());
!     FileNode fnode = new FileNode(fcontext.repoBackend, docPath, id, c,
          fcontext.fileContext);
!     return c.initEdit(fnode.backend, services);
    }
  
--- 80,89 ----
     * @return a new FileNode with the cloned context
     */
!   static NodeContent.Editor cloneNode(AbstractRepository.Backend repoBackend,
        Path docPath, Name id, Node node, FileNode fcontext) {
      AbstractContent c = AbstractContent.ingest(node.content());
!     FileNode fnode = new FileNode(repoBackend, docPath, id, c,
          fcontext.fileContext);
!     return c.initEdit(fnode.backend);
    }
  
***************
*** 104,115 ****
     *          a File reference to provide context for this Node
     */
!   protected FileNode(FileRepository.Backend repoBackend, Path docPath, Name id,
        AbstractContent c, File file) {
!     super(repoBackend.repository(), c.type(), id);
!     this.repoBackend = repoBackend;
      this.docPath = docPath;
      this.fileContext = file;
      this.bareContent = c;
!     this.cap = CapabilityImpl.createOwner(repo.user());
    }
  
--- 103,113 ----
     *          a File reference to provide context for this Node
     */
!   protected FileNode(AbstractRepository.Backend repoBackend, Path docPath, Name id,
        AbstractContent c, File file) {
!     super(repoBackend, c.type(), id);
      this.docPath = docPath;
      this.fileContext = file;
      this.bareContent = c;
!     this.cap = CapabilityImpl.createOwner(repoBackend.repository().user());
    }
  
***************
*** 126,130 ****
    public NodeContent content() {
      if (content == null && bareContent != null) {
!       content = bareContent.nodeContent(backend, repoBackend, null);
      }
      return content;
--- 124,128 ----
    public NodeContent content() {
      if (content == null && bareContent != null) {
!       content = bareContent.nodeContent(backend, null);
      }
      return content;
***************
*** 165,169 ****
     */
    public final FileRepository fileRepository() {
!     return repoBackend.fileRepository();
    }
  
--- 163,167 ----
     */
    public final FileRepository fileRepository() {
!     return (FileRepository) repository();
    }