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:47:45 UTC
cvs commit: jakarta-turbine/src/java/org/apache/turbine/modules/pages DefaultPage.java TemplatePage.java
jvanzyl 01/06/27 11:47:45
Modified: src/java/org/apache/turbine/modules/pages DefaultPage.java
TemplatePage.java
Log:
- using the new ModuleLoader
Revision Changes Path
1.15 +10 -14 jakarta-turbine/src/java/org/apache/turbine/modules/pages/DefaultPage.java
Index: DefaultPage.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/DefaultPage.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- DefaultPage.java 2001/06/10 23:55:54 1.14
+++ DefaultPage.java 2001/06/27 18:47:43 1.15
@@ -55,20 +55,13 @@
*/
import java.util.Vector;
-
-// Turbine Classes
-import org.apache.turbine.modules.ActionLoader;
-import org.apache.turbine.modules.LayoutLoader;
+import org.apache.turbine.Turbine;
import org.apache.turbine.modules.Page;
import org.apache.turbine.modules.Screen;
-import org.apache.turbine.modules.ScreenLoader;
import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.util.RunData;
-
-// ECS Stuff
import org.apache.ecs.Doctype;
-
/**
* When building sites using templates, Screens need only be defined
* for templates which require dynamic (database or object) data.
@@ -119,7 +112,7 @@
* written by John McNally. I've only modified it for WebMacro use.
*
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: DefaultPage.java,v 1.14 2001/06/10 23:55:54 jon Exp $
+ * @version $Id: DefaultPage.java,v 1.15 2001/06/27 18:47:43 jvanzyl Exp $
*/
public class DefaultPage extends Page
{
@@ -140,7 +133,8 @@
// can re-define the template definition.
if ( data.hasAction() )
{
- ActionLoader.getInstance().exec ( data, data.getAction() );
+ Turbine.getModuleLoader().getModule(
+ Turbine.ACTIONS, data.getAction()).execute(data);
}
// Set the default doctype from the value given in
@@ -155,19 +149,21 @@
// The Screen can override the getLayout() method to re-define
// the Layout depending on data passed in via the
// data.parameters object.
- ScreenLoader sl = ScreenLoader.getInstance();
- Screen aScreen = sl.getInstance(data.getScreen());
+ Screen aScreen = (Screen) Turbine.getModuleLoader().getModule(
+ Turbine.SCREENS, data.getScreen());
String layout = aScreen.getLayout(data);
// If the Layout has been set to be null, attempt to execute
// the Screen that has been defined.
if ( layout != null )
{
- LayoutLoader.getInstance().exec ( data, layout );
+ Turbine.getModuleLoader().getModule(
+ Turbine.LAYOUTS, layout).execute(data);
}
else
{
- ScreenLoader.getInstance().exec ( data, data.getScreen() );
+ Turbine.getModuleLoader().getModule(
+ Turbine.SCREENS, data.getScreen()).execute(data);
}
// Do any post build actions (overridable by subclasses -
1.16 +2 -4 jakarta-turbine/src/java/org/apache/turbine/modules/pages/TemplatePage.java
Index: TemplatePage.java
===================================================================
RCS file: /home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/pages/TemplatePage.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- TemplatePage.java 2001/05/23 16:36:55 1.15
+++ TemplatePage.java 2001/06/27 18:47:43 1.16
@@ -54,10 +54,8 @@
* <http://www.apache.org/>.
*/
-// Turbine Classes
-import org.apache.turbine.services.template.TurbineTemplate;
import org.apache.turbine.util.RunData;
-
+import org.apache.turbine.services.template.TurbineTemplate;
/**
* When building sites using templates, Screens need only be defined
@@ -107,7 +105,7 @@
*
* @author <a href="mailto:john.mcnally@clearink.com">John D. McNally</a>
* @author <a href="mailto:mbryson@mont.mindspring.com">Dave Bryson</a>
- * @version $Id: TemplatePage.java,v 1.15 2001/05/23 16:36:55 mikeh Exp $
+ * @version $Id: TemplatePage.java,v 1.16 2001/06/27 18:47:43 jvanzyl Exp $
*/
public class TemplatePage extends DefaultPage
{
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org