[Nodal-cvs] nodal/j-src/storage/framework ProxyNode.java,1.15,1.16 Store.java,1.2,1.3 DirFromNode.java,1.15,1.16 SimpleTxnManager.java,1.4,1.5

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

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

Modified Files:
	ProxyNode.java Store.java DirFromNode.java 
	SimpleTxnManager.java 
Log Message:
Disambiguate various nested interfaces.

Index: ProxyNode.java
===================================================================
RCS file: /cvsroot/nodal/nodal/j-src/storage/framework/ProxyNode.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ProxyNode.java	12 Nov 2004 19:23:24 -0000	1.15
--- ProxyNode.java	9 Dec 2004 19:26:21 -0000	1.16
***************
*** 227,231 ****
      }
  
!     abstract public Editor edit();
  
      public MapNode.Editor editMap() {
--- 227,231 ----
      }
  
!     abstract public NodeContent.Editor edit();
  
      public MapNode.Editor editMap() {
***************
*** 387,391 ****
  
      public NodeContent.Editor edit() {
!       return editMap();
      }
  
--- 387,391 ----
  
      public NodeContent.Editor edit() {
!       return editSet();
      }
  

Index: SimpleTxnManager.java
===================================================================
RCS file: /cvsroot/nodal/nodal/j-src/storage/framework/SimpleTxnManager.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** SimpleTxnManager.java	16 Nov 2004 19:25:35 -0000	1.4
--- SimpleTxnManager.java	9 Dec 2004 19:26:21 -0000	1.5
***************
*** 55,59 ****
    }
  
!   public void notifyCommitted(Resolver resolver) {
      services.commitTxn(resolver);
      this.current = factory.create(this);
--- 55,59 ----
    }
  
!   public void notifyCommitted(TxnManager.Resolver resolver) {
      services.commitTxn(resolver);
      this.current = factory.create(this);
***************
*** 207,209 ****
      return current.commit();
    }
! }
\ No newline at end of file
--- 207,209 ----
      return current.commit();
    }
! }

Index: Store.java
===================================================================
RCS file: /cvsroot/nodal/nodal/j-src/storage/framework/Store.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Store.java	5 Nov 2003 23:39:53 -0000	1.2
--- Store.java	9 Dec 2004 19:26:21 -0000	1.3
***************
*** 37,41 ****
       */
      boolean registerNode (Node node, UpdateNode updateCB);
!   };
  
    /**
--- 37,41 ----
       */
      boolean registerNode (Node node, UpdateNode updateCB);
!   }
  
    /**

Index: DirFromNode.java
===================================================================
RCS file: /cvsroot/nodal/nodal/j-src/storage/framework/DirFromNode.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** DirFromNode.java	2 Jun 2004 19:02:05 -0000	1.15
--- DirFromNode.java	9 Dec 2004 19:26:21 -0000	1.16
***************
*** 247,251 ****
       * @see org.nodal.filesystem.Directory#edit()
       */
!     public Editor edit() {
        return this;
      }
--- 247,251 ----
       * @see org.nodal.filesystem.Directory#edit()
       */
!     public Directory.Editor edit() {
        return this;
      }
***************
*** 360,362 ****
      return "Directory<" + path().toURLString() + ">";
    }
! }
\ No newline at end of file
--- 360,362 ----
      return "Directory<" + path().toURLString() + ">";
    }
! }