[Webfunds-commits] java/webfunds/ricardian Contract.java

Thu, 13 Jul 2000 16:30:14 -0400 (AST)

gelderen    00/07/13 16:30:14

  Modified:    webfunds/ricardian Contract.java
  Log:
  - Fix import statements in preparation for X.509 removal.

Revision  Changes    Path
1.23      +19 -20    java/webfunds/ricardian/Contract.java

Index: Contract.java
===================================================================
RCS file: /home/webfunds/cvsroot/java/webfunds/ricardian/Contract.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23

--- Contract.java	2000/07/07 18:07:10	1.22
+++ Contract.java	2000/07/13 20:30:13	1.23
@@ -1,48 +1,47 @@
-/*
- * $Id: Contract.java,v 1.22 2000/07/07 18:07:10 edwin Exp $
+/* $Id: Contract.java,v 1.23 2000/07/13 20:30:13 gelderen Exp $
  *
  * Copyright (c) Systemics Ltd 1995-1999 on behalf of
  * the WebFunds Development Team.  All Rights Reserved.
  */
 package webfunds.ricardian;
 
-import java.net.URL;
-import java.net.MalformedURLException;
 import java.io.File;
-import java.io.InputStream;
 import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.PrintWriter;
-import java.io.PrintStream;
+import java.io.InputStream;
 import java.io.IOException;
-import java.io.FileNotFoundException;
+import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.net.URL;
+import java.net.MalformedURLException;
+import java.security.*;
+import java.util.Enumeration;
+import java.util.Hashtable;
 
 // these are for the old canonical hash preparer.
 import java.io.BufferedReader;
-import java.io.InputStreamReader;
+import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
-import java.io.BufferedWriter;
+import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 
-import java.security.*;
-import sun.security.x509.*;
-import java.util.Hashtable;
-import java.util.Enumeration;
-
 import webfunds.utils.Debug;
 import webfunds.utils.Hex;
 
-// needed?
-import webfunds.sox.ItemId;
-import webfunds.sox.utils.Base64;
 import webfunds.sox.Armoury;
 import webfunds.sox.Crypto;
+import webfunds.sox.ItemId;
 import webfunds.sox.SOXKeyException;
+import webfunds.sox.utils.Base64;
+
+import sun.security.x509.X509Cert;
 
 import cryptix.openpgp.PGPMessage;
 import cryptix.openpgp.PGPPublicKey;
 
+
 /**
  * Ricardian Contract Base Class
  * Rewritten from the sox.Contract and the Perl equivalents.
@@ -251,7 +250,7 @@
 
         //
         // Skip any lines at beginning before BEGIN.
-        // Wierd.  We've been doing BEGIN SIGNED DATA for x509 contracts.
+        // Wierd.  We've been doing BEGIN SIGNED DATA for X.509 contracts.
         // BEGIN PGP SIGNED MESSAGE is used for PGP contracts.
         //
         boolean found = false;
@@ -304,7 +303,7 @@
                 if (lin.equals(X509_END))
                 {
                     if (!isX509Contract)
-                        System.err.println("unexpected x509 end: " + lin);
+                        System.err.println("unexpected X.509 end: " + lin);
                 }
                 else if (lin.equals(PGP_END))
                 {






