[Nodal-cvs] nodal/j-src/org/nodal Nodal.java,1.24,1.25

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/nodal/nodal/j-src/org/nodal
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7342/org/nodal

Modified Files:
	Nodal.java 
Log Message:
Hide Path.Failure from users of org.nodal.Nodal

Index: Nodal.java
===================================================================
RCS file: /cvsroot/nodal/nodal/j-src/org/nodal/Nodal.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** Nodal.java	8 Jan 2005 00:51:13 -0000	1.24
--- Nodal.java	8 Jan 2005 01:21:04 -0000	1.25
***************
*** 24,27 ****
--- 24,28 ----
  import org.nodal.nav.Path;
  import org.nodal.nav.Paths;
+ import org.nodal.nav.Path.Failure;
  import org.nodal.util.Name;
  import org.nodal.util.Namespace;
***************
*** 40,44 ****
        /* Avoid bootstrap problems? -- leei */
        //TypeDocument d = Types.BASEDOC;
- 
        // Load fundamental Storage drivers
        Class.forName("storage.trans.TransientDriver");
--- 41,44 ----
***************
*** 53,59 ****

    /**
!    * Open a URL for access by the NODAL interfaces.  Parses and binds
!    * the URL, returning a bound Path or signalling failure.
!    * @param uri a String representing the URI to be parsed
     * @return a getter for the Path that has the given URI
     */
--- 53,61 ----

    /**
!    * Open a URL for access by the NODAL interfaces. Parses and binds the URL,
!    * returning a bound Path or signalling failure.
!    * 
!    * @param uri
!    *          a String representing the URI to be parsed
     * @return a getter for the Path that has the given URI
     */
***************
*** 64,72 ****

    /**
!    * Access a Node defined by the Name as a Node id.  The id will exist in
!    * a Namespace that identifies the Document context.  If a Document cannot be
     * associated with the Namespace, or the Document cannot be accessed, then
     * this method fails and return null.
!    * @param nm a Name to identify the Node
     * @return a Node if there is one accessible from this Name or null
     * @throws IOException
--- 66,76 ----

    /**
!    * Access a Node defined by the Name as a Node id. The id will exist in a
!    * Namespace that identifies the Document context. If a Document cannot be
     * associated with the Namespace, or the Document cannot be accessed, then
     * this method fails and return null.
!    * 
!    * @param nm
!    *          a Name to identify the Node
     * @return a Node if there is one accessible from this Name or null
     * @throws IOException
***************
*** 84,90 ****

    /**
!    * Open a Document given a Path.  If the Path is not absolute or the Document
     * does not exist then we return null.
!    * @param docPath an absolute Path defining a Document
     * @return a Document containing the Path requested or null
     * @throws IOException
--- 88,96 ----

    /**
!    * Open a Document given a Path. If the Path is not absolute or the Document
     * does not exist then we return null.
!    * 
!    * @param docPath
!    *          an absolute Path defining a Document
     * @return a Document containing the Path requested or null
     * @throws IOException
***************
*** 104,126 ****

    /**
!    * Open a Document named by a given URI.  If the URI is not absolute 
!    * or the Document
!    * does not exist then we return null.
!    * @param uri an absolute URI defining a Document
     * @return a Document containing the Path requested or null
-    * @throws Path.Failure if the uri is an invalid Path
     * @throws IOException
     */
!   public static Document openDocument(String uri) throws Path.Failure, IOException {
!     Path path = Paths.parse(uri);
!     return openDocument(path);
    }

    /**
     * Create a new Document that can be accessed with the given Path.
!    * @param path a Path to attach this Document to.
     * @return a new Document object with this Path
     * @throws IOException
!    * @throws RuntimeException if a Document already ex
     */
    public static Document createDocument(Path path, DocumentFormat format)
--- 110,140 ----

    /**
!    * Open a Document named by a given URI. If the URI is not absolute or the
!    * Document does not exist then we return null.
!    * 
!    * @param uri
!    *          an absolute URI defining a Document
     * @return a Document containing the Path requested or null
     * @throws IOException
     */
!   public static Document openDocument(String uri) throws IOException {
!     try {
!       Path path = Paths.parse(uri);
!       return openDocument(path);
!     } catch (Path.Failure e) {
!       throw new IOException("Path parse: " + e);
!     }
! 
    }

    /**
     * Create a new Document that can be accessed with the given Path.
!    * 
!    * @param path
!    *          a Path to attach this Document to.
     * @return a new Document object with this Path
     * @throws IOException
!    * @throws RuntimeException
!    *           if a Document already ex
     */
    public static Document createDocument(Path path, DocumentFormat format)
***************
*** 140,168 ****

    /**
!    * Open a Repository named by the given URI.  If the URI references a
!    * file or object <i>inside</i> a Repository, then this should successfully
!    * return the containing Repository.
     * 
!    * @param uri a String naming a Repository
     * @return the Repository containing the named resource
     * @throws Failure
     * @throws IOException
     */
!   public static Repository openRepository(String uri) throws Path.Failure, IOException {
!     Path path = Paths.parse(uri);
!     return openRepository(path);
    }

    /**
!    * Open a Repository named by the given URI.  If the URI references a
!    * file or object <i>inside</i> a Repository, then this should successfully
!    * return the containing Repository.
     * 
!    * @param path an absolute Path naming a Repository
     * @return the Repository containing the named resource
!    * @throws Path.Failure if the Path given is invalid
     * @throws IOException
     */
!   public static Repository openRepository(Path path) throws Path.Failure, IOException {
      // First, check the cache of Repositories
      Repository r = AbstractRepository.existingRepository(path);
--- 154,190 ----

    /**
!    * Open a Repository named by the given URI. If the URI references a file or
!    * object <i>inside </i> a Repository, then this should successfully return
!    * the containing Repository.
     * 
!    * @param uri
!    *          a String naming a Repository
     * @return the Repository containing the named resource
     * @throws Failure
     * @throws IOException
     */
!   public static Repository openRepository(String uri) throws IOException {
!     try {
!       Path path = Paths.parse(uri);
!       return openRepository(path);
!     } catch (Path.Failure e) {
!       throw new IOException("Path parse: " + e);
!     }
    }

    /**
!    * Open a Repository named by the given URI. If the URI references a file or
!    * object <i>inside </i> a Repository, then this should successfully return
!    * the containing Repository.
     * 
!    * @param path
!    *          an absolute Path naming a Repository
     * @return the Repository containing the named resource
!    * @throws Path.Failure
!    *           if the Path given is invalid
     * @throws IOException
     */
!   public static Repository openRepository(Path path) throws Path.Failure,
!       IOException {
      // First, check the cache of Repositories
      Repository r = AbstractRepository.existingRepository(path);
***************
*** 183,190 ****

    /**
!    * Register a given RepositoryDriver with the repository manager.
!    * This should be called when the singleton instance of a
!    * RepositoryDriver is created.
!    * @param dr the RepositoryDriver to be registered
     */
    private static void registerRepository(RepositoryDriver dr) {
--- 205,213 ----

    /**
!    * Register a given RepositoryDriver with the repository manager. This should
!    * be called when the singleton instance of a RepositoryDriver is created.
!    * 
!    * @param dr
!    *          the RepositoryDriver to be registered
     */
    private static void registerRepository(RepositoryDriver dr) {
***************
*** 196,204 ****

    /**
!    * All RepositoryDriver implementations should extend this class in order
!    * to be properly registered with the top-level and available to
     * openRepository().
     * 
     * Created on Oct 8, 2003
     * @author leei
     */
--- 219,228 ----

    /**
!    * All RepositoryDriver implementations should extend this class in order to
!    * be properly registered with the top-level and available to
     * openRepository().
     * 
     * Created on Oct 8, 2003
+    * 
     * @author leei
     */
***************
*** 210,263 ****
  }

! /* ====================================================================
!  * The Apache Software License, Version 1.1
!  *
!  * Copyright (c) 2001 SRI International.  All rights reserved.
!  *
   * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions
!  * are met:
!  *
!  * 1. Redistributions of source code must retain the above copyright
!  *    notice, this list of conditions and the following disclaimer.
!  *
!  * 2. Redistributions in binary form must reproduce the above copyright
!  *    notice, this list of conditions and the following disclaimer in
!  *    the documentation and/or other materials provided with the
!  *    distribution.
!  *
!  * 3. The end-user documentation included with the redistribution,
!  *    if any, must include the following acknowledgment:
!  *       "This product includes software developed by
!  *        SRI International (http://www.sri.com/)."
!  *    Alternately, this acknowledgment may appear in the software itself,
!  *    if and wherever such third-party acknowledgments normally appear.
!  *
!  * 4. The names "SRI" and "SRI International" must not be used to
!  *    endorse or promote products derived from this
!  *    software without prior written permission. For written
!  *    permission, please contact SRI International.
!  *
!  * 5. Products derived from this software may not be called "NODAL",
!  *    nor may "NODAL" appear in their name, without prior written
!  *    permission of SRI International.
!  *
!  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
!  * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
!  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
!  * DISCLAIMED.  IN NO EVENT SHALL SRI INTERNATIONAL OR
!  * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
!  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
!  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
!  * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
!  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
!  * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
!  * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
!  * SUCH DAMAGE.
   * ====================================================================
!  *
!  * This software consists of voluntary contributions made by many
!  * individuals on behalf of SRI International.  For more
!  * information on the SRI International, please see
!  * <http://www.sri.com/>.
   */
--- 234,281 ----
  }

! /*
!  * ==================================================================== The
!  * Apache Software License, Version 1.1
!  * 
!  * Copyright (c) 2001 SRI International. All rights reserved.
!  * 
   * Redistribution and use in source and binary forms, with or without
!  * modification, are permitted provided that the following conditions are met:
!  * 
!  * 1. Redistributions of source code must retain the above copyright notice,
!  * this list of conditions and the following disclaimer.
!  * 
!  * 2. Redistributions in binary form must reproduce the above copyright notice,
!  * this list of conditions and the following disclaimer in the documentation
!  * and/or other materials provided with the distribution.
!  * 
!  * 3. The end-user documentation included with the redistribution, if any, must
!  * include the following acknowledgment: "This product includes software
!  * developed by SRI International (http://www.sri.com/)." Alternately, this
!  * acknowledgment may appear in the software itself, if and wherever such
!  * third-party acknowledgments normally appear.
!  * 
!  * 4. The names "SRI" and "SRI International" must not be used to endorse or
!  * promote products derived from this software without prior written permission.
!  * For written permission, please contact SRI International.
!  * 
!  * 5. Products derived from this software may not be called "NODAL", nor may
!  * "NODAL" appear in their name, without prior written permission of SRI
!  * International.
!  * 
!  * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
!  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
!  * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SRI
!  * INTERNATIONAL OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
!  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
!  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA,
!  * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
!  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
!  * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
!  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   * ====================================================================
!  * 
!  * This software consists of voluntary contributions made by many individuals on
!  * behalf of SRI International. For more information on the SRI International,
!  * please see <http://www.sri.com/>.
   */