[Neuclear-develop] neuclear-id/src/java/org/neuclear/id/verifier VerifyingReader.java,1.12,1.13

[<pe...@us...>]

Update of /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier
In directory sc8-pr-cvs1:/tmp/cvs-serv10855/src/java/org/neuclear/id/verifier

Modified Files:
	VerifyingReader.java 
Log Message:
EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
Otherwise You will Finaliate.
Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final.
This should hopefully make everything more stable (and secure).

Index: VerifyingReader.java
===================================================================
RCS file: /cvsroot/neuclear/neuclear-id/src/java/org/neuclear/id/verifier/VerifyingReader.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** VerifyingReader.java	20 Nov 2003 23:42:24 -0000	1.12
--- VerifyingReader.java	21 Nov 2003 04:45:12 -0000	1.13
***************
*** 32,35 ****
--- 32,41 ----
  $Id$
  $Log$
+ Revision 1.13  2003/11/21 04:45:12  pelle
+ EncryptedFileStore now works. It uses the PBECipher with DES3 afair.
+ Otherwise You will Finaliate.
+ Anything that can be final has been made final throughout everyting. We've used IDEA's Inspector tool to find all instance of variables that could be final.
+ This should hopefully make everything more stable (and secure).
+ 
  Revision 1.12  2003/11/20 23:42:24  pelle
  Getting all the tests to work in id
***************
*** 108,112 ****
   * Time: 4:47:15 PM
   */
! public class VerifyingReader {
      private VerifyingReader() {
          readers = new HashMap();
--- 114,118 ----
   * Time: 4:47:15 PM
   */
! public final class VerifyingReader {
      private VerifyingReader() {
          readers = new HashMap();
***************
*** 129,143 ****
       * @throws NeuClearException 
       */
!     public final SignedNamedObject read(InputStream is) throws XMLException, NeuClearException {
!         Element elem = XMLTools.loadDocument(is).getRootElement();
          return read(elem);
      }
  
!     public final SignedNamedObject read(Element elem) throws NeuClearException, XMLException {
          return resolveReader(elem).read(SignedNamedCore.read(elem), elem);
      }
  
  
!     private NamedObjectReader resolveReader(Element elem) {
          NamedObjectReader reader = (NamedObjectReader) readers.get(elem.getName());
          if (reader == null)
--- 135,149 ----
       * @throws NeuClearException 
       */
!     public final SignedNamedObject read(final InputStream is) throws XMLException, NeuClearException {
!         final Element elem = XMLTools.loadDocument(is).getRootElement();
          return read(elem);
      }
  
!     public final SignedNamedObject read(final Element elem) throws NeuClearException, XMLException {
          return resolveReader(elem).read(SignedNamedCore.read(elem), elem);
      }
  
  
!     private NamedObjectReader resolveReader(final Element elem) {
          NamedObjectReader reader = (NamedObjectReader) readers.get(elem.getName());
          if (reader == null)
***************
*** 147,156 ****
  
  
!     public void registerReader(String name, NamedObjectReader reader) {
          readers.put(name, reader);
      }
  
!     private Map readers;
!     private NamedObjectReader defaultReader;
!     private static VerifyingReader instance = new VerifyingReader();
  }
--- 153,163 ----
  
  
!     public final void registerReader(final String name, final NamedObjectReader reader) {
!         System.out.println("Registering: "+name);
          readers.put(name, reader);
      }
  
!     private final Map readers;
!     private final NamedObjectReader defaultReader;
!     private static final VerifyingReader instance = new VerifyingReader();
  }