jvanzyl 01/07/01 19:01:09
Modified: src/java/org/apache/turbine/modules/layouts
FreeMarkerSiteLayout.java
Log:
- using ModuleLoader
Revision Changes Path
1.9 +10 -13
jakarta-turbine/src/java/org/apache/turbine/modules/layouts/FreeMarkerSiteLayout.java
Index: FreeMarkerSiteLayout.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/layouts/FreeMarkerSiteLayout.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- FreeMarkerSiteLayout.java 2001/05/23 16:36:08 1.8
+++ FreeMarkerSiteLayout.java 2001/07/02 02:01:08 1.9
@@ -54,20 +54,16 @@
* <http://www.apache.org/>.
*/
-// ECS Classes
import org.apache.ecs.ConcreteElement;
import org.apache.ecs.StringElement;
-
-// Turbine Classes
+import org.apache.turbine.Turbine;
import org.apache.turbine.modules.Layout;
-import org.apache.turbine.modules.ScreenLoader;
+//import org.apache.turbine.modules.ScreenLoader;
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.services.freemarker.FreeMarkerService;
import org.apache.turbine.services.freemarker.NavigationModel;
import org.apache.turbine.services.TurbineServices;
-
-// FreeMarker Stuff
import freemarker.template.SimpleHash;
import freemarker.template.SimpleScalar;
@@ -79,7 +75,7 @@
* relatively few reasons to subclass this Layout.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
- * @version $Id: FreeMarkerSiteLayout.java,v 1.8 2001/05/23 16:36:08 mikeh Exp $
+ * @version $Id: FreeMarkerSiteLayout.java,v 1.9 2001/07/02 02:01:08 jvanzyl Exp $
*/
public class FreeMarkerSiteLayout extends Layout
{
@@ -96,14 +92,15 @@
// First, generate the screen and put it in the context so we
// can grab it the layout template.
- ConcreteElement results = ScreenLoader.getInstance()
- .eval(data, data.getScreen());
- String screenValue = "";
- if (results != null)
+ String results = Turbine.getModuleLoader()
+ .getModule(Turbine.SCREENS, data.getScreen()).evaluate(data);
+
+ if (results == null)
{
- screenValue = results.toString();
+ results = "";
}
- context.put("screen_placeholder", new SimpleScalar(screenValue));
+
+ context.put("screen_placeholder", new SimpleScalar(results));
// Variable to reference the navigation templates in the
// layout template.
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
