struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lukaszlen...@apache.org
Subject [1/2] struts git commit: WW-4499 - Removed readonly attribute from radio, checkbox and checkboxlist tags.
Date Mon, 08 Jun 2015 09:11:59 GMT
Repository: struts
Updated Branches:
  refs/heads/master b074c0888 -> 7d2370e01


WW-4499 - Removed readonly attribute from radio, checkbox and checkboxlist tags.


Project: http://git-wip-us.apache.org/repos/asf/struts/repo
Commit: http://git-wip-us.apache.org/repos/asf/struts/commit/d587a687
Tree: http://git-wip-us.apache.org/repos/asf/struts/tree/d587a687
Diff: http://git-wip-us.apache.org/repos/asf/struts/diff/d587a687

Branch: refs/heads/master
Commit: d587a687a85edb771d8d6421e45f7e699f116a94
Parents: 72e6f70
Author: Aleksandr Mashchenko <aleksandr.7m@gmail.com>
Authored: Sat May 30 18:35:25 2015 +0300
Committer: Aleksandr Mashchenko <aleksandr.7m@gmail.com>
Committed: Sat May 30 18:35:25 2015 +0300

----------------------------------------------------------------------
 .../java/org/apache/struts2/components/Checkbox.java     | 10 ----------
 .../java/org/apache/struts2/components/CheckboxList.java | 11 -----------
 .../main/java/org/apache/struts2/components/Radio.java   | 11 -----------
 core/src/main/resources/template/simple/checkbox.ftl     |  3 ---
 core/src/main/resources/template/simple/radiomap.ftl     |  3 ---
 core/src/site/resources/tags/checkbox.html               |  8 --------
 core/src/site/resources/tags/checkboxlist.html           |  8 --------
 core/src/site/resources/tags/radio.html                  |  8 --------
 8 files changed, 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/struts/blob/d587a687/core/src/main/java/org/apache/struts2/components/Checkbox.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/Checkbox.java b/core/src/main/java/org/apache/struts2/components/Checkbox.java
index 5ab5d44..e1765b2 100644
--- a/core/src/main/java/org/apache/struts2/components/Checkbox.java
+++ b/core/src/main/java/org/apache/struts2/components/Checkbox.java
@@ -60,7 +60,6 @@ public class Checkbox extends UIBean {
     final public static String TEMPLATE = "checkbox";
 
     protected String fieldValue;
-    protected String readonly;
 
     public Checkbox(ValueStack stack, HttpServletRequest request, HttpServletResponse response)
{
         super(stack, request, response);
@@ -76,10 +75,6 @@ public class Checkbox extends UIBean {
         } else {
             addParameter("fieldValue", "true");
         }
-        
-        if (readonly != null) {
-            addParameter("readonly", findValue(readonly, Boolean.class));
-        }
     }
 
     protected Class getValueClassType() {
@@ -90,10 +85,5 @@ public class Checkbox extends UIBean {
     public void setFieldValue(String fieldValue) {
         this.fieldValue = fieldValue;
     }
-    
-    @StrutsTagAttribute(description="Whether the input is readonly", type="Boolean", defaultValue="false")
-    public void setReadonly(String readonly) {
-        this.readonly = readonly;
-    }
 
 }

http://git-wip-us.apache.org/repos/asf/struts/blob/d587a687/core/src/main/java/org/apache/struts2/components/CheckboxList.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/CheckboxList.java b/core/src/main/java/org/apache/struts2/components/CheckboxList.java
index 503dad5..e83c8be 100644
--- a/core/src/main/java/org/apache/struts2/components/CheckboxList.java
+++ b/core/src/main/java/org/apache/struts2/components/CheckboxList.java
@@ -53,8 +53,6 @@ import com.opensymphony.xwork2.util.ValueStack;
 public class CheckboxList extends ListUIBean {
     final public static String TEMPLATE = "checkboxlist";
     
-    protected String readonly;
-
     public CheckboxList(ValueStack stack, HttpServletRequest request, HttpServletResponse
response) {
         super(stack, request, response);
     }
@@ -65,15 +63,6 @@ public class CheckboxList extends ListUIBean {
     
     public void evaluateExtraParams() {
     	super.evaluateExtraParams();
-        
-        if (readonly != null) {
-            addParameter("readonly", findValue(readonly, Boolean.class));
-        }
-    }
-    
-    @StrutsTagAttribute(description="Whether the input is readonly", type="Boolean", defaultValue="false")
-    public void setReadonly(String readonly) {
-        this.readonly = readonly;
     }
 
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/d587a687/core/src/main/java/org/apache/struts2/components/Radio.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/struts2/components/Radio.java b/core/src/main/java/org/apache/struts2/components/Radio.java
index ce13803..4d1a745 100644
--- a/core/src/main/java/org/apache/struts2/components/Radio.java
+++ b/core/src/main/java/org/apache/struts2/components/Radio.java
@@ -60,8 +60,6 @@ import javax.servlet.http.HttpServletResponse;
 public class Radio extends ListUIBean {
     final public static String TEMPLATE = "radiomap";
     
-    protected String readonly;
-
     public Radio(ValueStack stack, HttpServletRequest request, HttpServletResponse response)
{
         super(stack, request, response);
     }
@@ -72,14 +70,5 @@ public class Radio extends ListUIBean {
     
     public void evaluateExtraParams() {
     	super.evaluateExtraParams();
-        
-        if (readonly != null) {
-            addParameter("readonly", findValue(readonly, Boolean.class));
-        }
-    }
-    
-    @StrutsTagAttribute(description="Whether the input is readonly", type="Boolean", defaultValue="false")
-    public void setReadonly(String readonly) {
-        this.readonly = readonly;
     }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/struts/blob/d587a687/core/src/main/resources/template/simple/checkbox.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/checkbox.ftl b/core/src/main/resources/template/simple/checkbox.ftl
index d431888..fd47810 100644
--- a/core/src/main/resources/template/simple/checkbox.ftl
+++ b/core/src/main/resources/template/simple/checkbox.ftl
@@ -27,9 +27,6 @@
 <#if parameters.disabled!false>
  disabled="disabled"<#rt/>
 </#if>
-<#if parameters.readonly!false>
- readonly="readonly"<#rt/>
-</#if>
 <#if parameters.tabindex?has_content>
  tabindex="${parameters.tabindex?html}"<#rt/>
 </#if>

http://git-wip-us.apache.org/repos/asf/struts/blob/d587a687/core/src/main/resources/template/simple/radiomap.ftl
----------------------------------------------------------------------
diff --git a/core/src/main/resources/template/simple/radiomap.ftl b/core/src/main/resources/template/simple/radiomap.ftl
index 9160e05..80b8815 100644
--- a/core/src/main/resources/template/simple/radiomap.ftl
+++ b/core/src/main/resources/template/simple/radiomap.ftl
@@ -73,9 +73,6 @@
 <#if parameters.disabled!false>
  disabled="disabled"<#rt/>
 </#if>
-<#if parameters.readonly!false>
- readonly="readonly"<#rt/>
-</#if>
 <#if parameters.tabindex?has_content>
  tabindex="${parameters.tabindex?html}"<#rt/>
 </#if>

http://git-wip-us.apache.org/repos/asf/struts/blob/d587a687/core/src/site/resources/tags/checkbox.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/checkbox.html b/core/src/site/resources/tags/checkbox.html
index 368d723..75cd106 100644
--- a/core/src/site/resources/tags/checkbox.html
+++ b/core/src/site/resources/tags/checkbox.html
@@ -274,14 +274,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Set the html onselect attribute on rendered html
element</td>
 				</tr>
 				<tr>
-					<td align="left" valign="top">readonly</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">Boolean</td>
-					<td align="left" valign="top">Whether the input is readonly</td>
-				</tr>
-				<tr>
 					<td align="left" valign="top">requiredLabel</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top">false</td>

http://git-wip-us.apache.org/repos/asf/struts/blob/d587a687/core/src/site/resources/tags/checkboxlist.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/checkboxlist.html b/core/src/site/resources/tags/checkboxlist.html
index 5359aa9..27e90b2 100644
--- a/core/src/site/resources/tags/checkboxlist.html
+++ b/core/src/site/resources/tags/checkboxlist.html
@@ -330,14 +330,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Set the html onselect attribute on rendered html
element</td>
 				</tr>
 				<tr>
-					<td align="left" valign="top">readonly</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">Boolean</td>
-					<td align="left" valign="top">Whether the input is readonly</td>
-				</tr>
-				<tr>
 					<td align="left" valign="top">requiredLabel</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top">false</td>

http://git-wip-us.apache.org/repos/asf/struts/blob/d587a687/core/src/site/resources/tags/radio.html
----------------------------------------------------------------------
diff --git a/core/src/site/resources/tags/radio.html b/core/src/site/resources/tags/radio.html
index 0f26282..5fba64c 100644
--- a/core/src/site/resources/tags/radio.html
+++ b/core/src/site/resources/tags/radio.html
@@ -330,14 +330,6 @@ Please do not edit it directly.
 					<td align="left" valign="top">Set the html onselect attribute on rendered html
element</td>
 				</tr>
 				<tr>
-					<td align="left" valign="top">readonly</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">false</td>
-					<td align="left" valign="top">Boolean</td>
-					<td align="left" valign="top">Whether the input is readonly</td>
-				</tr>
-				<tr>
 					<td align="left" valign="top">requiredLabel</td>
 					<td align="left" valign="top">false</td>
 					<td align="left" valign="top">false</td>


Mime
View raw message