You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@struts.apache.org by mu...@apache.org on 2007/05/13 00:07:23 UTC

svn commit: r537519 - in /struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo: components/Submit.java views/jsp/ui/SubmitTag.java

Author: musachy
Date: Sat May 12 15:07:21 2007
New Revision: 537519

URL: http://svn.apache.org/viewvc?view=rev&rev=537519
Log:
WW-1919 remove "action" attribute

Modified:
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
    struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java?view=diff&rev=537519&r1=537518&r2=537519
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/components/Submit.java Sat May 12 15:07:21 2007
@@ -29,6 +29,7 @@
 import org.apache.commons.logging.LogFactory;
 import org.apache.struts2.components.Form;
 import org.apache.struts2.components.FormButton;
+import org.apache.struts2.interceptor.validation.SkipValidation;
 import org.apache.struts2.views.annotations.StrutsTag;
 import org.apache.struts2.views.annotations.StrutsTagAttribute;
 import org.apache.struts2.views.annotations.StrutsTagSkipInheritance;
@@ -380,5 +381,10 @@
         defaultValue = "false")
     public void setAjaxAfterValidation(String ajaxAfterValidation) {
         this.ajaxAfterValidation = ajaxAfterValidation;
+    }
+
+    @StrutsTagSkipInheritance
+    public void setAction(String action) {
+        super.setAction(action);
     }
 }

Modified: struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java?view=diff&rev=537519&r1=537518&r2=537519
==============================================================================
--- struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java (original)
+++ struts/struts2/trunk/plugins/dojo/src/main/java/org/apache/struts2/dojo/views/jsp/ui/SubmitTag.java Sat May 12 15:07:21 2007
@@ -36,7 +36,6 @@
 
     private static final long serialVersionUID = 2179281109958301343L;
 
-    protected String action;
     protected String method;
     protected String align;
     protected String type;
@@ -70,7 +69,6 @@
         super.populateParams();
 
         Submit submit = ((Submit) component);
-        submit.setAction(action);
         submit.setMethod(method);
         submit.setAlign(align);
         submit.setType(type);
@@ -95,10 +93,6 @@
         submit.setHighlightDuration(highlightDuration);
         submit.setValidate(validate);
         submit.setAjaxAfterValidation(ajaxAfterValidation);
-    }
-
-    public void setAction(String action) {
-        this.action = action;
     }
 
     public void setMethod(String method) {