You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by mr...@apache.org on 2005/08/10 05:47:33 UTC
svn commit: r231161 - in /struts/sandbox/trunk/ti/src/java/org/apache/ti:
config/xdocletToXWork.vm processor/ControllerActionInvocation.java
Author: mrdon
Date: Tue Aug 9 20:47:32 2005
New Revision: 231161
URL: http://svn.apache.org/viewcvs?rev=231161&view=rev
Log:
* Fixed dumb compile error
* Fixed bad velocity syntax
Modified:
struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm
struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm?rev=231161&r1=231160&r2=231161&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/config/xdocletToXWork.vm Tue Aug 9 20:47:32 2005
@@ -20,11 +20,11 @@
<action name="$method.name" method="$method.name" class="$xclass.qualifiedName">
#set( $form = $method.doc.getTag("ti.form"))
- #if ($form != null)
- #if ($form.getAttributeValue("scope") != null)
+ #if( $form)
+ #if( $form.getAttributeValue("scope"))
<param name="formScope">${form.getAttributeScope("scope")}</param>
#end
- #if ($form.getAttributeValue("name") != null)
+ #if ($form.getAttributeValue("name"))
<param name="formName">${form.getAttributeScope("name")}</param>
#end
#end
Modified: struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java?rev=231161&r1=231160&r2=231161&view=diff
==============================================================================
--- struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java (original)
+++ struts/sandbox/trunk/ti/src/java/org/apache/ti/processor/ControllerActionInvocation.java Tue Aug 9 20:47:32 2005
@@ -31,14 +31,9 @@
protected BeanFactory beanFactory;
protected Method actionMethod;
-<<<<<<< .mine
protected Object form;
protected InvokeAction invokeAction;
-=======
- protected Object form;
-
->>>>>>> .r231157
protected ControllerActionInvocation(ActionProxy proxy) throws Exception {
this(proxy, null);
}
@@ -84,7 +79,6 @@
}
return actionMethod;
}
-<<<<<<< .mine
public Object getForm() {
return form;
@@ -107,41 +101,4 @@
throws Exception {
return super.invokeAction(action, actionConfig);
}
-
-=======
-
- public Object getForm() {
- return form;
- }
-
- public void setForm(Object o) {
- this.form = o;
- }
-
- /**
- * Invokes action. If the action method contains one parameter, this method
- * handles its execution. Otherwise, it is delegated to the super class.
- */
- protected String invokeAction(Object action, ActionConfig actionConfig) throws Exception {
-
- Method method = getActionMethod();
-
- if (method.getParameterTypes().length == 1) {
- try {
- return (String) method.invoke(action, new Object[] {form});
- } catch (InvocationTargetException e) {
- // We try to return the source exception.
- Throwable t = e.getTargetException();
-
- if (t instanceof Exception) {
- throw (Exception) t;
- } else {
- throw e;
- }
- }
- } else {
- return super.invokeAction(action, actionConfig);
- }
- }
->>>>>>> .r231157
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org