richfaces-svn-commits
February 2009
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 273 discussions
JBoss Rich Faces SVN: r12623 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2009-02-10 18:58:31 -0500 (Tue, 10 Feb 2009)
New Revision: 12623
Modified:
trunk/docs/userguide/en/src/main/docbook/included/calendar.xml
trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml
trunk/docs/userguide/en/src/main/docbook/included/commandButton.xml
trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml
trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml
trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml
trunk/docs/userguide/en/src/main/docbook/included/dataList.xml
trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
trunk/docs/userguide/en/src/main/docbook/included/dndParam.xml
trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml
trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
trunk/docs/userguide/en/src/main/docbook/included/effect.xml
trunk/docs/userguide/en/src/main/docbook/included/form.xml
trunk/docs/userguide/en/src/main/docbook/included/include.xml
trunk/docs/userguide/en/src/main/docbook/included/keepAlive.xml
trunk/docs/userguide/en/src/main/docbook/included/loadScript.xml
trunk/docs/userguide/en/src/main/docbook/included/log.xml
trunk/docs/userguide/en/src/main/docbook/included/mediaOutput.xml
trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml
trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml
trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml
trunk/docs/userguide/en/src/main/docbook/included/message.xml
trunk/docs/userguide/en/src/main/docbook/included/messages.xml
trunk/docs/userguide/en/src/main/docbook/included/paint2D.xml
trunk/docs/userguide/en/src/main/docbook/included/panel.xml
trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml
trunk/docs/userguide/en/src/main/docbook/included/panelMenu.xml
trunk/docs/userguide/en/src/main/docbook/included/queue.xml
trunk/docs/userguide/en/src/main/docbook/included/repeat.xml
trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
trunk/docs/userguide/en/src/main/docbook/included/separator.xml
trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml
trunk/docs/userguide/en/src/main/docbook/included/spacer.xml
trunk/docs/userguide/en/src/main/docbook/included/support.xml
trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml
trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml
trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml
trunk/docs/userguide/en/src/main/docbook/included/toolTip.xml
trunk/docs/userguide/en/src/main/docbook/included/tree.xml
trunk/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.xml
Log:
https://jira.jboss.org/jira/browse/RF-6022
Links "here" to demos from guides sections replaced with more meaningful phrases
Modified: trunk/docs/userguide/en/src/main/docbook/included/calendar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/calendar.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -2065,7 +2065,7 @@
<title>Relevant Resources Links</title>
<para><ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/calendar.jsf?c=calendar"
- >Here</ulink> you can see the example of <emphasis
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis
role="bold">
<property><rich:calendar></property>
</emphasis> usage and sources for the given example. </para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/columnGroup.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -283,7 +283,7 @@
<section>
<title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTable.jsf?c=colum..."
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:columnGroup></property></emphasis> usage and sources for the given example. </para>
</section>
</section>
\ No newline at end of file
Modified: trunk/docs/userguide/en/src/main/docbook/included/commandButton.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/commandButton.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/commandButton.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -108,7 +108,7 @@
<section>
<title>Relevant resources links</title>
<para>
- <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/commandButton.jsf?c=c...">Here</ulink> you can see the example of <emphasis role="bold"
+ <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/commandButton.jsf?c=c...">On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><a4j:commandButton></property></emphasis> usage and sources for the given example.
</para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataDefinitionList.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -284,7 +284,7 @@
<section>
<title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataLists.jsf?c=dataD..."
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:dataDefinitionList></property></emphasis> usage and sources for the given example. </para>
</section>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataFilterSlider.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -144,7 +144,7 @@
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataFilterSlider.jsf?..."
- >Here</ulink> you can see the example of <emphasis role="bold">
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold">
<property><rich:dataFilterSlider></property>
</emphasis> usage and sources for the given example. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataGrid.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -280,7 +280,7 @@
<section>
<title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataGrid.jsf?c=dataGrid"
- >Here</ulink> you can see the example of <emphasis role="bold">
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold">
<property><rich:dataGrid></property>
</emphasis> usage and sources for the given example. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataList.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataList.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataList.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -296,7 +296,7 @@
<section>
<title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataLists.jsf?c=dataList"
- >Here</ulink> you can see the example of <emphasis role="bold">
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold">
<property><rich:dataList></property>
</emphasis> usage and sources for the given example. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/dataTable.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -546,7 +546,7 @@
<title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTable.jsf?c=dataT..."
- >Here</ulink> you can see the example of <emphasis role="bold">
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold">
<property><rich:dataTable></property>
</emphasis> usage and sources for the given example. </para>
<para>The article about <emphasis role="bold">
Modified: trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/datascroller.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -703,7 +703,7 @@
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/dataTableScroller.jsf..."
- >Here</ulink> you can see the example of <emphasis
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis
role="bold">
<property><rich:datascroller></property>
</emphasis> usage and sources for the given example. </para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dndParam.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dndParam.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/dndParam.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -182,7 +182,7 @@
<section>
<title>Relevan Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dnd..."
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:dndParam></property></emphasis> usage and sources for the given example. </para>
</section>
</section>
\ No newline at end of file
Modified: trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/dragIndicator.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -276,7 +276,7 @@
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/dragSupport.jsf?c=dra..."
- >Here</ulink> you can see the example of <emphasis role="bold">
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold">
<property><rich:dragIndicator></property>
</emphasis> usage and sources for the given example. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/dropDownMenu.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -706,7 +706,7 @@
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=dr..."
- >Here</ulink> you can see the example of <emphasis role="bold">
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold">
<property><rich:dropDownMenu></property>
</emphasis> usage and sources for the given example. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/effect.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/effect.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/effect.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -240,7 +240,7 @@
</para>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/effect.jsf?c=effect"
- >Here</ulink> you can see the example of <emphasis role="bold">
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold">
<property><rich:effect></property>
</emphasis> usage. </para>
<para>How to save <emphasis role="bold">
Modified: trunk/docs/userguide/en/src/main/docbook/included/form.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/form.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/form.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -132,7 +132,7 @@
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/form.jsf?c=form"
- >Here</ulink> you can see the example of <emphasis
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis
role="bold">
<property><a4j:form></property>
</emphasis> usage and sources for the given example. </para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/include.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/include.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/include.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -101,7 +101,7 @@
<section>
<title>Relevant resources links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/include.jsf?c=include"
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><a4j:include></property></emphasis> usage and sources for the given example. </para>
<para>
Some additional information can be found on the <ulink url="http://jboss.com/index.html?module=bb&op=viewtopic&t=104158">Ajax4Jsf Users Forum</ulink>.
Modified: trunk/docs/userguide/en/src/main/docbook/included/keepAlive.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/keepAlive.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/keepAlive.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -111,7 +111,7 @@
<title>Relevant resources links</title>
<para><ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/keepAlive.jsf?c=keepA..."
- >Here</ulink> you can see the example of <emphasis
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis
role="bold">
<property><a4j:keepAlive></property>
</emphasis> usage and sources for the given example. </para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/loadScript.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/loadScript.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/loadScript.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -78,7 +78,7 @@
<section>
<title>Relevant resources links</title>
<para>
- <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/script.jsf?c=loadScript">Here</ulink> you can see the example of <emphasis role="bold"
+ <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/script.jsf?c=loadScript">On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><a4j:loadScript></property></emphasis> usage and sources for the given example.
</para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/log.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/log.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/log.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -79,7 +79,7 @@
<section>
<title>Relevant resources links</title>
<para>
- <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/log.jsf?c=log">Here</ulink> you can see the example of <emphasis role="bold"
+ <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/log.jsf?c=log">On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><a4j:log></property></emphasis> usage and sources for the given example.
</para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/mediaOutput.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/mediaOutput.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/mediaOutput.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -106,7 +106,7 @@
<section>
<title>Relevant resources links</title>
<para>
- <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/mediaOutput.jsf?c=med...">Here</ulink> you can see the example of <emphasis role="bold"
+ <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/mediaOutput.jsf?c=med...">On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><a4j:mediaOutput ></property></emphasis> usage and sources for the given example.
</para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuGroup.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -416,7 +416,7 @@
<section>
<title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=me..."
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:menuGroup></property></emphasis> usage and sources for the given example. </para>
</section>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuItem.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -499,7 +499,7 @@
<title>Relevant Resources Links</title>
<para><ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=me..."
- >Here</ulink> you can see the example of <emphasis
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis
role="bold">
<property><rich:menuItem></property>
</emphasis> usage and sources for the given example. </para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/menuSeparator.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -179,7 +179,7 @@
<section>
<title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/dropDownMenu.jsf?c=me..."
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:menuSeparator></property></emphasis> usage and sources for the given example. </para>
</section>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/message.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/message.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/message.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -291,7 +291,7 @@
<section>
<title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/message.jsf?c=message"
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:message></property></emphasis> usage and sources for the given example. </para>
</section>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/messages.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/messages.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/messages.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -292,7 +292,7 @@
<title>Relevant Resources Links</title>
<para><ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/messsages.jsf?c=messages"
- >Here</ulink> you can see the example of <emphasis
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis
role="bold">
<property><rich:messages></property>
</emphasis> usage and sources for the given example. </para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/paint2D.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/paint2D.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/paint2D.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -158,7 +158,7 @@
<title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/paint2D.jsf?c=paint2d"
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:paint2D></property></emphasis> usage and sources for the given example. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/panel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/panel.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -393,7 +393,7 @@
<title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/panel.jsf?c=panel"
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:panel></property></emphasis> usage and sources for the given example. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/panelBar.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -281,7 +281,7 @@
<title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/panelBar.jsf?c=panelBar"
- >Here</ulink> you can see the example of <emphasis role="bold">
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold">
<property><rich:panelBar></property>
</emphasis> usage and sources for the given example. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/panelMenu.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/panelMenu.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/panelMenu.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -378,7 +378,7 @@
<section>
<title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/panelMenu.jsf?c=panel..."
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:panelMenu></property></emphasis> usage and sources for the given example. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/queue.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/queue.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/queue.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -229,7 +229,7 @@
<title>Relevant resources links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/queue.jsf?c=queue"
- >Here</ulink> you can see the example of <emphasis role="bold">
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold">
<property><a4j:queue></property>
</emphasis> usage and sources for the given example. </para>
<para>General queue principals are documented in the "<link linkend="QueuePrinciples">Queue Principles</link>" section.</para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/repeat.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/repeat.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/repeat.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -131,7 +131,7 @@
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/repeat.jsf?c=repeat"
- >Here</ulink> you can see the example of <emphasis
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis
role="bold">
<property><a4j:repeat></property>
</emphasis> usage and sources for the given example. </para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -780,7 +780,7 @@
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/scrollableDataTable.j..."
- >Here</ulink> you can see the example of <emphasis
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis
role="bold">
<property><rich:scrollableDataTable></property>
</emphasis> usage. </para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/separator.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/separator.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/separator.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -205,7 +205,7 @@
<title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/separator.jsf?c=separ..."
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:separator></property></emphasis> usage and sources for the given example. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/simpleTogglePanel.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -427,7 +427,7 @@
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/simpleTogglePanel.jsf..."
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:simpleTogglePanel></property></emphasis> usage and sources for the given example.
</para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/spacer.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/spacer.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/spacer.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -104,7 +104,7 @@
<title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/spacer.jsf?c=spacer"
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:spacer></property></emphasis> usage and sources for the given example. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/support.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/support.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/support.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -262,7 +262,7 @@
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/support.jsf?c=support"
- >Here</ulink> you can see the example of <emphasis
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis
role="bold">
<property><a4j:support></property>
</emphasis> usage and sources for the given example. </para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/tabPanel.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -472,7 +472,7 @@
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/tabPanel.jsf?c=tabPanel"
- >Here</ulink> you can see the example of <emphasis
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis
role="bold">
<property><rich:tabPanel></property>
</emphasis> usage and sources for the given example. </para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/togglePanel.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -292,7 +292,7 @@
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/togglePanel.jsf?c=tog..."
- >Here</ulink> you can see the example of <emphasis
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis
role="bold">
<property><rich:togglePanel></property>
</emphasis> usage and sources for the given example. </para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/toolBar.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -347,7 +347,7 @@
<title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/toolBar.jsf?c=toolBar"
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:toolBar></property></emphasis> usage and sources for the given example. </para>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/toolTip.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/toolTip.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/toolTip.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -451,7 +451,7 @@
<section>
<title>Relevant Resources Links</title>
<para><ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/toolTip.jsf?c=toolTip"
- >Here</ulink> you can see the example of <emphasis role="bold"
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"
><property><rich:toolTip></property></emphasis> usage and sources for the given example. </para>
</section>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/tree.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/tree.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -1088,7 +1088,7 @@
<para>
<ulink
url="http://livedemo.exadel.com/richfaces-demo/richfaces/tree.jsf?c=tree"
- >Here</ulink> you can see the example of <emphasis
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis
role="bold">
<property><rich:tree></property>
</emphasis> usage and sources for the given example. </para>
Modified: trunk/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.xml 2009-02-10 23:03:06 UTC (rev 12622)
+++ trunk/docs/userguide/en/src/main/docbook/included/treeNodesAdaptor.xml 2009-02-10 23:58:31 UTC (rev 12623)
@@ -126,7 +126,7 @@
<title>Relevant Resources Links</title>
<para>
<ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/treeNodesAdaptor.jsf?..."
- >Here</ulink> you can see the example of <emphasis role="bold"><property><rich:treeNodesAdaptor ></property></emphasis>
+ >On the component LiveDemo page</ulink> you can see the example of <emphasis role="bold"><property><rich:treeNodesAdaptor ></property></emphasis>
usage and sources for the given example. </para>
</section>
</section>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12622 - trunk/framework/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-02-10 18:03:06 -0500 (Tue, 10 Feb 2009)
New Revision: 12622
Added:
trunk/framework/api/src/main/java/org/richfaces/model/CacheableSwingTreeNodeImpl.java
trunk/framework/api/src/main/java/org/richfaces/model/CacheableTreeNodeImpl.java
Modified:
trunk/framework/api/src/main/java/org/richfaces/model/ClassicCacheableTreeDataModel.java
trunk/framework/api/src/main/java/org/richfaces/model/SwingCacheableTreeDataModel.java
Log:
https://jira.jboss.org/jira/browse/RF-4809
Added: trunk/framework/api/src/main/java/org/richfaces/model/CacheableSwingTreeNodeImpl.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/CacheableSwingTreeNodeImpl.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/model/CacheableSwingTreeNodeImpl.java 2009-02-10 23:03:06 UTC (rev 12622)
@@ -0,0 +1,43 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.model;
+
+/**
+ * This class provides the solution for "false leaves" issue of cacheable trees
+ *
+ * @author Nick Belaevski
+ * @since 3.3.1
+ */
+
+public class CacheableSwingTreeNodeImpl extends SwingTreeNodeImpl {
+
+ private boolean notLeaf = false;
+
+ @Override
+ public boolean isLeaf() {
+ return !this.notLeaf && super.isLeaf();
+ }
+
+ public void setNotLeaf(boolean notLeaf) {
+ this.notLeaf = notLeaf;
+ }
+}
Added: trunk/framework/api/src/main/java/org/richfaces/model/CacheableTreeNodeImpl.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/CacheableTreeNodeImpl.java (rev 0)
+++ trunk/framework/api/src/main/java/org/richfaces/model/CacheableTreeNodeImpl.java 2009-02-10 23:03:06 UTC (rev 12622)
@@ -0,0 +1,48 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.model;
+
+/**
+ * This class provides the solution for "false leaves" issue of cacheable trees
+ *
+ * @author Nick Belaevski
+ * @since 3.3.1
+ */
+
+public class CacheableTreeNodeImpl<T> extends TreeNodeImpl<T> {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = -5918388225735277820L;
+
+ private boolean notLeaf = false;
+
+ @Override
+ public boolean isLeaf() {
+ return !this.notLeaf && super.isLeaf();
+ }
+
+ public void setNotLeaf(boolean notLeaf) {
+ this.notLeaf = notLeaf;
+ }
+}
Modified: trunk/framework/api/src/main/java/org/richfaces/model/ClassicCacheableTreeDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/ClassicCacheableTreeDataModel.java 2009-02-10 19:33:19 UTC (rev 12621)
+++ trunk/framework/api/src/main/java/org/richfaces/model/ClassicCacheableTreeDataModel.java 2009-02-10 23:03:06 UTC (rev 12622)
@@ -37,7 +37,7 @@
public TreeNode handleMissingNode(TreeNode parentNode,
Object pathSegment) {
- TreeNode childNode = new TreeNodeImpl();
+ TreeNodeImpl childNode = new CacheableTreeNodeImpl();
if (parentNode != null) {
parentNode.addChild(pathSegment, childNode);
@@ -55,7 +55,9 @@
@Override
protected void setDefaultNodeData(TreeNode node, Object data) {
if (node != null) {
- ((TreeNodeImpl) node).setData(data);
+ CacheableTreeNodeImpl cacheableTreeNode = (CacheableTreeNodeImpl) node;
+ cacheableTreeNode.setData(data);
+ cacheableTreeNode.setNotLeaf(!isLeaf());
}
}
Modified: trunk/framework/api/src/main/java/org/richfaces/model/SwingCacheableTreeDataModel.java
===================================================================
--- trunk/framework/api/src/main/java/org/richfaces/model/SwingCacheableTreeDataModel.java 2009-02-10 19:33:19 UTC (rev 12621)
+++ trunk/framework/api/src/main/java/org/richfaces/model/SwingCacheableTreeDataModel.java 2009-02-10 23:03:06 UTC (rev 12622)
@@ -39,7 +39,7 @@
public TreeNode handleMissingNode(TreeNode parent,
Object pathSegment) {
- SwingTreeNodeImpl childNode = new SwingTreeNodeImpl();
+ SwingTreeNodeImpl childNode = new CacheableSwingTreeNodeImpl();
if (parent != null) {
SwingTreeNodeImpl parentNode = (SwingTreeNodeImpl) parent;
@@ -69,7 +69,9 @@
@Override
protected void setDefaultNodeData(TreeNode node, Object data) {
- ((SwingTreeNodeImpl) node).setData(data);
+ CacheableSwingTreeNodeImpl cacheableTreeNode = (CacheableSwingTreeNodeImpl) node;
+ cacheableTreeNode.setData(data);
+ cacheableTreeNode.setNotLeaf(!isLeaf());
}
}
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12621 - in trunk/ui/dataTable/src/main: java/org/richfaces/renderkit and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-02-10 14:33:19 -0500 (Tue, 10 Feb 2009)
New Revision: 12621
Removed:
trunk/ui/dataTable/src/main/resources/org/richfaces/renderkit/html/scripts/
Modified:
trunk/ui/dataTable/src/main/config/resources/resources-config.xml
trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
Log:
https://jira.jboss.org/jira/browse/RF-6021
Modified: trunk/ui/dataTable/src/main/config/resources/resources-config.xml
===================================================================
--- trunk/ui/dataTable/src/main/config/resources/resources-config.xml 2009-02-10 18:07:29 UTC (rev 12620)
+++ trunk/ui/dataTable/src/main/config/resources/resources-config.xml 2009-02-10 19:33:19 UTC (rev 12621)
@@ -3,4 +3,13 @@
<resource class="org.richfaces.renderkit.html.iconimages.DataTableIconSortNone">
<name>org.richfaces.renderkit.html.iconimages.DataTableIconSortNone</name>
</resource>
+
+ <resource class="org.ajax4jsf.javascript.AjaxScript">
+ <name>org.ajax4jsf.javascript.AjaxScript</name>
+ </resource>
+
+ <resource class="org.ajax4jsf.javascript.PrototypeScript">
+ <name>org.ajax4jsf.javascript.PrototypeScript</name>
+ </resource>
+
</resource-config>
Modified: trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-02-10 18:07:29 UTC (rev 12620)
+++ trunk/ui/dataTable/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2009-02-10 19:33:19 UTC (rev 12621)
@@ -32,15 +32,19 @@
import javax.faces.component.UIColumn;
import javax.faces.component.UIComponent;
import javax.faces.component.UIInput;
+import javax.faces.context.ExternalContext;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import org.ajax4jsf.component.UIDataAdaptor;
import org.ajax4jsf.context.AjaxContext;
+import org.ajax4jsf.javascript.AjaxScript;
import org.ajax4jsf.javascript.JSFunction;
+import org.ajax4jsf.javascript.PrototypeScript;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.ajax4jsf.renderkit.RendererUtils;
import org.ajax4jsf.renderkit.RendererUtils.HTML;
+import org.ajax4jsf.resource.InternetResource;
import org.richfaces.component.Column;
import org.richfaces.component.Row;
import org.richfaces.component.UIDataTable;
@@ -60,7 +64,14 @@
private static final String SORT_FILTER_PARAMETER = "fsp";
private static final String FILTER_INPUT_FACET_NAME = "filterValueInput";
+
+ private static final String REQUIRES_SCRIPTS_PARAMETER = AbstractTableRenderer.class.getName() + ":REQUIRES_SCRIPTS";
+ private final InternetResource[] REQUIRED_SCRIPTS = new InternetResource[] {
+ getResource(PrototypeScript.class.getName()),
+ getResource(AjaxScript.class.getName())
+ };
+
/**
* Encode data table body
* @param context
@@ -502,23 +513,6 @@
return count;
}
- public void encodeScriptIfNecessary(FacesContext context, UIDataTable component) throws IOException {
- boolean shouldRender = false;
- Iterator<UIComponent> columns = component.columns();
- while(columns.hasNext() && !shouldRender) {
- UIComponent next = columns.next();
- shouldRender = (next instanceof Column) && ((Column)next).isSortable();
- }
- if (shouldRender) {
- JSFunction function = new JSFunction("new RichFaces.DataTable");
- function.addParameter(component.getBaseClientId(context));
- ScriptOptions scriptOptions = new ScriptOptions(component);
- scriptOptions.addOption("sortMode", new JSFunction("new RichFaces.SortMode.Single"));
- function.addParameter(scriptOptions);
- getUtils().writeScript(context, component, function.toScript());
- }
- }
-
@Override
protected void doDecode(FacesContext context, UIComponent component) {
Map<String, String> map = context.getExternalContext().getRequestParameterMap();
@@ -614,6 +608,10 @@
filterValueInput.setId(column.getId() + SORT_FILTER_PARAMETER);
filterValueInput.setImmediate(true);
column.getFacets().put(FILTER_INPUT_FACET_NAME, filterValueInput);
+
+ //Event.stop requires prototype.js
+ setRequiresScripts(context);
+
filterValueInput.getAttributes().put(HTML.onclick_ATTRIBUTE, "Event.stop(event);");
filterValueInput.getAttributes().put(HTML.STYLE_CLASS_ATTR, "rich-filter-input");
}
@@ -633,6 +631,10 @@
protected String buildAjaxFunction(FacesContext context, UIComponent column, boolean sortable) {
UIComponent table = column.getParent();
String id = table.getClientId(context);
+
+ //Ajax submission requires scripts
+ setRequiresScripts(context);
+
JSFunction ajaxFunction = AjaxRendererUtils.buildAjaxFunction(table, context);
Map<String, Object> eventOptions = AjaxRendererUtils.buildEventOptions(context, table);
@@ -653,6 +655,36 @@
return buffer.toString();
}
+ protected void setRequiresScripts(FacesContext context) {
+ ExternalContext externalContext = context.getExternalContext();
+ Map<String, Object> requestMap = externalContext.getRequestMap();
+ if (requestMap.get(REQUIRES_SCRIPTS_PARAMETER) == null) {
+ requestMap.put(REQUIRES_SCRIPTS_PARAMETER, Boolean.TRUE);
+ }
+ }
+
+ protected boolean isRequiresScripts(FacesContext context) {
+ if (context == null) {
+
+ return false;
+ } else {
+ ExternalContext externalContext = context.getExternalContext();
+ Map<String, Object> requestMap = externalContext.getRequestMap();
+
+ return Boolean.TRUE.equals(requestMap.get(REQUIRES_SCRIPTS_PARAMETER));
+ }
+ }
+
+ @Override
+ protected InternetResource[] getScripts() {
+ InternetResource[] resources = null;
+ if (isRequiresScripts(FacesContext.getCurrentInstance())) {
+ resources = REQUIRED_SCRIPTS;
+ }
+
+ return resources;
+ }
+
protected class SimpleHeaderEncodeStrategy implements HeaderEncodeStrategy {
public void encodeBegin(FacesContext context, ResponseWriter writer,
Modified: trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx
===================================================================
--- trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2009-02-10 18:07:29 UTC (rev 12620)
+++ trunk/ui/dataTable/src/main/templates/org/richfaces/htmlDataTable.jspx 2009-02-10 19:33:19 UTC (rev 12621)
@@ -13,11 +13,6 @@
component="org.richfaces.component.UIDataTable"
>
<h:styles>css/table.xcss</h:styles>
- <h:scripts>
- new org.ajax4jsf.javascript.AjaxScript(),
- new org.ajax4jsf.javascript.PrototypeScript(),
- /org/richfaces/renderkit/html/scripts/data-table.js
- </h:scripts>
<f:clientid var="clientId"/>
<table id="#{clientId}"
class="dr-table rich-table #{component.attributes['styleClass']}" style="#{component.attributes['style']}" >
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12620 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/WEB-INF and 4 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-02-10 13:07:29 -0500 (Tue, 10 Feb 2009)
New Revision: 12620
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/autotest/autoTestNavigationPage.xhtml
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandLink/testListenerAndNavigation.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxCommandLinkTest.java
Log:
RF-6043
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java 2009-02-10 16:43:44 UTC (rev 12619)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/autotest/bean/AutoTestBean.java 2009-02-10 18:07:29 UTC (rev 12620)
@@ -53,6 +53,8 @@
public static final String PROCESS_INPUT_CHANGE_LISTENER = "ProcessInputChangeListener";
public static final String ACTION_LISTENER_STATUS = "ActionListener";
+
+ public static final String ACTION_STATUS = "Action1";
public static final String NESTED_ACTION_LISTENER_STATUS = "NestedListener";
@@ -75,6 +77,8 @@
public static final String REQUIRED_MESSAGE = "Required message";
public static final String AUTOTEST_BEAN_NAME = "autoTestBean";
+
+ public static final String NAVIGATION_ACTION = "autoTestNavigation";
// private String input = INPUT_TEXT;
@@ -154,6 +158,11 @@
setStatus(getStatus() + ACTION_LISTENER_STATUS);
}
+ public String action () {
+ setStatus(getStatus() + ACTION_STATUS);
+ return NAVIGATION_ACTION;
+ }
+
public void processInputChangeListener(ValueChangeEvent event) {
if (processSet) {
setStatus(getStatus() + PROCESS_INPUT_CHANGE_LISTENER);
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml 2009-02-10 16:43:44 UTC (rev 12619)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/WEB-INF/faces-config.xml 2009-02-10 18:07:29 UTC (rev 12620)
@@ -349,4 +349,11 @@
<to-view-id>/pages/ajaxSupport/successNavigation.xhtml</to-view-id>
</navigation-case>
</navigation-rule>
+ <navigation-rule>
+ <from-view-id>/*</from-view-id>
+ <navigation-case>
+ <from-outcome>autoTestNavigation</from-outcome>
+ <to-view-id>/layout/autotest/autoTestNavigationPage.xhtml</to-view-id>
+ </navigation-case>
+ </navigation-rule>
</faces-config>
\ No newline at end of file
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/autotest/autoTestNavigationPage.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/autotest/autoTestNavigationPage.xhtml (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/autotest/autoTestNavigationPage.xhtml 2009-02-10 18:07:29 UTC (rev 12620)
@@ -0,0 +1,15 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+ <ui:composition template="#{templateBean.autoTestTemplate}">
+ <ui:define name="component">
+ <p id="_auto_test_navigation">Navigation successfully</p>
+ <script>
+ window.done=true;
+ </script>
+ </ui:define>
+ </ui:composition>
+</html>
\ No newline at end of file
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandLink/testListenerAndNavigation.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandLink/testListenerAndNavigation.xhtml (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandLink/testListenerAndNavigation.xhtml 2009-02-10 18:07:29 UTC (rev 12620)
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<ui:composition template="#{templateBean.autoTestTemplate}">
+ <ui:define name="component">
+ <a4j:commandLink id="componentId"
+ action="#{autoTestBean.action}"
+ actionListener="#{autoTestBean.actionListener}"
+ immediate="#{autoTestBean.immediate}"
+ ajaxSingle="#{autoTestBean.ajaxSingle}"
+ value="Link"
+ >
+ <f:actionListener type="org.ajax4jsf.autotest.bean.AutoTestListener" />
+ </a4j:commandLink>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-02-10 16:43:44 UTC (rev 12619)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-02-10 18:07:29 UTC (rev 12620)
@@ -72,7 +72,16 @@
public AutoTester(SeleniumTestBase base) {
this.base = base;
}
+
+ private void navigate() {
+ base.navigate();
+ base.waiteForCondition("document.getElementById('_auto_test_navigation') != null", 10000);
+ if (!"Navigation successfully".equals(base.getTextById("_auto_test_navigation"))) {
+ Assert.fail("Navigation has not been occurred");
+ }
+ }
+
public void renderPage(Template template, String resetMethodName) {
base.renderAutoTestPage(template, resetMethodName);
}
@@ -124,7 +133,16 @@
checkActionListener(true);
checkUpdateModel(true);
}
+
+ public void testActionAndNavigation() {
+ reset();
+ clickLoad();
+ navigate();
+
+ checkAction(true);
+ }
+
public void testExtrenalValidationFailure() {
reset();
clickLoad();
@@ -583,6 +601,15 @@
}
}
+ public void checkAction(boolean passed) {
+ String status = getStatus();
+ if (passed && status != null && status.indexOf(AutoTestBean.ACTION_STATUS) == -1) {
+ Assert.fail("Action has been skipped");
+ } else if (!passed && status != null && status.indexOf(AutoTestBean.ACTION_STATUS) != -1) {
+ Assert.fail(status);
+ }
+ }
+
public void checkProcessInputChangeListener(boolean passed) {
String status = getStatus();
if (passed && status != null && status.indexOf(AutoTestBean.PROCESS_INPUT_CHANGE_LISTENER) == -1) {
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-02-10 16:43:44 UTC (rev 12619)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-02-10 18:07:29 UTC (rev 12620)
@@ -1234,7 +1234,14 @@
*/
public void sendAjax() {
}
-
+
+ /**
+ * Control action that should force ajax request that navigate to other page.
+ * This method should NOT wait for ajax completion
+ * This method should be overridden for auto test
+ */
+ public void navigate() {
+ }
/**
* This call back has to move auto test component into invalid state.
* Used for auto testing only.
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxCommandLinkTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxCommandLinkTest.java 2009-02-10 16:43:44 UTC (rev 12619)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AjaxCommandLinkTest.java 2009-02-10 18:07:29 UTC (rev 12620)
@@ -34,6 +34,8 @@
public class AjaxCommandLinkTest extends SeleniumTestBase {
+ static final String TEST_NAVIGATION_URL = "/pages/ajaxCommandLink/testListenerAndNavigation.xhtml";
+
private static Map<String, String> parameter = new HashMap<String, String>();
private static Map<String, String> styleAttributes = new HashMap<String, String>();
static {
@@ -77,6 +79,17 @@
}
@Test
+ public void testNavigation(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(TEST_NAVIGATION_URL, template, null);
+
+ tester.testActionAndNavigation();
+ tester.checkActionListener(true);
+ tester.checkNestedActionListener(true);
+
+ }
+
+ @Test
public void testHTMLAttributes(Template template) {
AutoTester tester = getAutoTester(this);
tester.renderPage(template, null);
@@ -231,5 +244,10 @@
public void sendAjax() {
clickAjaxCommandAndWait(getAutoTester(this).getClientId(AutoTester.COMPONENT_ID));
}
+
+ @Override
+ public void navigate() {
+ clickById(getAutoTester(this).getClientId(AutoTester.COMPONENT_ID));
+ }
}
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12619 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: smukhina
Date: 2009-02-10 11:43:44 -0500 (Tue, 10 Feb 2009)
New Revision: 12619
Modified:
trunk/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml
trunk/docs/userguide/en/src/main/docbook/included/draggable.xml
trunk/docs/userguide/en/src/main/docbook/included/extendedDataTable.xml
trunk/docs/userguide/en/src/main/docbook/included/jQuery.xml
trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml
Log:
https://jira.jboss.org/jira/browse/RF-6022 links to livedemo sections are added to guide corresponding chapters
Modified: trunk/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml 2009-02-10 16:08:29 UTC (rev 12618)
+++ trunk/docs/userguide/en/src/main/docbook/included/changeExpandListener.xml 2009-02-10 16:43:44 UTC (rev 12619)
@@ -116,5 +116,6 @@
</emphasis> has no skin parameters and custom <property>style classes</property>, as the
component isn't visual.</para>
</section>
-
+
+
</chapter>
\ No newline at end of file
Modified: trunk/docs/userguide/en/src/main/docbook/included/draggable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/draggable.xml 2009-02-10 16:08:29 UTC (rev 12618)
+++ trunk/docs/userguide/en/src/main/docbook/included/draggable.xml 2009-02-10 16:43:44 UTC (rev 12619)
@@ -118,4 +118,6 @@
redefine rich-draggable class in your own CSS files that is added to all <property>draggable</property> components
style on default.</para>
</section>
+
+
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/extendedDataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/extendedDataTable.xml 2009-02-10 16:08:29 UTC (rev 12618)
+++ trunk/docs/userguide/en/src/main/docbook/included/extendedDataTable.xml 2009-02-10 16:43:44 UTC (rev 12619)
@@ -618,4 +618,11 @@
</para>
</section>
+
+<section>
+ <title>Relevant resources links</title>
+ <para>
+ Some additional information about usage of component can be found
+ <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/extendedDataTable.jsf...">on its LiveDemo page</ulink>.</para>
+ </section>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/jQuery.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/jQuery.xml 2009-02-10 16:08:29 UTC (rev 12618)
+++ trunk/docs/userguide/en/src/main/docbook/included/jQuery.xml 2009-02-10 16:43:44 UTC (rev 12619)
@@ -350,6 +350,11 @@
url="http://jquery.com/">here</ulink>.</para>
<para>How to use jQuery with other libraries see <ulink
url="http://docs.jquery.com/Using_jQuery_with_Other_Libraries">here</ulink>.</para>
-
+
+ <para>
+ Some additional information about usage of component can be found
+ <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/jQuery.jsf?c=jQuery">on its LiveDemo</ulink>.
+ </para>
+
</section>
</section>
Modified: trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml 2009-02-10 16:08:29 UTC (rev 12618)
+++ trunk/docs/userguide/en/src/main/docbook/included/virtualEarth.xml 2009-02-10 16:43:44 UTC (rev 12619)
@@ -276,6 +276,11 @@
<property>Virtual Earth map</property>
.
</para>
+ <para>
+ Some additional information about usage of component can be found
+ <ulink url="http://livedemo.exadel.com/richfaces-demo/richfaces/virtualEarth.jsf?c=vi...">on its LiveDemo page</ulink>.</para>
+
+
</section>
</section>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12618 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2009-02-10 11:08:29 -0500 (Tue, 10 Feb 2009)
New Revision: 12618
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java
Log:
fix small problem in function testJSAPI
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java 2009-02-10 14:58:52 UTC (rev 12617)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ListShuttleTest.java 2009-02-10 16:08:29 UTC (rev 12618)
@@ -414,6 +414,7 @@
// Check posting to server
_checkDataPost2Server(2, 3);
+ selenium.runScript("var listShuttle = ($('" + lsId + "')).component;");
// Check ordering
_checkOrdering(targetListId, "1Item1", "2Item2", "3Item3", "");
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12617 - in trunk/test-applications/realworld/web/src/main/webapp: img and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-02-10 09:58:52 -0500 (Tue, 10 Feb 2009)
New Revision: 12617
Removed:
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/
trunk/test-applications/realworld/web/src/main/webapp/img/ajax/
trunk/test-applications/realworld/web/src/main/webapp/img/icons/
trunk/test-applications/realworld/web/src/main/webapp/img/tree/
trunk/test-applications/realworld/web/src/main/webapp/includes/contextMenu/
trunk/test-applications/realworld/web/src/main/webapp/includes/message/
trunk/test-applications/realworld/web/src/main/webapp/includes/misc/
trunk/test-applications/realworld/web/src/main/webapp/includes/news/
trunk/test-applications/realworld/web/src/main/webapp/includes/panelBar/
trunk/test-applications/realworld/web/src/main/webapp/includes/search/
trunk/test-applications/realworld/web/src/main/webapp/includes/userPrefs/
Log:
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12616 - in trunk/test-applications/realworld/web/src/main: webapp/includes and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-02-10 09:58:11 -0500 (Tue, 10 Feb 2009)
New Revision: 12616
Removed:
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/modalpanel/
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/navigation/
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/search/
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/tree/
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/ui/
trunk/test-applications/realworld/web/src/main/webapp/includes/fileUpload/
Log:
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12615 - trunk/test-applications/realworld/web/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-02-10 09:54:55 -0500 (Tue, 10 Feb 2009)
New Revision: 12615
Modified:
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/web.xml
Log:
Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/web.xml 2009-02-10 14:54:12 UTC (rev 12614)
+++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/web.xml 2009-02-10 14:54:55 UTC (rev 12615)
@@ -29,11 +29,6 @@
<param-value>realworld</param-value>
</context-param>
- <context-param>
- <param-name>facelets.LIBRARIES</param-name>
- <param-value>/WEB-INF/tags/realWorld-taglib.xml</param-value>
- </context-param>
-
<!-- Seam -->
<listener>
@@ -78,11 +73,9 @@
<param-value>.xhtml</param-value>
</context-param>
- <context-param>
+ <context-param>
<param-name>uploadRoot</param-name>
- <param-value>
- C:\Upload\
- </param-value>
+ <param-value>/srv/www/jboss-portal/server/default/data/Upload/</param-value>
</context-param>
@@ -106,10 +99,6 @@
<servlet-name>Picture Servlet</servlet-name>
<url-pattern>/picture/*</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>Picture Servlet</servlet-name>
- <url-pattern>/galleries/*</url-pattern>
- </servlet-mapping>
<security-constraint>
<display-name>Restrict raw XHTML Documents</display-name>
@@ -124,5 +113,4 @@
<display-name>copyImageListener</display-name>
<listener-class>org.richfaces.realworld.listener.CopyImagesStuff</listener-class>
</listener>
-
</web-app>
15 years, 2 months
- 1
- 0
JBoss Rich Faces SVN: r12614 - in trunk/test-applications/realworld/web/src/main: webapp/WEB-INF and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: amarkhel
Date: 2009-02-10 09:54:12 -0500 (Tue, 10 Feb 2009)
New Revision: 12614
Added:
trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageUtils.java
trunk/test-applications/realworld/web/src/main/webapp/includes/image/slideshow.xhtml
Removed:
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/album.xhtml
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/confirmation.xhtml
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/image.xhtml
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/linkPanel.xhtml
Modified:
trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml
Log:
Added: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageUtils.java
===================================================================
--- trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageUtils.java (rev 0)
+++ trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageUtils.java 2009-02-10 14:54:12 UTC (rev 12614)
@@ -0,0 +1,148 @@
+/**
+ *
+ */
+package org.richfaces.realworld.util;
+
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.Graphics2D;
+import java.awt.RenderingHints;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+import javax.imageio.stream.FileImageInputStream;
+import javax.imageio.stream.ImageInputStream;
+
+import org.richfaces.model.UploadItem;
+import org.richfaces.realworld.service.Constants;
+
+/**
+ * @author Andrey Markavtsov
+ *
+ */
+public class ImageUtils {
+
+ public static class ImageDimension {
+ public int WIDTH;
+ public int HEIGHT;
+ public String POSTFIX_NAME;
+ public ImageDimension(int width, int height, String postfix_name) {
+ super();
+ WIDTH = width;
+ HEIGHT = height;
+ POSTFIX_NAME = postfix_name;
+ }
+ };
+
+ public static final String _MEDIUM = "_medium";
+ public static final String _MINI = "_mini";
+
+
+ public static ImageDimension MINI = new ImageDimension(100, 100, _MINI);
+ public static ImageDimension MEDIUM = new ImageDimension(640, 480, _MEDIUM);
+
+
+ BufferedImage bufferedImage;
+
+ double width;
+ double height;
+
+ public ImageUtils(BufferedImage bufferedImage) {
+ if (bufferedImage == null) {
+ throw new NullPointerException("Buffered image is null");
+ }
+
+ this.height = bufferedImage.getHeight();
+ this.width = bufferedImage.getWidth();
+ this.bufferedImage = bufferedImage;
+ }
+
+ private BufferedImage scaleToWidth(int width) throws IOException {
+ double height = width * this.height / this.width;
+ BufferedImage newImage = new BufferedImage(width, (int) height,
+ BufferedImage.TYPE_INT_RGB);
+ Graphics2D graphics2D = createGraphics(newImage);
+ graphics2D.drawImage(bufferedImage, 0, 0, (int) width, (int) height,
+ null);
+ return newImage;
+ }
+
+ private BufferedImage scaleToHeight(int height) throws IOException {
+ double width = height * this.width / this.height;
+ BufferedImage newImage = new BufferedImage((int) width, (int) height,
+ BufferedImage.TYPE_INT_RGB);
+ Graphics2D graphics2D = createGraphics(newImage);
+ graphics2D.drawImage(bufferedImage, 0, 0, (int) width, (int) height,
+ null);
+ return newImage;
+ }
+
+ private Graphics2D createGraphics(BufferedImage image) {
+ Graphics2D graphics2D = image.createGraphics();
+ graphics2D.setBackground(new Color(255, 255, 255));
+ graphics2D.clearRect(0, 0, image.getWidth(), image.getHeight());
+ graphics2D.setRenderingHint(RenderingHints.KEY_INTERPOLATION,
+ RenderingHints.VALUE_INTERPOLATION_BICUBIC);
+ return graphics2D;
+ }
+
+ public BufferedImage resizeImage(double width, double height)
+ throws IOException {
+
+ if (width > height) {
+ if (this.bufferedImage.getWidth() < width) {
+ return bufferedImage;
+ }
+ return scaleToWidth((int) width);
+ } else {
+ if (this.bufferedImage.getHeight() < height) {
+ return bufferedImage;
+ }
+ return scaleToHeight((int) height);
+ }
+
+ }
+
+ public static void resizeImage(UploadItem image, String pathToUpload, ImageDimension ... dimensions)
+ throws IOException {
+
+ BufferedImage bufferedImage = ImageIO.read(new FileImageInputStream(image.getFile()));
+
+ ImageUtils utils = new ImageUtils(bufferedImage);
+ int width, height;
+
+ ImageIO.write(bufferedImage, Constants.JPG, new File(pathToUpload));
+
+ for (ImageDimension dimension : dimensions) {
+ String fileName = transformPath(pathToUpload,dimension.POSTFIX_NAME);
+ width = dimension.WIDTH;
+ height = dimension.HEIGHT;
+ BufferedImage resizedBuffer = bufferedImage;
+
+ if (width > height) {
+ if (bufferedImage.getWidth() > width) {
+ resizedBuffer = utils.scaleToWidth((int) width);
+ }
+ } else {
+ if (bufferedImage.getHeight() > height) {
+ resizedBuffer = utils.scaleToHeight((int) height);
+ }
+ }
+
+ if (resizedBuffer != null) {
+ ImageIO.write(resizedBuffer, Constants.JPG, new File(fileName));
+ }
+
+ }
+
+ }
+
+ public static String transformPath(String target, String substitute){
+ String begin = target.substring(0, target.lastIndexOf(Constants.DOT));
+ String end = target.substring(target.lastIndexOf(Constants.DOT));
+ return begin + substitute + end;
+ }
+
+}
Property changes on: trunk/test-applications/realworld/web/src/main/java/org/richfaces/realworld/util/ImageUtils.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Name: svn:keywords
+ Author Id Revision Date
Name: svn:eol-style
+ native
Modified: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml
===================================================================
--- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml 2009-02-10 14:53:24 UTC (rev 12613)
+++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/pages.xml 2009-02-10 14:54:12 UTC (rev 12614)
@@ -15,6 +15,7 @@
</page>
<page view-id="/index.xhtml">
+ <begin-conversation if="#{!conversation.longRunning}"/>
<action if="#{!identity.isLoggedIn()}" execute="#{authenticator.start}"/>
<navigation from-action="#{authenticator.logout}">
<rule if-outcome="logout">
@@ -22,6 +23,9 @@
<redirect view-id="/index.html"/>
</rule>
</navigation>
+ <navigation from-action="#{authenticator.start}">
+ <redirect view-id="/index.xhtml"/>
+ </navigation>
</page>
<exception class="org.jboss.seam.framework.EntityNotFoundException">
Deleted: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml
===================================================================
--- trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml 2009-02-10 14:53:24 UTC (rev 12613)
+++ trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/realWorld-taglib.xml 2009-02-10 14:54:12 UTC (rev 12614)
@@ -1,23 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE facelet-taglib PUBLIC
- "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
- "facelet-taglib_1_0.dtd">
-<facelet-taglib>
- <namespace>http://richfaces.org/richx</namespace>
- <tag>
- <tag-name>album</tag-name>
- <source>templates/album.xhtml</source>
- </tag>
- <tag>
- <tag-name>confirmation</tag-name>
- <source>templates/confirmation.xhtml</source>
- </tag>
- <tag>
- <tag-name>image</tag-name>
- <source>templates/image.xhtml</source>
- </tag>
- <tag>
- <tag-name>linkPanel</tag-name>
- <source>templates/linkPanel.xhtml</source>
- </tag>
-</facelet-taglib>
\ No newline at end of file
Deleted: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/album.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/confirmation.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/image.xhtml
===================================================================
(Binary files differ)
Deleted: trunk/test-applications/realworld/web/src/main/webapp/WEB-INF/tags/templates/linkPanel.xhtml
===================================================================
(Binary files differ)
Added: trunk/test-applications/realworld/web/src/main/webapp/includes/image/slideshow.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/realworld/web/src/main/webapp/includes/image/slideshow.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
15 years, 2 months
- 1
- 0