You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@abdera.apache.org by jm...@apache.org on 2008/01/26 02:13:33 UTC
svn commit: r615418 -
/incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java
Author: jmsnell
Date: Fri Jan 25 17:13:32 2008
New Revision: 615418
URL: http://svn.apache.org/viewvc?rev=615418&view=rev
Log:
better variable naming
Modified:
incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java
Modified: incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java
URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java?rev=615418&r1=615417&r2=615418&view=diff
==============================================================================
--- incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java (original)
+++ incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java Fri Jan 25 17:13:32 2008
@@ -114,11 +114,11 @@
case REQUEST_USER:
Principal p = request.getPrincipal();
return p != null ? (T)p.getName() : null;
- case REQUEST_ATTRIBUTE_SESSION:
- name = Variable.REQUEST_ATTRIBUTE_SESSION.label(var);
+ case SESSION_ATTRIBUTE:
+ name = Variable.SESSION_ATTRIBUTE.label(var);
return (T) request.getAttribute(Scope.SESSION, name);
- case REQUEST_ATTRIBUTE_REQUEST:
- name = Variable.REQUEST_ATTRIBUTE_REQUEST.label(var);
+ case REQUEST_ATTRIBUTE:
+ name = Variable.REQUEST_ATTRIBUTE.label(var);
return (T) request.getAttribute(Scope.REQUEST, name);
case REQUEST_HEADER:
name = Variable.REQUEST_HEADER.label(var);
@@ -144,9 +144,9 @@
for (String var : request.getParameterNames())
vars.add(toVar(Variable.REQUEST_PARAMETER,var));
for (String var : request.getAttributeNames(Scope.SESSION))
- vars.add(toVar(Variable.REQUEST_ATTRIBUTE_SESSION,var));
+ vars.add(toVar(Variable.SESSION_ATTRIBUTE,var));
for (String var : request.getAttributeNames(Scope.REQUEST))
- vars.add(toVar(Variable.REQUEST_ATTRIBUTE_REQUEST,var));
+ vars.add(toVar(Variable.REQUEST_ATTRIBUTE,var));
for (String var : request.getHeaderNames())
vars.add(toVar(Variable.REQUEST_HEADER, var));
Target target = request.getTarget();
@@ -179,8 +179,8 @@
REQUEST_LANGUAGE,
REQUEST_CHARSET,
REQUEST_USER,
- REQUEST_ATTRIBUTE_SESSION,
- REQUEST_ATTRIBUTE_REQUEST,
+ SESSION_ATTRIBUTE,
+ REQUEST_ATTRIBUTE,
REQUEST_HEADER,
TARGET_PARAMETER,
TARGET_IDENTITY,
@@ -191,10 +191,10 @@
static Variable get(String var) {
if (REQUEST_PARAMETER.match(var)) {
return REQUEST_PARAMETER;
- } else if (REQUEST_ATTRIBUTE_SESSION.match(var)) {
- return REQUEST_ATTRIBUTE_SESSION;
- } else if (REQUEST_ATTRIBUTE_REQUEST.match(var)) {
- return REQUEST_ATTRIBUTE_REQUEST;
+ } else if (SESSION_ATTRIBUTE.match(var)) {
+ return SESSION_ATTRIBUTE;
+ } else if (REQUEST_ATTRIBUTE.match(var)) {
+ return REQUEST_ATTRIBUTE;
} else if (REQUEST_HEADER.match(var)) {
return REQUEST_HEADER;
} else if (TARGET_PARAMETER.match(var)) {