You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2010/11/09 16:00:11 UTC
svn commit: r1033002 - in
/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src:
main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/
Author: matzew
Date: Tue Nov 9 15:00:11 2010
New Revision: 1033002
URL: http://svn.apache.org/viewvc?rev=1033002&view=rev
Log:
TRINIDAD-1957 - tr:selectManyShuttle with required=true requires a selected item in the leading and trailing list box to pass validation.
thx to Felix Roethenbacher for the patch
Modified:
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimal-golden.xml
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIE-golden.xml
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIERtl-golden.xml
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalInacc-golden.xml
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalScrRdr-golden.xml
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalInacc-golden.xml
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml
myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalScrRdr-golden.xml
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SelectManyShuttleRenderer.java Tue Nov 9 15:00:11 2010
@@ -1027,6 +1027,12 @@ public class SelectManyShuttleRenderer e
return null;
}
+ @Override
+ protected boolean getRequired(FacesBean bean) {
+ // Required has already been handled in parent component.
+ return false;
+ }
+
private boolean _isLeading;
}
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimal-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimal-golden.xml?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimal-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimal-golden.xml Tue Nov 9 15:00:11 2010
@@ -4867,7 +4867,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
@@ -5122,7 +5122,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIE-golden.xml?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIE-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIE-golden.xml Tue Nov 9 15:00:11 2010
@@ -4714,7 +4714,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
@@ -4963,7 +4963,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIERtl-golden.xml?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIERtl-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalIERtl-golden.xml Tue Nov 9 15:00:11 2010
@@ -4714,7 +4714,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
@@ -4963,7 +4963,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalInacc-golden.xml?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalInacc-golden.xml Tue Nov 9 15:00:11 2010
@@ -4741,7 +4741,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
@@ -4992,7 +4992,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalSaf-golden.xml Tue Nov 9 15:00:11 2010
@@ -4867,7 +4867,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
@@ -5122,7 +5122,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalScrRdr-golden.xml?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectManyShuttle-minimalScrRdr-golden.xml Tue Nov 9 15:00:11 2010
@@ -4962,7 +4962,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
@@ -5221,7 +5221,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimal-golden.xml Tue Nov 9 15:00:11 2010
@@ -5345,7 +5345,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
@@ -5600,7 +5600,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIE-golden.xml Tue Nov 9 15:00:11 2010
@@ -5165,7 +5165,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
@@ -5414,7 +5414,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalIERtl-golden.xml Tue Nov 9 15:00:11 2010
@@ -5165,7 +5165,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
@@ -5414,7 +5414,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalInacc-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalInacc-golden.xml?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalInacc-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalInacc-golden.xml Tue Nov 9 15:00:11 2010
@@ -5210,7 +5210,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
@@ -5461,7 +5461,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalSaf-golden.xml Tue Nov 9 15:00:11 2010
@@ -5345,7 +5345,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
@@ -5600,7 +5600,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
Modified: myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalScrRdr-golden.xml
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalScrRdr-golden.xml?rev=1033002&r1=1033001&r2=1033002&view=diff
==============================================================================
--- myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalScrRdr-golden.xml (original)
+++ myfaces/trinidad/branches/trinidad-1.2.x/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/selectOrderShuttle-minimalScrRdr-golden.xml Tue Nov 9 15:00:11 2010
@@ -5404,7 +5404,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select
@@ -5663,7 +5663,7 @@
>
<span
- class="af_selectManyListbox p_AFRequired"
+ class="af_selectManyListbox"
>
<select