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

Ian Grigg iang@cypherpunks.ai
Fri, 6 Apr 2001 20:09:46 -0400 (AST) 

iang        01/04/06 20:09:46

  Modified:    webfunds/client/contracts/wizard ContractFile.java
               webfunds/client/plugins PluginManager.java
                        WalletManager.java
  Log:
  Now use the IniFileReader in its new home webfunds.util.

Revision  Changes    Path
1.10      +6 -4      java/webfunds/client/contracts/wizard/ContractFile.java

Index: ContractFile.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/contracts/wizard/ContractFile.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ContractFile.java	2000/11/09 13:26:14	1.9
+++ ContractFile.java	2001/04/07 00:09:45	1.10
@@ -1,5 +1,5 @@
 /*
- * $Id: ContractFile.java,v 1.9 2000/11/09 13:26:14 iang Exp $
+ * $Id: ContractFile.java,v 1.10 2001/04/07 00:09:45 iang Exp $
  *
  * Copyright (c) Systemics Inc 2000 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -15,7 +15,9 @@
 import java.awt.event.*;
 import javax.swing.*;
 
-import webfunds.ricardian.IniFileReader;
+import webfunds.util.IniFileReader;
+import webfunds.util.FormattedFileException;
+
 import webfunds.ricardian.Contract;
 import webfunds.ricardian.ContractException;
 
@@ -24,7 +26,7 @@
  * Panel that asks for the filename of the contract.
  *
  * @author Edwin Woudt <edwin@webfunds.org>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
  */
 
 public class ContractFile extends SignContractWizardPanel 
@@ -208,7 +210,7 @@
         IniFileReader ini;
         try {
             ini = new IniFileReader(s.getBytes());
-        } catch (ContractException ex) {
+        } catch (FormattedFileException ex) {
             error(ex.getMessage());
             return false;
         }



1.21      +5 -3      java/webfunds/client/plugins/PluginManager.java

Index: PluginManager.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/plugins/PluginManager.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- PluginManager.java	2001/03/18 03:21:06	1.20
+++ PluginManager.java	2001/04/07 00:09:46	1.21
@@ -1,5 +1,5 @@
 /* 
- * $Id: PluginManager.java,v 1.20 2001/03/18 03:21:06 iang Exp $
+ * $Id: PluginManager.java,v 1.21 2001/04/07 00:09:46 iang Exp $
  *
  * Copyright (c) 1995-2000 Systemics Inc on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -15,7 +15,9 @@
 import java.io.FileNotFoundException;
 
 import webfunds.sox.ItemId;
-import webfunds.ricardian.IniFileReader;
+import webfunds.util.IniFileReader;
+import webfunds.util.FormattedFileException;
+
 import webfunds.ricardian.ContractException;
 
 import webfunds.client.AccountInfo;
@@ -238,7 +240,7 @@
         IniFileReader ini;
         try {
             ini = new IniFileReader(buf);
-        } catch (ContractException ex) {
+        } catch (FormattedFileException ex) {
             s += "Ex: " + ex + "\n" + "Spec " + spec +
                    " not a valid Ini file!  " + vvv;
             logmsg(s);



1.6       +5 -3      java/webfunds/client/plugins/WalletManager.java

Index: WalletManager.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/client/plugins/WalletManager.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- WalletManager.java	2001/03/18 03:21:06	1.5
+++ WalletManager.java	2001/04/07 00:09:46	1.6
@@ -1,5 +1,5 @@
 /*
- * $Id: WalletManager.java,v 1.5 2001/03/18 03:21:06 iang Exp $
+ * $Id: WalletManager.java,v 1.6 2001/04/07 00:09:46 iang Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
@@ -17,7 +17,9 @@
 import java.io.File;
 import java.security.SecureRandom;
 
-import webfunds.ricardian.IniFileReader;
+import webfunds.util.IniFileReader;
+import webfunds.util.FormattedFileException;
+
 import webfunds.ricardian.ContractException;
 
 import webfunds.client.Addressbook;
@@ -321,7 +323,7 @@
         IniFileReader ini;
         try {
             ini = new IniFileReader(buf);
-        } catch (ContractException ex) {
+        } catch (FormattedFileException ex) {
             throw new PluginException("Ex: " + ex + "\n" + "Spec " + spec +
                    " not a valid Ini file!");
         }