[Woc-commit] CVS: dadml/src/org/openscience/dadml/filereaders DBDATAFileReader.java,1.1.1.1,1.2 DBDEFFileReader.java,1.1.1.1,1.2 DBLISTFileReader.java,1.1.1.1,1.2

[Egon W. <eg...@us...>]

Update of /cvsroot/woc/dadml/src/org/openscience/dadml/filereaders
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1572/src/org/openscience/dadml/filereaders

Modified Files:
	DBDATAFileReader.java DBDEFFileReader.java 
	DBLISTFileReader.java 
Log Message:
the Readers should now be instantiazed to allow class loading of XML reader

Index: DBDATAFileReader.java
===================================================================
RCS file: /cvsroot/woc/dadml/src/org/openscience/dadml/filereaders/DBDATAFileReader.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** DBDATAFileReader.java	21 Mar 2004 14:47:12 -0000	1.1.1.1
--- DBDATAFileReader.java	21 Mar 2004 19:09:50 -0000	1.2
***************
*** 13,18 ****
  public class DBDATAFileReader {
  
!     public static DBDATA read(String url, String parserClass) throws Exception {
!         return read(new URL(url).openStream(), parserClass);
      }
      
--- 13,21 ----
  public class DBDATAFileReader {
  
!     public DBDATAFileReader() {
!     }
!     
!     public DBDATA read(String url) throws Exception {
!         return read(new URL(url).openStream());
      }
      
***************
*** 20,25 ****
      * to be done by program that calls this procedure.
      */
!     public static DBDATA read(String url, String parserClass, 
!     String proxyUser, String proxyPwd)
  	throws Exception {
          
--- 23,27 ----
      * to be done by program that calls this procedure.
      */
!     public DBDATA read(String url, String proxyUser, String proxyPwd)
  	throws Exception {
          
***************
*** 28,38 ****
          String encodedPassword = "Basic " +
  	    new sun.misc.BASE64Encoder().encode( password.getBytes() );
!         connection.setRequestProperty("Proxy-Authorization",
!         encodedPassword);
!         return read(connection.getInputStream(), parserClass);
      }
      
!     private static DBDATA read(InputStream is, String parserClass) throws Exception {
!         XMLReader parser = (XMLReader)is.getClass().getClassLoader().
                          loadClass("org.apache.xerces.parsers.SAXParser").
                          newInstance();
--- 30,40 ----
          String encodedPassword = "Basic " +
  	    new sun.misc.BASE64Encoder().encode( password.getBytes() );
!             connection.setRequestProperty("Proxy-Authorization",
!             encodedPassword);
!         return read(connection.getInputStream());
      }
      
!     private DBDATA read(InputStream is) throws Exception {
!         XMLReader parser = (XMLReader)this.getClass().getClassLoader().
                          loadClass("org.apache.xerces.parsers.SAXParser").
                          newInstance();

Index: DBDEFFileReader.java
===================================================================
RCS file: /cvsroot/woc/dadml/src/org/openscience/dadml/filereaders/DBDEFFileReader.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** DBDEFFileReader.java	21 Mar 2004 14:47:12 -0000	1.1.1.1
--- DBDEFFileReader.java	21 Mar 2004 19:09:51 -0000	1.2
***************
*** 13,18 ****
  public class DBDEFFileReader {
  
!     public static DBDEF read(String url, String parserClass) throws Exception {
!         return read(new URL(url).openStream(), parserClass);
      }
      
--- 13,21 ----
  public class DBDEFFileReader {
  
!     public DBDEFFileReader() {
!     }
!     
!     public DBDEF read(String url) throws Exception {
!         return read(new URL(url).openStream());
      }
      
***************
*** 20,25 ****
      * to be done by program that calls this procedure.
      */
!     public static DBDEF read(String url, String parserClass, 
!     String proxyUser, String proxyPwd)
  	throws Exception {
          
--- 23,27 ----
      * to be done by program that calls this procedure.
      */
!     public DBDEF read(String url, String proxyUser, String proxyPwd)
  	throws Exception {
          
***************
*** 28,38 ****
          String encodedPassword = "Basic " +
  	    new sun.misc.BASE64Encoder().encode( password.getBytes() );
!         connection.setRequestProperty("Proxy-Authorization",
!         encodedPassword);
!         return read(connection.getInputStream(), parserClass);
      }
      
!     private static DBDEF read(InputStream is, String parserClass) throws Exception {
!         XMLReader parser = (XMLReader)is.getClass().getClassLoader().
                          loadClass("org.apache.xerces.parsers.SAXParser").
                          newInstance();
--- 30,40 ----
          String encodedPassword = "Basic " +
  	    new sun.misc.BASE64Encoder().encode( password.getBytes() );
!             connection.setRequestProperty("Proxy-Authorization",
!             encodedPassword);
!         return read(connection.getInputStream());
      }
      
!     private DBDEF read(InputStream is) throws Exception {
!         XMLReader parser = (XMLReader)this.getClass().getClassLoader().
                          loadClass("org.apache.xerces.parsers.SAXParser").
                          newInstance();

Index: DBLISTFileReader.java
===================================================================
RCS file: /cvsroot/woc/dadml/src/org/openscience/dadml/filereaders/DBLISTFileReader.java,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** DBLISTFileReader.java	21 Mar 2004 14:47:12 -0000	1.1.1.1
--- DBLISTFileReader.java	21 Mar 2004 19:09:51 -0000	1.2
***************
*** 13,25 ****
  public class DBLISTFileReader {
  
!     public static DBLIST read(String url, String parserClass) throws Exception {
!         return DBLISTFileReader.read((new URL(url)).openStream(), parserClass);
      }
      
      /* Read an URL with Proxy authentication. Proxy settings is supposed
!     * to be done by program that calls this procedure.
!     */
!     public static DBLIST read(String url, String parserClass, 
!     String proxyUser, String proxyPwd)
  	throws Exception {
          
--- 13,27 ----
  public class DBLISTFileReader {
  
!     public DBLISTFileReader() {
!     }
!     
!     public DBLIST read(String url) throws Exception {
!         return read((new URL(url)).openStream());
      }
      
      /* Read an URL with Proxy authentication. Proxy settings is supposed
!      * to be done by program that calls this procedure.
!      */
!     public DBLIST read(String url, String proxyUser, String proxyPwd)
  	throws Exception {
          
***************
*** 28,38 ****
          String encodedPassword = "Basic " +
  	    new sun.misc.BASE64Encoder().encode( password.getBytes() );
!         connection.setRequestProperty("Proxy-Authorization",
!         encodedPassword);
!         return DBLISTFileReader.read(connection.getInputStream(), parserClass);
      }
      
!     private static DBLIST read(InputStream is, String parserClass) throws Exception {
!         XMLReader parser = (XMLReader)is.getClass().getClassLoader().
                          loadClass("org.apache.xerces.parsers.SAXParser").
                          newInstance();
--- 30,40 ----
          String encodedPassword = "Basic " +
  	    new sun.misc.BASE64Encoder().encode( password.getBytes() );
!             connection.setRequestProperty("Proxy-Authorization",
!             encodedPassword);
!         return read(connection.getInputStream());
      }
      
!     private DBLIST read(InputStream is) throws Exception {
!         XMLReader parser = (XMLReader)this.getClass().getClassLoader().
                          loadClass("org.apache.xerces.parsers.SAXParser").
                          newInstance();