jvanzyl 01/07/12 19:20:16
Modified: src/java/org/apache/turbine/modules/actions
TemplateAction.java
src/java/org/apache/turbine/modules/screens
TemplateScreen.java
Log:
- making setTarget(data,template) the way to change the path
of execution and @deprecating setTemplate for scarab's sake.
Revision Changes Path
1.3 +7 -1
jakarta-turbine/src/java/org/apache/turbine/modules/actions/TemplateAction.java
Index: TemplateAction.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/modules/actions/TemplateAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TemplateAction.java 2001/07/12 23:42:37 1.2
+++ TemplateAction.java 2001/07/13 02:20:09 1.3
@@ -79,7 +79,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: TemplateAction.java,v 1.2 2001/07/12 23:42:37 jvanzyl Exp $
+ * @version $Id: TemplateAction.java,v 1.3 2001/07/13 02:20:09 jvanzyl Exp $
*/
public abstract class TemplateAction
extends ActionEvent
@@ -185,9 +185,15 @@
*
* @param data Turbine information.
* @param template The template that will be executed next.
+ * @deprecated use setTarget(data,template)
*/
public void setTemplate(RunData data,
String template)
+ {
+ setTarget(data,template);
+ }
+
+ public void setTarget(RunData data, String template)
{
data.setTarget(template);
}
1.15 +8 -2
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- TemplateScreen.java 2001/07/12 20:22:05 1.14
+++ TemplateScreen.java 2001/07/13 02:20:13 1.15
@@ -73,7 +73,7 @@
* going on there (it is quite simple really).
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Dave Bryson</a>
- * @version $Id: TemplateScreen.java,v 1.14 2001/07/12 20:22:05 jvanzyl Exp $
+ * @version $Id: TemplateScreen.java,v 1.15 2001/07/13 02:20:13 jvanzyl Exp $
*/
public class TemplateScreen
extends Module
@@ -162,12 +162,18 @@
*
* @param data Turbine information.
* @param template The name of the next template.
+ * @param deprecated use setTarget(data,template)
*/
public static void setTemplate(RunData data, String template)
{
//!! need to know what the target template type is.
- data.setTarget(template);
+ setTarget(data,template);
}
+
+ public static void setTarget(RunData data, String template)
+ {
+ data.setTarget(template);
+ }
/**
* You can call this within a Screen to cause an internal redirect
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
