[Webfunds-commits] java/webfunds/utils Diagnostics.java
Jeroen C. van Gelderen
gelderen@cypherpunks.ai
Sun, 4 Jun 2000 22:43:24 -0400 (AST)
gelderen 00/06/04 22:43:24
Modified: . Makefile
webfunds/client Client.java Core.java
webfunds/client/plugins Plugin.java PluginManager.java
webfunds/client/sox SOXWallet.java
webfunds/sox Issuer.java IssuerFinder.java
webfunds/store AppendFileStore.java
webfunds/utils Diagnostics.java
Log:
Add explicit import statements to work around circular dependencies
between packages.
Revision Changes Path
1.2 +14 -3 java/Makefile
Index: Makefile
===================================================================
RCS file: /home/webfunds/cvsroot/java/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Makefile 2000/06/04 19:51:30 1.1
+++ Makefile 2000/06/05 02:43:21 1.2
@@ -1,7 +1,18 @@
-all:
- ./build_sox && ./build
-run:
+all: sox
+ ./build
+
+builddir:
+ @mkdir ../build
+
+sox:
+ ${JAVAC} -d ../build \
+ sun/security/x509/*.java \
+ hotlava/crypto/*.java \
+ webfunds/utils/*.java \
+ webfunds/sox/*.java
+
+run: all
./wf
.PHONY: all run
1.23 +4 -3 java/webfunds/client/Client.java
Index: Client.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/Client.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- Client.java 1999/11/27 15:58:41 1.22
+++ Client.java 2000/06/05 02:43:22 1.23
@@ -1,5 +1,5 @@
/*
- * $Id: Client.java,v 1.22 1999/11/27 15:58:41 iang Exp $
+ * $Id: Client.java,v 1.23 2000/06/05 02:43:22 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -9,19 +9,20 @@
import java.beans.*;
import java.io.*;
import java.net.*;
-import java.util.*;
import java.security.*;
+import java.util.*;
import sun.security.x509.*;
import webfunds.client.sox.*;
+import webfunds.client.sox.SOXWallet;
import webfunds.sox.*;
import webfunds.ricardian.Contract;
import webfunds.client.contracts.ChangeContractStore;
+
public class Client
{
-
private ClassLoader classloader;
private SOXWallet wallet;
private KeyPair keypair;
1.56 +3 -2 java/webfunds/client/Core.java
Index: Core.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/Core.java,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- Core.java 2000/06/04 19:47:27 1.55
+++ Core.java 2000/06/05 02:43:22 1.56
@@ -1,4 +1,4 @@
-/* $Id: Core.java,v 1.55 2000/06/04 19:47:27 gelderen Exp $
+/* $Id: Core.java,v 1.56 2000/06/05 02:43:22 gelderen Exp $
*
* Copyright (c) Systemics Inc. 1995-2000 on behalf of
* The WebFunds Development Team. All rights reserved.
@@ -22,7 +22,8 @@
import webfunds.ricardian.ContractDirectoryException;
import webfunds.ricardian.IniFileReader;
import webfunds.client.contracts.ChangeContractStore;
-import webfunds.client.plugins.*;
+import webfunds.client.plugins.PluginException;
+import webfunds.client.plugins.PluginManager;
import webfunds.store.*;
1.9 +4 -1 java/webfunds/client/plugins/Plugin.java
Index: Plugin.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/plugins/Plugin.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Plugin.java 2000/05/27 03:11:56 1.8
+++ Plugin.java 2000/06/05 02:43:22 1.9
@@ -1,5 +1,5 @@
/*
- * $Id: Plugin.java,v 1.8 2000/05/27 03:11:56 iang Exp $
+ * $Id: Plugin.java,v 1.9 2000/06/05 02:43:22 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -15,6 +15,9 @@
import webfunds.store.Store;
import webfunds.client.contracts.ChangeContractStore;
+import webfunds.client.AccountInfo;
+import webfunds.client.UInterface;
+import webfunds.client.WalletInterface;
import webfunds.client.*;
public abstract class Plugin
1.12 +9 -2 java/webfunds/client/plugins/PluginManager.java
Index: PluginManager.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/plugins/PluginManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- PluginManager.java 2000/06/05 00:57:15 1.11
+++ PluginManager.java 2000/06/05 02:43:22 1.12
@@ -1,5 +1,5 @@
/*
- * $Id: PluginManager.java,v 1.11 2000/06/05 00:57:15 iang Exp $
+ * $Id: PluginManager.java,v 1.12 2000/06/05 02:43:22 gelderen Exp $
*
* Copyright (c) 1995-2000 Systemics Inc on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -18,8 +18,15 @@
import webfunds.ricardian.IniFileReader;
import webfunds.ricardian.ContractException;
-import webfunds.client.contracts.ChangeContractStore;
+import webfunds.client.AccountInfo;
+import webfunds.client.Addressbook;
+import webfunds.client.CorePart;
+import webfunds.client.Manager;
+import webfunds.client.UInterface;
+import webfunds.client.WalletInterface;
import webfunds.client.*;
+import webfunds.client.contracts.ChangeContractStore;
+
import webfunds.store.Store;
import webfunds.store.StoreException;
1.119 +34 -7 java/webfunds/client/sox/SOXWallet.java
Index: SOXWallet.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/sox/SOXWallet.java,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -r1.118 -r1.119
--- SOXWallet.java 2000/06/05 00:48:48 1.118
+++ SOXWallet.java 2000/06/05 02:43:22 1.119
@@ -1,23 +1,50 @@
-/* $Id: SOXWallet.java,v 1.118 2000/06/05 00:48:48 iang Exp $
+/* $Id: SOXWallet.java,v 1.119 2000/06/05 02:43:22 gelderen Exp $
*
- * Copyright (c) Systemics Ltd 1995-1999 on behalf of
+ * Copyright (c) Systemics Ltd 1995-2000 on behalf of
* the WebFunds Development Team. All Rights Reserved.
*/
package webfunds.client.sox;
-import java.awt.event.ActionEvent;
-import java.beans.*;
+// JDK
import java.io.*;
import java.net.*;
import java.util.*;
+
+// AWT+Swing
+import java.awt.event.ActionEvent;
+import java.beans.*;
-import webfunds.client.*;
+import webfunds.client.AccountInfo;
+import webfunds.client.Addressbook;
+import webfunds.client.SepFileStore;
+import webfunds.client.Transaction;
+import webfunds.client.UInterface;
+import webfunds.client.WalletContext;
+import webfunds.client.WalletInterface;
+import webfunds.client.sox.StoreAccountStore;
import webfunds.ricardian.Contract;
import webfunds.ricardian.ContractStore;
import webfunds.ricardian.SOXServerException;
-import webfunds.sox.*;
-import webfunds.store.*;
+import webfunds.sox.Account;
+import webfunds.sox.AccountId;
+import webfunds.sox.Armoury;
+import webfunds.sox.Crypto;
+import webfunds.sox.IssuerFinder;
+import webfunds.sox.ItemId;
+import webfunds.sox.MailId;
+import webfunds.sox.MailItem;
+import webfunds.sox.Payment;
+import webfunds.sox.Receipt;
+import webfunds.sox.SOXAccountException;
+import webfunds.sox.SOXException;
+import webfunds.sox.SOXLaterException;
+import webfunds.sox.SOXPacketException;
+import webfunds.sox.SOXSubAccountException;
+import webfunds.sox.SubAccount;
+import webfunds.sox.ValueAccount;
+import webfunds.store.Store;
+import webfunds.store.StoreException;
import webfunds.utils.Debug;
import webfunds.utils.Hex;
import webfunds.utils.Panic;
1.17 +5 -5 java/webfunds/sox/Issuer.java
Index: Issuer.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/Issuer.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Issuer.java 1999/09/25 19:49:26 1.16
+++ Issuer.java 2000/06/05 02:43:23 1.17
@@ -1,5 +1,5 @@
/*
- * $Id: Issuer.java,v 1.16 1999/09/25 19:49:26 iang Exp $
+ * $Id: Issuer.java,v 1.17 2000/06/05 02:43:23 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-1999 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -29,7 +29,7 @@
* @except SOXIssuerException this Issuer object is dead
* @except SOXLaterException no contact available right now
*/
- public void getReady()
+ void getReady()
throws SOXIssuerException, SOXLaterException;
/**
@@ -40,7 +40,7 @@
* @except SOXIssuerException this Issuer object is dead
* @except SOXLaterException no contact available right now
*/
- public byte[] request(Request request)
+ byte[] request(Request request)
throws SOXIssuerException, SOXLaterException;
/**
@@ -50,7 +50,7 @@
*
* @return milliseconds local is ahead of the issuer
*/
- public long getTimeDifference();
+ long getTimeDifference();
/**
* A likely deviation.
@@ -58,5 +58,5 @@
*
* @return milliseconds of possible inaccuracy
*/
- public long getTimeDeviation();
+ long getTimeDeviation();
}
1.2 +1 -1 java/webfunds/sox/IssuerFinder.java
Index: IssuerFinder.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/sox/IssuerFinder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- IssuerFinder.java 1999/09/25 19:49:26 1.1
+++ IssuerFinder.java 2000/06/05 02:43:23 1.2
@@ -16,6 +16,6 @@
* @except SOXIssuerException something screwed up
* @except SOXLaterException server down, wait a bit
*/
- public Issuer getIssuer(ItemId id)
+ Issuer getIssuer(ItemId id)
throws SOXIssuerException, SOXLaterException;
}
1.13 +11 -10 java/webfunds/store/AppendFileStore.java
Index: AppendFileStore.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/store/AppendFileStore.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- AppendFileStore.java 2000/06/04 19:54:15 1.12
+++ AppendFileStore.java 2000/06/05 02:43:23 1.13
@@ -1,32 +1,33 @@
/*
- * $Id: AppendFileStore.java,v 1.12 2000/06/04 19:54:15 gelderen Exp $
+ * $Id: AppendFileStore.java,v 1.13 2000/06/05 02:43:23 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995-2000 on behalf of
* the WebFunds Development Team. All Rights Reserved.
*/
package webfunds.store;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.EOFException;
import java.io.File;
import java.io.FileDescriptor;
-import java.io.OutputStream;
-import java.io.DataOutputStream;
-import java.io.DataInputStream;
-import java.io.FileOutputStream;
import java.io.FileInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.EOFException;
import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
import java.io.PrintWriter;
-
-import java.util.Hashtable;
import java.util.Enumeration;
+import java.util.Hashtable;
import java.lang.reflect.InvocationTargetException;
import webfunds.sox.*; // for examples
import webfunds.utils.Diagnostics;
import webfunds.utils.Hex;
+
/**
* A hashtable object that provides access to files stored in a directory.
1.2 +4 -4 java/webfunds/utils/Diagnostics.java
Index: Diagnostics.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/utils/Diagnostics.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Diagnostics.java 2000/01/10 02:58:06 1.1
+++ Diagnostics.java 2000/06/05 02:43:24 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: Diagnostics.java,v 1.1 2000/01/10 02:58:06 iang Exp $
+ * $Id: Diagnostics.java,v 1.2 2000/06/05 02:43:24 gelderen Exp $
*
* Copyright (c) Systemics Ltd 1995 on behalf of
* the WebFunds Development Team. All Rights Reserved.
@@ -11,15 +11,15 @@
public interface Diagnostics
{
- public void logmsg(String s);
+ void logmsg(String s);
/**
* Do stack trace prints to err(), should always return something.
*/
- public PrintWriter err();
+ PrintWriter err();
/**
* Returns a debug writer, if any is set.
*/
- public PrintWriter getDebug();
+ PrintWriter getDebug();
}