You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jo...@apache.org on 2001/09/14 03:03:24 UTC
cvs commit: jakarta-turbine-3/src/java/org/apache/turbine DynamicURI.java TurbineConstants.java
jon 01/09/13 18:03:24
Modified: src/java/org/apache/turbine DynamicURI.java
TurbineConstants.java
Log:
cleaned up the use of strings
cleaned up some code
use constants now
Revision Changes Path
1.2 +23 -21 jakarta-turbine-3/src/java/org/apache/turbine/DynamicURI.java
Index: DynamicURI.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/DynamicURI.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DynamicURI.java 2001/09/01 16:58:11 1.1
+++ DynamicURI.java 2001/09/14 01:03:24 1.2
@@ -83,7 +83,7 @@
*
* @author <a href="mailto:jon@clearink.com">Jon S. Stevens</a>
* @author <a href="mailto:jvanzyl@periapt.com">Jason van Zyl</a>
- * @version $Id: DynamicURI.java,v 1.1 2001/09/01 16:58:11 jvanzyl Exp $
+ * @version $Id: DynamicURI.java,v 1.2 2001/09/14 01:03:24 jon Exp $
*/
public class DynamicURI
{
@@ -96,9 +96,6 @@
/** The RunData object. */
protected RunData data = null;
- // Used with RunData constructors to provide a way around a JServ
- // 1.0 bug.
-
/** Servlet response interface. */
public HttpServletResponse res = null;
@@ -283,9 +280,9 @@
while ( e.hasMoreElements() )
{
String key = (String)e.nextElement();
- if ( !key.equalsIgnoreCase("action") &&
- !key.equalsIgnoreCase("screen") &&
- !key.equalsIgnoreCase("template") )
+ if ( !key.equalsIgnoreCase(Turbine.ACTION) &&
+ !key.equalsIgnoreCase(Turbine.SCREEN) &&
+ !key.equalsIgnoreCase(Turbine.TEMPLATE) )
{
String[] values = pp.getStrings(key);
for ( int i=0; i<values.length; i++ )
@@ -699,7 +696,7 @@
*/
public DynamicURI setAction ( String action )
{
- add ( PATH_INFO, "action", action );
+ add ( PATH_INFO, Turbine.ACTION, action );
return this;
}
@@ -714,7 +711,7 @@
*/
public DynamicURI setScreen ( String screen )
{
- add ( PATH_INFO, "screen", screen );
+ add ( PATH_INFO, Turbine.SCREEN, screen );
return this;
}
@@ -739,7 +736,8 @@
*/
public DynamicURI setSecure(int port)
{
- boolean isSSL = Turbine.getConfiguration().getBoolean("use.ssl", true);
+ boolean isSSL = Turbine.getConfiguration()
+ .getBoolean(Turbine.USE_SSL, true);
if (isSSL)
{
data.setServerScheme(DynamicURI.HTTPS);
@@ -776,18 +774,18 @@
|| (getServerScheme().equals(HTTPS) && getServerPort() != 443)
)
{
- output.append (":");
+ output.append (':');
output.append ( getServerPort() );
}
output.append ( getScriptName() );
if ( this.hasPathInfo )
{
- output.append ( "/" );
+ output.append ('/');
output.append ( renderPathInfo(this.pathInfo) );
}
if ( this.hasQueryData )
{
- output.append ( "?" );
+ output.append ('?');
output.append ( renderQueryString(this.queryData) );
}
@@ -797,9 +795,13 @@
if ( this.res != null )
{
if ( this.redirect )
+ {
return res.encodeRedirectUrl (output.toString());
+ }
else
+ {
return res.encodeUrl (output.toString());
+ }
}
else
{
@@ -822,30 +824,30 @@
StringBuffer output = new StringBuffer();
HttpServletRequest request = data.getRequest();
- output.append ( data.getServerScheme() );
+ output.append (data.getServerScheme());
output.append ( "://" );
- output.append ( data.getServerName() );
+ output.append (data.getServerName());
if ( (data.getServerScheme().equals(HTTP) &&
data.getServerPort() != 80) ||
(data.getServerScheme().equals(HTTPS) &&
data.getServerPort() != 443) )
{
- output.append (":");
- output.append ( data.getServerPort() );
+ output.append (':');
+ output.append (data.getServerPort());
}
- output.append ( data.getScriptName() );
+ output.append (data.getScriptName());
if ( request.getPathInfo() != null )
{
- output.append( request.getPathInfo() );
+ output.append(request.getPathInfo());
}
if ( request.getQueryString() != null )
{
- output.append ( "?" );
- output.append ( request.getQueryString() );
+ output.append ('?');
+ output.append (request.getQueryString());
}
return output.toString();
}
1.2 +2 -1 jakarta-turbine-3/src/java/org/apache/turbine/TurbineConstants.java
Index: TurbineConstants.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-3/src/java/org/apache/turbine/TurbineConstants.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TurbineConstants.java 2001/08/16 04:41:34 1.1
+++ TurbineConstants.java 2001/09/14 01:03:24 1.2
@@ -298,7 +298,8 @@
public static final String SCREEN = "screen";
public static final String ACTION = "action";
-
+ public static final String TEMPLATE = "template";
+
public static final String CONTEXT = "__template_context__";
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org