[Webfunds-commits] java/webfunds/client Core.java

Ian Grigg iang@cypherpunks.ai
Sun, 17 Sep 2000 17:02:20 -0400 (AST) 

iang        00/09/17 17:02:20

  Modified:    webfunds/utils VersionNumbers.java
               webfunds/client/sox SOXWallet.java
               webfunds/client Core.java
  Log:
  cleaned up some clashes

Revision  Changes    Path
1.4       +2 -2      java/webfunds/utils/VersionNumbers.java

Index: VersionNumbers.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/utils/VersionNumbers.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VersionNumbers.java	2000/09/17 19:40:08	1.3
+++ VersionNumbers.java	2000/09/17 21:02:18	1.4
@@ -1,5 +1,5 @@
 /*
- * $Id: VersionNumbers.java,v 1.3 2000/09/17 19:40:08 iang Exp $
+ * $Id: VersionNumbers.java,v 1.4 2000/09/17 21:02:18 iang Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -59,7 +59,7 @@
         String[] list = dir.list();
         if (list == null)
         {
-            logmsg("plugin directory: " + dir + " not present");
+            logmsg("version directory: " + dir + " is empty");
             return new String[0] ;
         }
         Vector victor = new Vector();



1.133     +6 -1      java/webfunds/client/sox/SOXWallet.java

Index: SOXWallet.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/sox/SOXWallet.java,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -r1.132 -r1.133
--- SOXWallet.java	2000/09/17 20:30:29	1.132
+++ SOXWallet.java	2000/09/17 21:02:19	1.133
@@ -1,4 +1,4 @@
-/* $Id: SOXWallet.java,v 1.132 2000/09/17 20:30:29 iang Exp $
+/* $Id: SOXWallet.java,v 1.133 2000/09/17 21:02:19 iang Exp $
  *
  * Copyright (c) Systemics Inc. 1995-2000 on behalf of
  * The WebFunds Development Team.  All Rights Reserved.
@@ -1949,6 +1949,11 @@
         }
         sub = new ValueAccount(item);
 
+        //
+        //  Ouch!  This part should be SYNCronised, as it can
+        //  trigger slowdowns and the user can call in here
+        //  many times...
+        //
         try {
             acct.newSub(sub);
         } catch (SOXSubAccountException ex) {



1.63      +21 -16    java/webfunds/client/Core.java

Index: Core.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/Core.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- Core.java	2000/09/17 20:43:31	1.62
+++ Core.java	2000/09/17 21:02:19	1.63
@@ -1,4 +1,4 @@
-/* $Id: Core.java,v 1.62 2000/09/17 20:43:31 iang Exp $
+/* $Id: Core.java,v 1.63 2000/09/17 21:02:19 iang Exp $
  *
  * Copyright (c) Systemics Inc. 1995-2000 on behalf of
  * The WebFunds Development Team.  All rights reserved.
@@ -36,10 +36,11 @@
 public final class Core
     extends Debug
 {
-    public static File userDir     = new File("user");
-    public static File defaultDir  = new File("defaults");
-    public static File propfile    = new File(userDir, "props.dat");
-    public static File pluginsDir  = new File("plugins");
+    public static final File userDir     = new File("user");
+    public static final File defaultDir  = new File("defaults");
+    public static final File propfile    = new File(userDir, "props.dat");
+    public static final File pluginsDir  = new File("plugins");
+    public static final File walletsDir  = new File(pluginsDir, "wallets");
 
     /** customisable brand name */
     public static String me        = "WebFunds";
@@ -185,17 +186,19 @@
         // set rest of CoreParts.
         // Somewhere here, it freezes.
         //
-        logstart("CoreParts: multi ");
+        logmsg("CoreParts: multi ");
         setStore(v2); // multistore);
-        logword("address ");
+        logmsg("address ");
         setAddressbook(new Addressbook());
-        logword("browser ");
-        setAccountBrowser(new AccountBrowserImpl(bug));
-        logword("wallets ");
+        logmsg("browser ");
+        AccountBrowserImpl ab1 = new AccountBrowserImpl(bug);
+        logmsg("    ab1: " + ab1);
+        setAccountBrowser(ab1);
+        logmsg("wallets ");
         setWalletManager(new WalletManager(bug));
-        logword("plugins ");
+        logmsg("plugins ");
         setPluginManager(new PluginManager(bug));
-        logend("set.");
+        logmsg("set.");
 
 
         //
@@ -245,11 +248,10 @@
         //
         logmsg("Wallets: SOX - - - - - - - - - - - - - - - - - - - - - - -");
         wm.addWallet("webfunds.client.sox.SOXWallet");
-        wm.add3rdPartyWallets(new File(pluginsDir, "wallets"));
-//        logmsg("         Mkt - - - - - - - - - - - - - - - - - - - - - - -");
-//        wm.addWallet("systemics.trader.MarketWallet");
-        logmsg("wallets open. ============================================");
 
+        logmsg("Wallets: 3rd Party - - - - - - - - - - - - - - - - - - - -");
+        wm.add3rdPartyWallets(walletsDir);
+        logmsg("wallets open. ============================================");
 
         NetWatcher.setNetOn();   // let 'em rip
 
@@ -352,8 +354,11 @@
 
     private void setAccountBrowser(AccountBrowser accountbrowser)
     {
+        System.err.println("    ab1: " + accountbrowser);
         ab = accountbrowser;
+        System.err.println("    ab2");
         ab.setCore(this);
+        System.err.println("    ab3");
     }
 
     public AccountBrowser getAccountBrowser(CorePart cp)