svn commit: r930097 - in /struts/struts2/trunk/core/src: main/java/org/apache/struts2/components/ main/java/org/apache/struts2/views/jsp/ui/ main/resources/template/simple/ test/java/org/apache/struts
Author: lukaszlenart
Date: Thu Apr 1 21:04:39 2010
New Revision: 930097
URL: http://svn.apache.org/viewvc?rev=930097&view=rev
Log:
Resolved WW-2624 - added src attribute to reset tag to generate reset button as
a image
Added:
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-5.txt
- copied, changed from r927528,
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-6.txt
- copied, changed from r927528,
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-4.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-7.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-8.txt
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/views/jsp/ui/Reset-9.txt
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Reset.java
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java
struts/struts2/trunk/core/src/main/resources/template/simple/reset.ftl
struts/struts2/trunk/core/src/test/java/org/apache/struts2/views/jsp/ui/ResetTest.java
struts/struts2/trunk/core/src/test/resources/org/apache/struts2/TestAction.properties
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Reset.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Reset.java?rev=930097&r1=930096&r2=930097&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Reset.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/components/Reset.java
Thu Apr 1 21:04:39 2010
@@ -21,13 +21,12 @@
package org.apache.struts2.components;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.views.annotations.StrutsTag;
import org.apache.struts2.views.annotations.StrutsTagAttribute;
-import com.opensymphony.xwork2.util.ValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
*
@@ -65,10 +64,7 @@ import com.opensymphony.xwork2.util.Valu
public class Reset extends FormButton {
final public static String TEMPLATE = "reset";
-protected String action;
-protected String method;
-protected String align;
-protected String type;
+protected String src;
public Reset(ValueStack stack, HttpServletRequest request,
HttpServletResponse response) {
super(stack, request, response);
@@ -77,12 +73,18 @@ public class Reset extends FormButton {
public String getDefaultOpenTemplate() {
return "empty";
}
+
protected String getDefaultTemplate() {
return Reset.TEMPLATE;
}
-public void evaluateParams() {
+public void evaluateExtraParams() {
+super.evaluateExtraParams();
+if (src != null)
+addParameter("src", findString(src));
+}
+public void evaluateParams() {
if ((key == null) && (value == null)) {
value = "Reset";
}
@@ -90,9 +92,7 @@ public class Reset extends FormButton {
if (((key != null)) && (value == null)) {
this.value = "%{getText('"+key +"')}";
}
-
super.evaluateParams();
-
}
/**
@@ -110,4 +110,9 @@ public class Reset extends FormButton {
super.setLabel(label);
}
+@StrutsTagAttribute(description="Supply an image src for image type
reset button. Will have no effect for types input and button.")
+public void setSrc(String src) {
+this.src = src;
+}
+
}
Modified:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java?rev=930097&r1=930096&r2=930097&view=diff
==
---
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java
(original)
+++
struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/jsp/ui/ResetTag.java
Thu Apr 1 21:04:39 2010
@@ -21,13 +21,12 @@
package org.apache.struts2.views.jsp.ui;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import com.opensymphony.xwork2.util.ValueStack;
import org.apache.struts2.components.Component;
import org.apache.struts2.components.Reset;
-import com.opensymphony.xwork2.util.ValueStack;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
* @see org.apach
[OSS Bamboo] Struts 2 SVN - Main Build build 1295 was SUCCESSFUL (with 1794 tests). Change made by Lukasz Lenart
--- STRUTS-MAIN-1295 was successful. --- Code has been updated by Lukasz Lenart. 1794 tests in total. http://opensource.bamboo.atlassian.com/browse/STRUTS-MAIN-1295/ -- Code Changes -- Lukasz Lenart (930097): >Resolved WW-2624 - added src attribute to reset tag to generate reset button >as a image -- Error Summary -- [copy] Warning: /opt/j2ee/domains/bamboo.atlassian.com/opensource/home/xml-data/build-dir/STRUTS-MAIN/apps/src/main/java not found. [copy] Warning: /opt/j2ee/domains/bamboo.atlassian.com/opensource/home/xml-data/build-dir/STRUTS-MAIN/apps/src/main/resources not found. Apr 1, 2010 4:13:29 PM java.util.jar.Attributes read WARNING: Duplicate name in Manifest: Manifest-Version. Ensure that the manifest does not have duplicate entries, and that blank lines separate individual sections in both your manifest and in the META-INF/MANIFEST.MF entry in the jar file. Apr 1, 2010 4:13:29 PM java.util.jar.Attributes read WARNING: Duplicate name in Manifest: Created-By. Ensure that the manifest does not have duplicate entries, and that blank lines separate individual sections in both your manifest and in the META-INF/MANIFEST.MF entry in the jar file. Apr 1, 2010 4:13:29 PM java.util.jar.Attributes read WARNING: Duplicate name in Manifest: Built-By. Ensure that the manifest does not have duplicate entries, and that blank lines separate individual sections in both your manifest and in the META-INF/MANIFEST.MF entry in the jar file. Apr 1, 2010 4:13:29 PM java.util.jar.Attributes read WARNING: Duplicate name in Manifest: Build-Jdk. Ensure that the manifest does not have duplicate entries, and that blank lines separate individual sections in both your manifest and in the META-INF/MANIFEST.MF entry in the jar file. Apr 1, 2010 4:13:30 PM java.util.jar.Attributes read WARNING: Duplicate name in Manifest: Manifest-Version. Ensure that the manifest does not have duplicate entries, and that blank lines separate individual sections in both your manifest and in the META-INF/MANIFEST.MF entry in the jar file. Apr 1, 2010 4:13:30 PM java.util.jar.Attributes read WARNING: Duplicate name in Manifest: Created-By. Ensure that the manifest does not have duplicate entries, and that blank lines separate individual sections in both your manifest and in the META-INF/MANIFEST.MF entry in the jar file. Apr 1, 2010 4:13:30 PM java.util.jar.Attributes read WARNING: Duplicate name in Manifest: Built-By. Ensure that the manifest does not have duplicate entries, and that blank lines separate individual sections in both your manifest and in the META-INF/MANIFEST.MF entry in the jar file. Apr 1, 2010 4:13:30 PM java.util.jar.Attributes read WARNING: Duplicate name in Manifest: Build-Jdk. Ensure that the manifest does not have duplicate entries, and that blank lines separate individual sections in both your manifest and in the META-INF/MANIFEST.MF entry in the jar file. Unable to copy artifact java-1.4 since directory /opt/j2ee/domains/bamboo.atlassian.com/opensource/home/xml-data/build-dir/STRUTS-MAIN/backport does not exist. -- This message is automatically generated by Atlassian Bamboo
[CONF] Confluence Changes in the last 24 hours
This is a daily summary of all recent changes in Confluence. - Updated Spaces: - Apache ActiveMQ (http://cwiki.apache.org/confluence/display/ACTIVEMQ) Pages - Message Redelivery and DLQ Handling edited by gtully (10:12 AM) http://cwiki.apache.org/confluence/display/ACTIVEMQ/Message+Redelivery+and+DLQ+Handling SSL Transport Reference edited by gtully (08:16 AM) http://cwiki.apache.org/confluence/display/ACTIVEMQ/SSL+Transport+Reference Apache Bean Validation (http://cwiki.apache.org/confluence/display/BeanValidation) Pages - Release Management created by drwoods (09:34 PM) http://cwiki.apache.org/confluence/display/BeanValidation/Release+Management Roadmap created by drwoods (09:30 PM) http://cwiki.apache.org/confluence/display/BeanValidation/Roadmap People created by drwoods (09:28 PM) http://cwiki.apache.org/confluence/display/BeanValidation/People Navigation created by drwoods (07:58 PM) http://cwiki.apache.org/confluence/display/BeanValidation/Navigation Mailing Lists created by drwoods (09:18 PM) http://cwiki.apache.org/confluence/display/BeanValidation/Mailing+Lists SiteMap created by drwoods (09:13 PM) http://cwiki.apache.org/confluence/display/BeanValidation/SiteMap Privacy Policy created by drwoods (09:12 PM) http://cwiki.apache.org/confluence/display/BeanValidation/Privacy+Policy April 2010 created by drwoods (08:52 PM) http://cwiki.apache.org/confluence/display/BeanValidation/April+2010 Board Reports created by drwoods (08:39 PM) http://cwiki.apache.org/confluence/display/BeanValidation/Board+Reports Banner created by drwoods (07:19 PM) http://cwiki.apache.org/confluence/display/BeanValidation/Banner Site created by drwoods (02:20 PM) http://cwiki.apache.org/confluence/display/BeanValidation/Site Overview created by drwoods (02:24 PM) http://cwiki.apache.org/confluence/display/BeanValidation/Overview Development created by drwoods (03:08 PM) http://cwiki.apache.org/confluence/display/BeanValidation/Development Community created by drwoods (03:06 PM) http://cwiki.apache.org/confluence/display/BeanValidation/Community Index edited by drwoods (02:12 PM) http://cwiki.apache.org/confluence/display/BeanValidation/Index Apache Camel (http://cwiki.apache.org/confluence/display/CAMEL) Pages - gmail edited by mrt1nz (02:00 PM) http://cwiki.apache.org/confluence/display/CAMEL/gmail tutorial-osgi-camel-part2c edited by cmoulliard (01:56 PM) http://cwiki.apache.org/confluence/display/CAMEL/tutorial-osgi-camel-part2c Netty edited by akarpe (01:27 PM) http://cwiki.apache.org/confluence/display/CAMEL/Netty tutorial-osgi-camel-part2b edited by cmoulliard (10:30 AM) http://cwiki.apache.org/confluence/display/CAMEL/tutorial-osgi-camel-part2b tutorial-osgi-camel-part2a edited by cmoulliard (10:26 AM) http://cwiki.apache.org/confluence/display/CAMEL/tutorial-osgi-camel-part2a tutorial-osgi-camel-part2 edited by cmoulliard (10:21 AM) http://cwiki.apache.org/confluence/display/CAMEL/tutorial-osgi-camel-part2 Camel 2.3.0 Release edited by davsclaus (07:49 AM) http://cwiki.apache.org/confluence/display/CAMEL/Camel+2.3.0+Release MINA edited by akarpe (02:27 AM) http://cwiki.apache.org/confluence/display/CAMEL/MINA Component List edited by akarpe (02:23 AM) http://cwiki.apache.org/confluence/display/CAMEL/Component+List Apache Chemistry (http://cwiki.apache.org/confluence/display/CMIS) Pages - Chemistry and OpenCMIS Technical Comparison edited by fmui (12:06 PM) http://cwiki.apache.org/confluence/display/CMIS/Chemistry+and+OpenCMIS+Technical+Comparison Apache CXF Documentation (http://cwiki.apache.org/confluence/display/CXF20DOC) Pages - WS-Security edited by dvaleri (02:41 PM) http://cwiki.apache.org/confluence/display/CXF20DOC/WS-Security Apache Geronimo Project Management (http://cwiki.apache.org/confluence/display/GMOxPMGT) Pages - Apache Geronimo Board Report - 2010-04 - April created by jaydm (03:29 PM) http://cwiki.apache.org/confluence/display/GMOxPMGT/Apache+Geronimo+Board+Report+-+2010-04+-+April Geronimo 2.1.5 Release Tips edited by rwonly (07:48 AM) http://cwiki.apache.org/confluence/display/GMOxPMGT/Geronimo+2.1.5+Release+Tips OFBiz Technical Documentation (http://cwiki.apache.org/confluence/display/OFBTECH) Pages - Revisions Requiring Data Migration edited by jacques.le.roux (10:47 AM) http://cwiki.apache.org/confluence/dis
