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/06/27 20:48:07 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/modules/screens TemplateScreen.java
jvanzyl 01/06/27 11:48:07
Modified: src/java/org/apache/turbine/modules/screens
TemplateScreen.java
Log:
- using the new ModuleLoader
Revision Changes Path
1.11 +5 -5 jakarta-turbine/src/java/org/apache/turbine/modules/screens/TemplateScreen.java
Index: TemplateScreen.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/screens/TemplateScreen.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- TemplateScreen.java 2001/05/07 14:39:16 1.10
+++ TemplateScreen.java 2001/06/27 18:48:05 1.11
@@ -54,14 +54,13 @@
* <http://www.apache.org/>.
*/
-// Turbine/ECS Imports
+import org.apache.turbine.Turbine;
import org.apache.ecs.ConcreteElement;
import org.apache.turbine.modules.Screen;
-import org.apache.turbine.modules.ScreenLoader;
+//import org.apache.turbine.modules.ScreenLoader;
import org.apache.turbine.util.RunData;
import org.apache.turbine.services.template.TurbineTemplate;
-
/**
* Template Screen.
*
@@ -75,7 +74,7 @@
* going on there (it is quite simple really).
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: TemplateScreen.java,v 1.10 2001/05/07 14:39:16 mpoeschl Exp $
+ * @version $Id: TemplateScreen.java,v 1.11 2001/06/27 18:48:05 jvanzyl Exp $
*/
public abstract class TemplateScreen extends Screen
{
@@ -188,7 +187,8 @@
throws Exception
{
setTemplate(data, template);
- ScreenLoader.getInstance().exec(data,screen);
+ //ScreenLoader.getInstance().exec(data,screen);
+ Turbine.getModuleLoader().getModule("screen", screen).execute(data);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org