[Neuclear-develop] neuclear-ledger/src/java/org/neuclear/ledger/browser BookBrowser.java,1.3,1.4 LedgerBrowser.java,1.3,1.4

[Pelle B. <pe...@us...>]

Update of /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/browser
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25331/src/java/org/neuclear/ledger/browser

Modified Files:
	BookBrowser.java LedgerBrowser.java 
Log Message:
The simple browse(book) now works on hibernate, I have implemented the other two, which currently don not constrain the query correctly.

Index: BookBrowser.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/browser/BookBrowser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** BookBrowser.java	25 Mar 2004 22:04:45 -0000	1.3
--- BookBrowser.java	26 Mar 2004 23:36:34 -0000	1.4
***************
*** 3,8 ****
  import org.neuclear.ledger.LowlevelLedgerException;
  
! import java.math.BigDecimal;
! import java.sql.Timestamp;
  
  /*
--- 3,7 ----
  import org.neuclear.ledger.LowlevelLedgerException;
  
! import java.util.Date;
  
  /*
***************
*** 26,29 ****
--- 25,31 ----
  $Id$
  $Log$
+ Revision 1.4  2004/03/26 23:36:34  pelle
+ The simple browse(book) now works on hibernate, I have implemented the other two, which currently don not constrain the query correctly.
+ 
  Revision 1.3  2004/03/25 22:04:45  pelle
  The first shell for the HibernateBookBrowser
***************
*** 54,58 ****
  
  
!     protected final void setRow(String xid, String reqid, String counterparty, String comment, Timestamp valuetime, BigDecimal amount) {
          this.id = xid;
          this.reqid = reqid;
--- 56,60 ----
  
  
!     protected final void setRow(String xid, String reqid, String counterparty, String comment, Date valuetime, double amount, Date expirytime, Date cancelled, String completedId) {
          this.id = xid;
          this.reqid = reqid;
***************
*** 61,64 ****
--- 63,69 ----
          this.valuetime = valuetime;
          this.amount = amount;
+         this.cancelled = cancelled;
+         this.expirytime = expirytime;
+         this.completedId = completedId;
      }
  
***************
*** 83,94 ****
      }
  
!     public Timestamp getValuetime() {
          return valuetime;
      }
  
!     public BigDecimal getAmount() {
          return amount;
      }
  
      private final String book;
  
--- 88,115 ----
      }
  
!     public Date getValuetime() {
          return valuetime;
      }
  
!     public double getAmount() {
          return amount;
      }
  
+     public Date getExpirytime() {
+         return expirytime;
+     }
+ 
+     public Date getCancelled() {
+         return cancelled;
+     }
+ 
+     public String getCompletedId() {
+         return completedId;
+     }
+ 
+     boolean isHeld() {
+         return (expirytime != null);
+     }
+ 
      private final String book;
  
***************
*** 97,101 ****
      private String counterparty;
      private String comment;
!     private Timestamp valuetime;
!     private BigDecimal amount;
  }
--- 118,125 ----
      private String counterparty;
      private String comment;
!     private Date valuetime;
!     private Date expirytime;
!     private Date cancelled;
!     private String completedId;
!     private double amount;
  }

Index: LedgerBrowser.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-ledger/src/java/org/neuclear/ledger/browser/LedgerBrowser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** LedgerBrowser.java	21 Mar 2004 00:48:35 -0000	1.3
--- LedgerBrowser.java	26 Mar 2004 23:36:34 -0000	1.4
***************
*** 3,7 ****
  import org.neuclear.ledger.LowlevelLedgerException;
  
! import java.sql.Timestamp;
  
  /*
--- 3,7 ----
  import org.neuclear.ledger.LowlevelLedgerException;
  
! import java.util.Date;
  
  /*
***************
*** 25,28 ****
--- 25,31 ----
  $Id$
  $Log$
+ Revision 1.4  2004/03/26 23:36:34  pelle
+ The simple browse(book) now works on hibernate, I have implemented the other two, which currently don not constrain the query correctly.
+ 
  Revision 1.3  2004/03/21 00:48:35  pelle
  The problem with Enveloped signatures has now been fixed. It was a problem in the way transforms work. I have bandaided it, but in the future if better support for transforms need to be made, we need to rethink it a bit. Perhaps using the new crypto channel's in neuclear-commons.
***************
*** 45,50 ****
      public BookBrowser browse(String book) throws LowlevelLedgerException;
  
!     public BookBrowser browseFrom(String book, Timestamp from) throws LowlevelLedgerException;
  //    public BookBrowser browseUntil(Book book,Timestamp until);
!     public BookBrowser browseRange(String book, Timestamp from, Timestamp until) throws LowlevelLedgerException;
  }
--- 48,53 ----
      public BookBrowser browse(String book) throws LowlevelLedgerException;
  
!     public BookBrowser browseFrom(String book, Date from) throws LowlevelLedgerException;
  //    public BookBrowser browseUntil(Book book,Timestamp until);
!     public BookBrowser browseRange(String book, Date from, Date until) throws LowlevelLedgerException;
  }