[Webfunds-commits] java/webfunds/client/plugins WalletManager.java

Ian Grigg iang@cypherpunks.ai
Sat, 14 Apr 2001 13:49:51 -0400 (AST)


iang        01/04/14 13:49:51

  Modified:    webfunds/client AccountBrowserImpl.java AboutFrame.java
                        Core.java
               webfunds/client/plugins WalletManager.java
  Added:       webfunds/client Version.java
  Log:
  Added a Version class with a few changeable distribution params,
  distribution script checks.  Now used in About and Startup.

Revision  Changes    Path
1.89      +4 -3      java/webfunds/client/AccountBrowserImpl.java

Index: AccountBrowserImpl.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/AccountBrowserImpl.java,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- AccountBrowserImpl.java	2001/04/14 02:59:07	1.88
+++ AccountBrowserImpl.java	2001/04/14 17:49:50	1.89
@@ -1,5 +1,5 @@
 /*
- * $Id: AccountBrowserImpl.java,v 1.88 2001/04/14 02:59:07 iang Exp $
+ * $Id: AccountBrowserImpl.java,v 1.89 2001/04/14 17:49:50 iang Exp $
  *
  * Copyright (c) Systemics Inc 1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -73,7 +73,7 @@
 
     private boolean init;
 
-    final static String me = "WebFunds"; // replace with property!
+    final static String me = Version.NAME;
     public final static String TAB = "  ",
                                fix = "AB: ";
 
@@ -1082,7 +1082,8 @@
           public void actionPerformed(ActionEvent evt)
           {
 
-            AboutFrame fr = new AboutFrame(Core.me);
+            String name = Version.getFullName();
+            AboutFrame fr = new AboutFrame(name);
             fr.pack();
             fr.show();
           }



1.6       +2 -2      java/webfunds/client/AboutFrame.java

Index: AboutFrame.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/AboutFrame.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AboutFrame.java	2000/03/28 19:13:20	1.5
+++ AboutFrame.java	2001/04/14 17:49:50	1.6
@@ -1,5 +1,5 @@
 /*
- * $Id: AboutFrame.java,v 1.5 2000/03/28 19:13:20 iang Exp $
+ * $Id: AboutFrame.java,v 1.6 2001/04/14 17:49:50 iang Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -68,7 +68,7 @@
         
         contentPane.add(iconlabel,"North");
         contentPane.add(textlabel,"Center");
-        contentPane.add(textlabel,"Center");
+        // contentPane.add(textlabel,"Center");
         contentPane.add(close, "South");
         
         close.addActionListener



1.75      +6 -5      java/webfunds/client/Core.java

Index: Core.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/Core.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- Core.java	2001/04/13 17:43:15	1.74
+++ Core.java	2001/04/14 17:49:50	1.75
@@ -1,4 +1,4 @@
-/* $Id: Core.java,v 1.74 2001/04/13 17:43:15 iang Exp $
+/* $Id: Core.java,v 1.75 2001/04/14 17:49:50 iang Exp $
  *
  * Copyright (c) Systemics Inc. 1995-2000 on behalf of
  * The WebFunds Development Team.  All rights reserved.
@@ -23,7 +23,6 @@
 
 import webfunds.utils.Debug;
 import webfunds.utils.MultiPrintStream;
-import webfunds.utils.VersionNumbers;
 
 import webfunds.ricardian.ContractStore;
 import webfunds.ricardian.ContractException;
@@ -59,7 +58,8 @@
     private static final File walletsDir      = pluginsDir;
 
     /** customisable brand name */
-    public static String me        = "WebFunds";
+    // public static String me        = "WebFunds";
+    // public static String fullMe    = me + " " + Version.DISTRIBUTION_VERSION;
 
     private final SecureRandom random;
 
@@ -404,7 +404,8 @@
     protected void ouch(String s)
     {
         String ouch = "\n" +
-        "This is an old database that is no longer supported by " + me + ".\n" +
+        "This is an old database that is no longer supported by " + 
+               Version.NAME + ".\n" +
         "\n" +
         "To recover your payments, run your old program and write\n" +
         "payments from each account, then deposit into a new program.\n" +
@@ -577,7 +578,7 @@
         boolean useDefaults = false;
         if (!userDir.exists())
         {
-            Startup startup = new Startup(userDir, me);
+            Startup startup = new Startup(userDir, Version.getFullName());
             String s = startup.showDialog();
             if (Startup.CANCEL.equals(s))
                 System.exit(0);



1.1                  java/webfunds/client/Version.java

Index: Version.java
===================================================================
package webfunds.client;

public class Version
{
    private Version() {}
    public static final String DISTRIBUTION_VERSION = "1.8.0";
    public static final String NAME = "WebFunds";
    public static String getFullName()
                         { return NAME + " " + DISTRIBUTION_VERSION; }
}



1.9       +2 -2      java/webfunds/client/plugins/WalletManager.java

Index: WalletManager.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/plugins/WalletManager.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- WalletManager.java	2001/04/14 03:29:53	1.8
+++ WalletManager.java	2001/04/14 17:49:51	1.9
@@ -1,5 +1,5 @@
 /*
- * $Id: WalletManager.java,v 1.8 2001/04/14 03:29:53 iang Exp $
+ * $Id: WalletManager.java,v 1.9 2001/04/14 17:49:51 iang Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -19,6 +19,7 @@
 import webfunds.util.IniFileReader;
 import webfunds.util.FormattedFileException;
 import webfunds.util.Log;
+import webfunds.util.VersionNumbers;
 
 import webfunds.comms.CommsManager;
 
@@ -35,7 +36,6 @@
 import webfunds.store.StoreException;
 import webfunds.store.SepFileStore;
 
-import webfunds.utils.VersionNumbers;
 
 public class WalletManager
     extends Manager implements CorePart, WalletContext