jvanzyl 01/06/28 06:55:46
Modified: src/java/org/apache/turbine/modules/pages DefaultPage.java
Log:
- cleaning up a bit
Revision Changes Path
1.16 +5 -5
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.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- DefaultPage.java 2001/06/27 18:47:43 1.15
+++ DefaultPage.java 2001/06/28 13:55:42 1.16
@@ -112,7 +112,7 @@
* written by John McNally. I've only modified it for WebMacro use.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: DefaultPage.java,v 1.15 2001/06/27 18:47:43 jvanzyl Exp $
+ * @version $Id: DefaultPage.java,v 1.16 2001/06/28 13:55:42 jvanzyl Exp $
*/
public class DefaultPage extends Page
{
@@ -149,9 +149,10 @@
// The Screen can override the getLayout() method to re-define
// the Layout depending on data passed in via the
// data.parameters object.
- Screen aScreen = (Screen) Turbine.getModuleLoader().getModule(
+ Screen screen = (Screen) Turbine.getModuleLoader().getModule(
Turbine.SCREENS, data.getScreen());
- String layout = aScreen.getLayout(data);
+
+ String layout = screen.getLayout(data);
// If the Layout has been set to be null, attempt to execute
// the Screen that has been defined.
@@ -162,8 +163,7 @@
}
else
{
- Turbine.getModuleLoader().getModule(
- Turbine.SCREENS, data.getScreen()).execute(data);
+ screen.execute(data);
}
// Do any post build actions (overridable by subclasses -
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
