[Webfunds-commits] java/webfunds/sox DepositRequest.java Payment.java

Ian Grigg iang@cypherpunks.ai
Sun, 16 Jul 2000 15:27:24 -0400 (AST)


iang        00/07/16 15:27:24

  Modified:    webfunds/client SimplePaymentFrame.java WalletInterface.java
               webfunds/client/sox StateReceipt.java
               webfunds/sox DepositRequest.java Payment.java
  Log:
  Minor comments or old code cleaned only.
  Payment now described special magic chars not permitted in text fields
  like PID/DID.

Revision  Changes    Path
1.44      +1 -2      java/webfunds/client/SimplePaymentFrame.java

Index: SimplePaymentFrame.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/SimplePaymentFrame.java,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- SimplePaymentFrame.java	2000/07/07 01:53:51	1.43
+++ SimplePaymentFrame.java	2000/07/16 19:27:23	1.44
@@ -1,5 +1,5 @@
 /*
- * $Id: SimplePaymentFrame.java,v 1.43 2000/07/07 01:53:51 iang Exp $
+ * $Id: SimplePaymentFrame.java,v 1.44 2000/07/16 19:27:23 iang Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -362,7 +362,6 @@
         if ("Make Payment".equals(command))
         {
             double am = contract.getAmount(longamount);
-//currency_tla=AUG
             String tla = contract.getField("currency", "currency_tla");
             String nam = "";
             if (tla == null)



1.36      +1 -6      java/webfunds/client/WalletInterface.java

Index: WalletInterface.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/WalletInterface.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- WalletInterface.java	2000/06/05 03:48:15	1.35
+++ WalletInterface.java	2000/07/16 19:27:23	1.36
@@ -1,5 +1,5 @@
 /*
- * $Id: WalletInterface.java,v 1.35 2000/06/05 03:48:15 gelderen Exp $
+ * $Id: WalletInterface.java,v 1.36 2000/07/16 19:27:23 iang Exp $
  *
  * Copyright (c) 1995-2000 Systemics Ltd on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -164,11 +164,6 @@
      */
     Transaction[] getTransactions(AccountInfo account, ItemId contract);
     
-//    /**
-//     *  Unused!
-//     */
-//    Transaction getPaymentStatus(byte[] payment);
-
     /**
      *  Provide a help string for each of the different levels.
      */



1.3       +2 -2      java/webfunds/client/sox/StateReceipt.java

Index: StateReceipt.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/sox/StateReceipt.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StateReceipt.java	2000/07/06 17:09:25	1.2
+++ StateReceipt.java	2000/07/16 19:27:23	1.3
@@ -1,5 +1,5 @@
 /*
- * $Id: StateReceipt.java,v 1.2 2000/07/06 17:09:25 gelderen Exp $
+ * $Id: StateReceipt.java,v 1.3 2000/07/16 19:27:23 iang Exp $
  *
  * Copyright (c) 2000 Systemics Inc on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -52,7 +52,7 @@
 
     /**
      *  Get the Pending if there.
-     *  @return the PendingReceipt, else null if settled
+     *  @return the Receipt, else null if not settled as yet
      */
     public Receipt           getReceipt()         { return receipt; }
     protected Receipt        receipt;



1.22      +3 -2      java/webfunds/sox/DepositRequest.java

Index: DepositRequest.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/DepositRequest.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- DepositRequest.java	2000/06/11 22:29:42	1.21
+++ DepositRequest.java	2000/07/16 19:27:24	1.22
@@ -1,5 +1,5 @@
 /*
- * $Id: DepositRequest.java,v 1.21 2000/06/11 22:29:42 iang Exp $
+ * $Id: DepositRequest.java,v 1.22 2000/07/16 19:27:24 iang Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -38,7 +38,8 @@
      * An identifier for this deposit request
      *
      * Note: although a java String is used, this identifier
-     * should only contain 8-bit ascii characters.
+     * should only contain 8-bit ascii characters, following
+     * the same rules as that of the payment id (pid).
      */
     protected String depositId;
 



1.21      +7 -3      java/webfunds/sox/Payment.java

Index: Payment.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/Payment.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Payment.java	2000/06/20 20:07:25	1.20
+++ Payment.java	2000/07/16 19:27:24	1.21
@@ -1,5 +1,5 @@
 /*
- * $Id: Payment.java,v 1.20 2000/06/20 20:07:25 gelderen Exp $
+ * $Id: Payment.java,v 1.21 2000/07/16 19:27:24 iang Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -101,8 +101,12 @@
     /**
      * Get the identifier on the payment, as originally created by the payer
      *
-     * Note: although a java String is used, this identifier
-     * should only contain 8-bit ascii characters.
+     *  Note: although a java String is used, this identifier
+     *  (and any did used in the deposit)
+     *  should only contain printable 7-bit ascii characters
+     *  excluding six magic characters:
+     *
+     *             -|:{}#
      */
     public String getId() { return paymentId; }