[Webfunds-commits] java/webfunds/sox/value SSDStore.java StateReceiptStore.java WebFundsData.java
Ian Grigg
iang@cypherpunks.ai
Thu, 12 Apr 2001 00:51:06 -0400 (AST)
iang 01/04/12 00:51:06
Modified: webfunds/sox/value SSDStore.java StateReceiptStore.java
WebFundsData.java
Log:
fixed to use Log() replacement for PrintWriter
Revision Changes Path
1.3 +8 -5 java/webfunds/sox/value/SSDStore.java
Index: SSDStore.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/value/SSDStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SSDStore.java 2001/04/11 19:36:23 1.2
+++ SSDStore.java 2001/04/12 04:51:06 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: SSDStore.java,v 1.2 2001/04/11 19:36:23 iang Exp $
+ * $Id: SSDStore.java,v 1.3 2001/04/12 04:51:06 iang Exp $
*
* Copyright (c) 1995-2000 Systemics Inc. on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -8,9 +8,10 @@
import java.util.Enumeration;
-import java.io.PrintWriter;
import java.security.cert.Certificate;
+import webfunds.util.Log;
+
import webfunds.sox.Server;
import webfunds.sox.Issuer;
import webfunds.sox.ItemId;
@@ -27,6 +28,8 @@
public class SSDStore
extends DirSSDStore implements ServerFinder
{
+ protected static final String TAB = " ";
+ protected String fix = TAB + "sdS- ";
protected Store store;
protected ContractStore contracts;
@@ -34,10 +37,10 @@
public SSDStore(Store store,
ContractStore contracts,
CommsManager comms,
- PrintWriter bug)
+ Log bug)
{
super();
- debug(bug, " ssS: ");
+ debug(bug, fix);
if (comms == null)
throw new IllegalArgumentException("SSDStore comms == null");
@@ -128,7 +131,7 @@
}
Server server = new SmartServer(realname, (DirSSDStore)this,
- cert, comms, getDebug());
+ cert, comms, getLog());
return server;
}
1.3 +4 -4 java/webfunds/sox/value/StateReceiptStore.java
Index: StateReceiptStore.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/value/StateReceiptStore.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StateReceiptStore.java 2001/04/11 19:37:34 1.2
+++ StateReceiptStore.java 2001/04/12 04:51:06 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: StateReceiptStore.java,v 1.2 2001/04/11 19:37:34 iang Exp $
+ * $Id: StateReceiptStore.java,v 1.3 2001/04/12 04:51:06 iang Exp $
*
* Copyright (c) Systemics Ltd 1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -11,12 +11,12 @@
import java.util.Vector;
import java.io.IOException;
-import java.io.PrintWriter;
import java.io.ByteArrayOutputStream;
import webfunds.util.Hex;
import webfunds.util.Panic;
import webfunds.util.Support;
+import webfunds.util.Log;
import webfunds.utils.Debug;
@@ -49,7 +49,7 @@
static final String RECEIPTS_NAME = "Receipts";
static final String PENDING = "Pending";
- public StateReceiptStore(Store store, PrintWriter bug)
+ public StateReceiptStore(Store store, Log bug)
{
super();
debug(bug, TAB + fix);
@@ -59,7 +59,7 @@
public StateReceiptStore(Store store)
{
super();
- debug(new PrintWriter(System.err, true), fix);
+ debug(new Log(), fix);
init(store);
}
1.4 +5 -9 java/webfunds/sox/value/WebFundsData.java
Index: WebFundsData.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/value/WebFundsData.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WebFundsData.java 2001/04/10 20:13:21 1.3
+++ WebFundsData.java 2001/04/12 04:51:06 1.4
@@ -1,4 +1,4 @@
-/* $Id: WebFundsData.java,v 1.3 2001/04/10 20:13:21 iang Exp $
+/* $Id: WebFundsData.java,v 1.4 2001/04/12 04:51:06 iang Exp $
*
* Copyright (c) 1995-2001 Systemics Inc. on behalf of
* The WebFunds Development Team. All Rights Reserved.
@@ -7,10 +7,11 @@
import java.io.File;
-import java.io.PrintWriter;
import java.security.SecureRandom;
+import webfunds.util.Log;
+
import webfunds.sox.IssuerFinder;
import webfunds.sox.ServerFinder;
@@ -21,10 +22,6 @@
import webfunds.ricardian.DirContractStore;
import webfunds.ricardian.ContractDirectoryException;
-import webfunds.ricardian.SOXStore;
-// import webfunds.ricardian.DirSOXStore;
-import webfunds.ricardian.SOXServerException;
-
import webfunds.store.Store;
import webfunds.store.StoreException;
import webfunds.store.SepFileStore;
@@ -37,18 +34,17 @@
* Static data that identifies where files are, in
* the WebFunds v2 existance.
*
- * @version $Revision: 1.3 $
+ * @version $Revision: 1.4 $
*/
public class WebFundsData
{
private final String userDirName;
+ private Log bug;
private File soxDir, userDir;
private Store soxWalletStore;
private ContractStore contracts;
- // private CommsManager comms = null;
- private PrintWriter bug;
- public WebFundsData(String userDirName, PrintWriter bug)
+ public WebFundsData(String userDirName, Log bug)
{
this.userDirName = userDirName;
this.bug = bug;
@@ -72,7 +68,7 @@
{
if (soxWalletStore == null)
{
- soxWalletStore = SepFileStore.getInstance(soxDir);
+ soxWalletStore = SepFileStore.getInstance(soxDir, bug, "#sfS ");
if (soxWalletStore == null)
throw new RuntimeException("new returned null");
}