You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by qu...@apache.org on 2003/05/27 22:43:22 UTC

cvs commit: jakarta-turbine-2/src/java/org/apache/turbine/util/uri BaseURI.java

quintonm    2003/05/27 13:43:22

  Modified:    src/java/org/apache/turbine/util/uri BaseURI.java
  Log:
  - Minor style fixes and javadocs corrections.
  - replaced deprecated methods calls
  
  Revision  Changes    Path
  1.3       +12 -11    jakarta-turbine-2/src/java/org/apache/turbine/util/uri/BaseURI.java
  
  Index: BaseURI.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/uri/BaseURI.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BaseURI.java	7 May 2003 16:02:02 -0000	1.2
  +++ BaseURI.java	27 May 2003 20:43:22 -0000	1.3
  @@ -75,6 +75,7 @@
    * @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
    * @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
    * @author <a href="mailto:hps@intermeta.de">Henning P. Schmiedehausen</a>
  + * @author <a href="mailto:quintonm@bellsouth.net">Quinton McCombs</a>
    * @version $Id$
    */
   
  @@ -157,7 +158,7 @@
       /**
        * Constructor, set explicit redirection
        *
  -     * @param data A ServerData object
  +     * @param serverData A ServerData object
        * @param redirect True if redirection allowed.
        */
       public BaseURI(ServerData serverData, boolean redirect)
  @@ -244,7 +245,7 @@
       /**
        * Sets the script name (/servlets/Turbine).
        *
  -     * @param name A String with the script name.
  +     * @param scriptName A String with the script name.
        */
       public void setScriptName(String scriptName)
       {
  @@ -264,7 +265,7 @@
       /**
        * Sets the context path.
        *
  -     * @param name A String with the context path
  +     * @param contextPath A String with the context path
        */
       public void setContextPath(String contextPath)
       {
  @@ -284,7 +285,7 @@
       /**
        * Sets the server name.
        *
  -     * @param name A String with the server name.
  +     * @param serverName A String with the server name.
        */
       public void setServerName(String serverName)
       {
  @@ -317,7 +318,7 @@
       /**
        * Sets the server port.
        *
  -     * @param port An int with the port.
  +     * @param serverPort An int with the port.
        */
       public void setServerPort(int serverPort)
       {
  @@ -355,11 +356,12 @@
       /**
        * Sets the scheme (HTTP or HTTPS).
        *
  -     * @param scheme A String with the scheme.
  +     * @param serverScheme A String with the scheme.
        */
       public void setServerScheme(String serverScheme)
       {
  -        serverData.setServerScheme(StringUtils.isNotEmpty(serverScheme) ? serverScheme : "");
  +        serverData.setServerScheme(StringUtils.isNotEmpty(serverScheme)
  +                ? serverScheme : "");
       }
   
       /**
  @@ -379,7 +381,6 @@
        * Sets a reference anchor (#ref).
        *
        * @param reference A String containing the reference.
  -     * @return A DynamicURI (self).
        */
       public void setReference(String reference)
       {
  @@ -529,11 +530,11 @@
                   if(isRedirect())
                   {
                       log.debug("Should Redirect");
  -                    res = response.encodeRedirectUrl(uri);
  +                    res = response.encodeRedirectURL(uri);
                   }
                   else
                   {
  -                    res = response.encodeUrl(uri);
  +                    res = response.encodeURL(uri);
                   }
               }
               catch(Exception e)
  
  
  

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