You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/07/02 04:01:30 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/services/freemarker NavigationModel.java
jvanzyl 01/07/01 19:01:30
Modified: src/java/org/apache/turbine/services/freemarker
NavigationModel.java
Log:
- using ModuleLoader
Revision Changes Path
1.6 +5 -9 jakarta-turbine/src/java/org/apache/turbine/services/freemarker/NavigationModel.java
Index: NavigationModel.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/freemarker/NavigationModel.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- NavigationModel.java 2001/03/06 06:12:09 1.5
+++ NavigationModel.java 2001/07/02 02:01:28 1.6
@@ -54,25 +54,21 @@
* <http://www.apache.org/>.
*/
-// Java stuff.
import java.util.*;
import java.io.*;
-
-// Turbine Utility Classes
import org.apache.turbine.modules.*;
import org.apache.turbine.util.*;
import org.apache.ecs.*;
+import org.apache.turbine.Turbine;
import org.apache.turbine.services.*;
import org.apache.turbine.services.template.*;
-
-// FreeMarker Classes
import freemarker.template.*;
/**
* Returns output of a Navigation module. Extension of FreeMarker.
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
- * @version $Id: NavigationModel.java,v 1.5 2001/03/06 06:12:09 chrise Exp $
+ * @version $Id: NavigationModel.java,v 1.6 2001/07/02 02:01:28 jvanzyl Exp $
*/
public class NavigationModel
implements TemplateMethodModel
@@ -109,9 +105,9 @@
{
module = ((TemplateService)TurbineServices.getInstance().getService(
TemplateService.SERVICE_NAME)).getNavigationName(template);
- ConcreteElement results = NavigationLoader.getInstance()
- .eval(data, module);
- returnValue = results.toString();
+
+ returnValue = Turbine.getModuleLoader()
+ .getModule(Turbine.NAVIGATIONS, module).evaluate(data);
}
catch (Exception e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org