Author: lfryc(a)redhat.com
Date: 2011-01-31 12:48:33 -0500 (Mon, 31 Jan 2011)
New Revision: 21340
Added:
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichTreeNodeBean.properties
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml
Log:
attribute cleaning
Added:
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichTreeNodeBean.properties
===================================================================
---
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichTreeNodeBean.properties
(rev 0)
+++
modules/tests/metamer/trunk/application/src/main/resources/org/richfaces/tests/metamer/bean/RichTreeNodeBean.properties 2011-01-31
17:48:33 UTC (rev 21340)
@@ -0,0 +1,5 @@
+attr.dir.rtl=RTL
+attr.dir.ltr=LTR
+attr.dir.null=
+
+
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2011-01-31
17:40:30 UTC (rev 21339)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/simple.xhtml 2011-01-31
17:48:33 UTC (rev 21340)
@@ -51,10 +51,24 @@
nodeType="#{node.type}"
var="node"
value="#{richTreeBean.root}"
+ selection="#{richTreeBean.selection}"
+
selectionChangeListener="#{richTreeListenerBean.processSelectionChange}"
+ toggleListener="#{richTreeListenerBean.processToggle}"
+ data="#{richTreeBean.attributes['data'].value}"
dir="#{richTreeBean.attributes['dir'].value}"
+ execute="#{richTreeBean.attributes['execute'].value}"
+
handleClass="#{richTreeBean.attributes['handleClass'].value}"
+
iconClass="#{richTreeBean.attributes['iconClass'].value}"
+
iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}"
+
iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}"
+ iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}"
+
immediate="#{richTreeBean.attributes['immediate'].value}"
+
keepSaved="#{richTreeBean.attributes['keepSaved'].value}"
+
labelClass="#{richTreeBean.attributes['labelClass'].value}"
lang="#{richTreeBean.attributes['lang'].value}"
- data="#{richTreeBean.attributes['data'].value}"
+
limitRender="#{richTreeBean.attributes['limitRender'].value}"
+
nodeClass="#{richTreeBean.attributes['nodeClass'].value}"
onbeforedomupdate="#{richTreeBean.attributes['onbeforedomupdate'].value}"
onbeforenodetoggle="#{richTreeBean.attributes['onbeforenodetoggle'].value}"
onbeforeselectionchange="#{richTreeBean.attributes['onbeforeselectionchange'].value}"
@@ -67,45 +81,50 @@
onkeyup="#{richTreeBean.attributes['onkeyup'].value}"
onmousedown="#{richTreeBean.attributes['onmousedown'].value}"
onmousemove="#{richTreeBean.attributes['onmousemove'].value}"
-
onmouseup="#{richTreeBean.attributes['onmouseup'].value}"
onmouseout="#{richTreeBean.attributes['onmouseout'].value}"
onmouseover="#{richTreeBean.attributes['onmouseover'].value}"
+
onmouseup="#{richTreeBean.attributes['onmouseup'].value}"
onnodetoggle="#{richTreeBean.attributes['onnodetoggle'].value}"
onselectionchange="#{richTreeBean.attributes['onselectionchange'].value}"
+ render="#{richTreeBean.attributes['render'].value}"
rendered="#{richTreeBean.attributes['rendered'].value}"
- selection="#{richTreeBean.selection}"
selectionType="#{richTreeBean.attributes['selectionType'].value}"
+ status="#{richTreeBean.attributes['status'].value}"
style="#{richTreeBean.attributes['style'].value}"
styleClass="#{richTreeBean.attributes['styleClass'].value}"
title="#{richTreeBean.attributes['title'].value}"
+ toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}"
toggleType="#{richTreeBean.attributes['toggleType'].value}"
- iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}"
-
iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}"
-
iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}"
-
handleClass="#{richTreeBean.attributes['handleClass'].value}"
-
iconClass="#{richTreeBean.attributes['iconClass'].value}"
-
labelClass="#{richTreeBean.attributes['labelClass'].value}"
-
nodeClass="#{richTreeBean.attributes['nodeClass'].value}"
-
selectionChangeListener="#{richTreeListenerBean.processSelectionChange}"
- toggleListener="#{richTreeListenerBean.processToggle}"
- render="#{richTreeBean.attributes['render'].value}"
- execute="#{richTreeBean.attributes['execute'].value}"
- toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}"
-
limitRender="#{richTreeBean.attributes['limitRender'].value}"
- status="#{richTreeBean.attributes['status'].value}"
-
immediate="#{richTreeBean.attributes['immediate'].value}"
<rich:treeNode type="country"
expanded="#{richTreeBean.expanded[node]}"
- rendered="#{richTreeNodeBean.attributes[0]['rendered'].value}"
- iconLeaf="#{richTreeNodeBean.attributes[0]['iconLeaf'].value}"
-
iconExpanded="#{richTreeNodeBean.attributes[0]['iconExpanded'].value}"
-
iconCollapsed="#{richTreeNodeBean.attributes[0]['iconCollapsed'].value}"
+
+ dir="#{richTreeNodeBean.attributes[0]['dir'].value}"
handleClass="#{richTreeNodeBean.attributes[0]['handleClass'].value}"
iconClass="#{richTreeNodeBean.attributes[0]['iconClass'].value}"
+
iconCollapsed="#{richTreeNodeBean.attributes[0]['iconCollapsed'].value}"
+
iconExpanded="#{richTreeNodeBean.attributes[0]['iconExpanded'].value}"
+ iconLeaf="#{richTreeNodeBean.attributes[0]['iconLeaf'].value}"
+ immediate="#{richTreeNodeBean.attributes[0]['immediate'].value}"
labelClass="#{richTreeNodeBean.attributes[0]['labelClass'].value}"
+ lang="#{richTreeNodeBean.attributes[0]['lang'].value}"
+ onbeforetoggle="#{richTreeNodeBean.attributes[0]['onbeforetoggle'].value}"
+ onclick="#{richTreeNodeBean.attributes[0]['onclick'].value}"
+ ondblclick="#{richTreeNodeBean.attributes[0]['ondblclick'].value}"
+ onkeydown="#{richTreeNodeBean.attributes[0]['onkeydown'].value}"
+ onkeypress="#{richTreeNodeBean.attributes[0]['onkeypress'].value}"
+ onkeyup="#{richTreeNodeBean.attributes[0]['onkeyup'].value}"
+ onmousedown="#{richTreeNodeBean.attributes[0]['onmousedown'].value}"
+ onmousemove="#{richTreeNodeBean.attributes[0]['onmousemove'].value}"
+ onmouseout="#{richTreeNodeBean.attributes[0]['onmouseout'].value}"
+ onmouseover="#{richTreeNodeBean.attributes[0]['onmouseover'].value}"
+ onomouseup="#{richTreeNodeBean.attributes[0]['onomouseup'].value}"
+ ontoggle="#{richTreeNodeBean.attributes[0]['ontoggle'].value}"
+ rendered="#{richTreeNodeBean.attributes[0]['rendered'].value}"
+ style="#{richTreeNodeBean.attributes[0]['style'].value}"
styleClass="#{richTreeNodeBean.attributes[0]['styleClass'].value}"
+
title="#{richTreeNodeBean.attributes[0]['title'].value}"
<f:facet name="handleLoading">
<h:graphicImage value="/resources/images/loading.gif"
rendered="#{richTreeBean.testLoadingFacet}" />
@@ -114,16 +133,33 @@
</rich:treeNode>
<rich:treeNode type="company"
- icon="/images/tree/disc.gif"
expanded="#{richTreeBean.expanded[node]}"
- rendered="#{richTreeNodeBean.attributes[1]['rendered'].value}"
-
iconLeaf="#{richTreeNodeBean.attributes[1]['iconLeaf'].value}"
-
iconExpanded="#{richTreeNodeBean.attributes[1]['iconExpanded'].value}"
-
iconCollapsed="#{richTreeNodeBean.attributes[1]['iconCollapsed'].value}"
+
+ dir="#{richTreeNodeBean.attributes[1]['dir'].value}"
handleClass="#{richTreeNodeBean.attributes[1]['handleClass'].value}"
iconClass="#{richTreeNodeBean.attributes[1]['iconClass'].value}"
+
iconCollapsed="#{richTreeNodeBean.attributes[1]['iconCollapsed'].value}"
+
iconExpanded="#{richTreeNodeBean.attributes[1]['iconExpanded'].value}"
+ iconLeaf="#{richTreeNodeBean.attributes[1]['iconLeaf'].value}"
+ immediate="#{richTreeNodeBean.attributes[1]['immediate'].value}"
labelClass="#{richTreeNodeBean.attributes[1]['labelClass'].value}"
+ lang="#{richTreeNodeBean.attributes[1]['lang'].value}"
+ onbeforetoggle="#{richTreeNodeBean.attributes[1]['onbeforetoggle'].value}"
+ onclick="#{richTreeNodeBean.attributes[1]['onclick'].value}"
+ ondblclick="#{richTreeNodeBean.attributes[1]['ondblclick'].value}"
+ onkeydown="#{richTreeNodeBean.attributes[1]['onkeydown'].value}"
+ onkeypress="#{richTreeNodeBean.attributes[1]['onkeypress'].value}"
+ onkeyup="#{richTreeNodeBean.attributes[1]['onkeyup'].value}"
+ onmousedown="#{richTreeNodeBean.attributes[1]['onmousedown'].value}"
+ onmousemove="#{richTreeNodeBean.attributes[1]['onmousemove'].value}"
+ onmouseout="#{richTreeNodeBean.attributes[1]['onmouseout'].value}"
+ onmouseover="#{richTreeNodeBean.attributes[1]['onmouseover'].value}"
+ onomouseup="#{richTreeNodeBean.attributes[1]['onomouseup'].value}"
+ ontoggle="#{richTreeNodeBean.attributes[1]['ontoggle'].value}"
+ rendered="#{richTreeNodeBean.attributes[1]['rendered'].value}"
+ style="#{richTreeNodeBean.attributes[1]['style'].value}"
styleClass="#{richTreeNodeBean.attributes[1]['styleClass'].value}"
+
title="#{richTreeNodeBean.attributes[1]['title'].value}"
<f:facet name="handleLoading">
<h:graphicImage value="/resources/images/loading.gif"
rendered="#{richTreeBean.testLoadingFacet}" />
@@ -133,16 +169,33 @@
</rich:treeNode>
<rich:treeNode type="cd"
- icon="/images/tree/song.gif"
expanded="#{richTreeBean.expanded[node]}"
- rendered="#{richTreeNodeBean.attributes[2]['rendered'].value}"
- iconLeaf="#{richTreeNodeBean.attributes[2]['iconLeaf'].value}"
-
iconExpanded="#{richTreeNodeBean.attributes[2]['iconExpanded'].value}"
-
iconCollapsed="#{richTreeNodeBean.attributes[2]['iconCollapsed'].value}"
+
+ dir="#{richTreeNodeBean.attributes[2]['dir'].value}"
handleClass="#{richTreeNodeBean.attributes[2]['handleClass'].value}"
iconClass="#{richTreeNodeBean.attributes[2]['iconClass'].value}"
+
iconCollapsed="#{richTreeNodeBean.attributes[2]['iconCollapsed'].value}"
+
iconExpanded="#{richTreeNodeBean.attributes[2]['iconExpanded'].value}"
+ iconLeaf="#{richTreeNodeBean.attributes[2]['iconLeaf'].value}"
+ immediate="#{richTreeNodeBean.attributes[2]['immediate'].value}"
labelClass="#{richTreeNodeBean.attributes[2]['labelClass'].value}"
+ lang="#{richTreeNodeBean.attributes[2]['lang'].value}"
+ onbeforetoggle="#{richTreeNodeBean.attributes[2]['onbeforetoggle'].value}"
+ onclick="#{richTreeNodeBean.attributes[2]['onclick'].value}"
+ ondblclick="#{richTreeNodeBean.attributes[2]['ondblclick'].value}"
+ onkeydown="#{richTreeNodeBean.attributes[2]['onkeydown'].value}"
+ onkeypress="#{richTreeNodeBean.attributes[2]['onkeypress'].value}"
+ onkeyup="#{richTreeNodeBean.attributes[2]['onkeyup'].value}"
+ onmousedown="#{richTreeNodeBean.attributes[2]['onmousedown'].value}"
+ onmousemove="#{richTreeNodeBean.attributes[2]['onmousemove'].value}"
+ onmouseout="#{richTreeNodeBean.attributes[2]['onmouseout'].value}"
+ onmouseover="#{richTreeNodeBean.attributes[2]['onmouseover'].value}"
+ onomouseup="#{richTreeNodeBean.attributes[2]['onomouseup'].value}"
+ ontoggle="#{richTreeNodeBean.attributes[2]['ontoggle'].value}"
+ rendered="#{richTreeNodeBean.attributes[2]['rendered'].value}"
+ style="#{richTreeNodeBean.attributes[2]['style'].value}"
styleClass="#{richTreeNodeBean.attributes[2]['styleClass'].value}"
+
title="#{richTreeNodeBean.attributes[2]['title'].value}"
#{node.artist} - #{node.title}
</rich:treeNode>
Modified:
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml
===================================================================
---
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2011-01-31
17:40:30 UTC (rev 21339)
+++
modules/tests/metamer/trunk/application/src/main/webapp/components/richTree/treeAdaptors.xhtml 2011-01-31
17:48:33 UTC (rev 21340)
@@ -46,9 +46,24 @@
<rich:tree id="richTree"
var="node"
-
- dir="#{richTreeBean.attributes['dir'].value}"
+ selection="#{richTreeBean.selection}"
+
selectionChangeListener="#{richTreeListenerBean.processSelectionChange}"
+ toggleListener="#{richTreeListenerBean.processToggle}"
+
+ data="#{richTreeBean.attributes['data'].value}"
+ dir="#{richTreeBean.attributes['dir'].value}"
+ execute="#{richTreeBean.attributes['execute'].value}"
+
handleClass="#{richTreeBean.attributes['handleClass'].value}"
+ iconClass="#{richTreeBean.attributes['iconClass'].value}"
+
iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}"
+
iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}"
+ iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}"
+ immediate="#{richTreeBean.attributes['immediate'].value}"
+ keepSaved="#{richTreeBean.attributes['keepSaved'].value}"
+
labelClass="#{richTreeBean.attributes['labelClass'].value}"
lang="#{richTreeBean.attributes['lang'].value}"
+
limitRender="#{richTreeBean.attributes['limitRender'].value}"
+ nodeClass="#{richTreeBean.attributes['nodeClass'].value}"
onbeforedomupdate="#{richTreeBean.attributes['onbeforedomupdate'].value}"
onbeforenodetoggle="#{richTreeBean.attributes['onbeforenodetoggle'].value}"
onbeforeselectionchange="#{richTreeBean.attributes['onbeforeselectionchange'].value}"
@@ -61,30 +76,20 @@
onkeyup="#{richTreeBean.attributes['onkeyup'].value}"
onmousedown="#{richTreeBean.attributes['onmousedown'].value}"
onmousemove="#{richTreeBean.attributes['onmousemove'].value}"
- onmouseup="#{richTreeBean.attributes['onmouseup'].value}"
onmouseout="#{richTreeBean.attributes['onmouseout'].value}"
onmouseover="#{richTreeBean.attributes['onmouseover'].value}"
+ onmouseup="#{richTreeBean.attributes['onmouseup'].value}"
onnodetoggle="#{richTreeBean.attributes['onnodetoggle'].value}"
onselectionchange="#{richTreeBean.attributes['onselectionchange'].value}"
+ render="#{richTreeBean.attributes['render'].value}"
rendered="#{richTreeBean.attributes['rendered'].value}"
- selection="#{richTreeBean.selection}"
selectionType="#{richTreeBean.attributes['selectionType'].value}"
+ status="#{richTreeBean.attributes['status'].value}"
style="#{richTreeBean.attributes['style'].value}"
styleClass="#{richTreeBean.attributes['styleClass'].value}"
title="#{richTreeBean.attributes['title'].value}"
+ toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}"
toggleType="#{richTreeBean.attributes['toggleType'].value}"
- iconLeaf="#{richTreeBean.attributes['iconLeaf'].value}"
-
iconExpanded="#{richTreeBean.attributes['iconExpanded'].value}"
-
iconCollapsed="#{richTreeBean.attributes['iconCollapsed'].value}"
-
handleClass="#{richTreeBean.attributes['handleClass'].value}"
- iconClass="#{richTreeBean.attributes['iconClass'].value}"
-
labelClass="#{richTreeBean.attributes['labelClass'].value}"
- nodeClass="#{richTreeBean.attributes['nodeClass'].value}"
-
selectionChangeListener="#{richTreeListenerBean.processSelectionChange}"
- toggleListener="#{richTreeListenerBean.processToggle}"
- render="#{richTreeBean.attributes['render'].value}"
- execute="#{richTreeBean.attributes['execute'].value}"
- toggleNodeEvent="#{richTreeBean.attributes['toggleNodeEvent'].value}"
<rich:treeModelRecursiveAdaptor