You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by dl...@apache.org on 2001/09/29 02:29:28 UTC

cvs commit: jakarta-turbine-torque/src/java/org/apache/torque/engine/database/transform DTDResolver.java

dlr         01/09/28 17:29:28

  Modified:    src/java/org/apache/torque/engine/database/transform
                        DTDResolver.java
  Log:
  clean up
  
  Revision  Changes    Path
  1.2       +12 -17    jakarta-turbine-torque/src/java/org/apache/torque/engine/database/transform/DTDResolver.java
  
  Index: DTDResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/engine/database/transform/DTDResolver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -u -r1.1 -r1.2
  --- DTDResolver.java	2001/08/02 05:08:32	1.1
  +++ DTDResolver.java	2001/09/29 00:29:28	1.2
  @@ -68,13 +68,16 @@
    * Bug 4337703</a>
    *
    * @author <a href="mailto:mpoeschl@marmot.at">Martin Poeschl</a>
  - * @version $Id: DTDResolver.java,v 1.1 2001/08/02 05:08:32 jvanzyl Exp $
  + * @version $Id: DTDResolver.java,v 1.2 2001/09/29 00:29:28 dlr Exp $
    */
   public class DTDResolver implements EntityResolver
   {
  -    /** InputSource for database.dtd */
  -    InputSource databaseDTD = null;
  +    private static final String WEB_SITE_DTD =
  +        "http://jakarta.apache.org/turbine/dtd/database.dtd";
   
  +    /** InputSource for <code>database.dtd</code>. */
  +    private InputSource databaseDTD = null;
  +
       /**
        * constructor
        */
  @@ -106,9 +109,7 @@
        */
       public InputSource resolveEntity(String publicId, String systemId)
       {
  -        if (databaseDTD != null &&
  -            "http://jakarta.apache.org/turbine/dtd/database.dtd"
  -            .equals(systemId))
  +        if (databaseDTD != null && WEB_SITE_DTD.equals(systemId))
           {
               System.out.println("Resolver: used database.dtd");
               return databaseDTD;
  @@ -118,13 +119,13 @@
               System.out.println("Resolver: used " + systemId);
               return getInputSource(systemId);
           }
  -    } // resolveEntity(String, String)
  +    }
   
       /**
  -     * get an InputSource for an URL String
  +     * Retrieves a XML input source for the specified URL.
        *
  -     * @param urlString
  -     * @return an InputSource for the URL String
  +     * @param urlString The URL of the input source.
  +     * @return <code>InputSource</code> for the URL.
        */
       public InputSource getInputSource(String urlString)
       {
  @@ -138,11 +139,5 @@
               ex.printStackTrace();
           }
           return new InputSource();
  -    } // getInputSource(String)
  +    }
   }
  -
  -
  -
  -
  -
  -
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org