henning 2003/03/11 05:55:51
Modified: src/java/org/apache/turbine/modules/navigations
VelocityNavigation.java
Log:
Convert to prefix usage
Revision Changes Path
1.4 +17 -10
jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java
Index: VelocityNavigation.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/modules/navigations/VelocityNavigation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- VelocityNavigation.java 9 Mar 2003 02:41:46 -0000 1.3
+++ VelocityNavigation.java 11 Mar 2003 13:55:51 -0000 1.4
@@ -54,12 +54,18 @@
* <http://www.apache.org/>.
*/
-// Turbine/Village/ECS Imports
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.StringElement;
+
+import org.apache.turbine.TurbineConstants;
+
import org.apache.turbine.services.velocity.TurbineVelocity;
+
import org.apache.turbine.util.RunData;
+
import org.apache.velocity.context.Context;
/**
@@ -71,10 +77,18 @@
* doBuildTemplate( data , context) method.
*
* @author <a href="mailto:[EMAIL PROTECTED]">Dave Bryson</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id$
*/
-public class VelocityNavigation extends TemplateNavigation
+public class VelocityNavigation
+ extends TemplateNavigation
{
+ /** Logging */
+ private static Log log = LogFactory.getLog(VelocityNavigation.class);
+
+ /** The prefix for lookup up navigation pages */
+ private String prefix = TurbineConstants.NAVIGATION_PREFIX + "/";
+
/**
* Velocity Navigations extending this class should overide this
* method to perform any particular business logic and add
@@ -120,15 +134,8 @@
StringElement output = new StringElement();
output.setFilterState(false);
-
- // Usually adds the leading slash, but make it sure.
- if ((templateName.length() > 0) &&
- (templateName.charAt(0) != '/'))
- {
- templateName = '/' + templateName;
- }
output.addElement(TurbineVelocity
- .handleRequest(context, "navigations" + templateName));
+ .handleRequest(context, prefix + templateName));
return output;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
