JBoss Rich Faces SVN: r17126 - in root/examples/richfaces-showcase/trunk/src/main: webapp/richfaces and 10 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-05-19 10:12:29 -0400 (Wed, 19 May 2010)
New Revision: 17126
Added:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/commandButton.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/commandLink.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/jsFunction.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/log.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/simple.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/push.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/simple.xhtml
Removed:
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/button/
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/usage.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/usage.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/usage.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/link/
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/usage.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/usage.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/usage.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/usage.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/templates/component-sample.xhtml
Modified:
root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/ajax.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml
Log:
https://jira.jboss.org/browse/RF-8663
Modified: root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-05-19 14:10:24 UTC (rev 17125)
+++ root/examples/richfaces-showcase/trunk/src/main/resources/org/richfaces/demo/data/common/navigation.xml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- NOTES(TODO: move to some readme in future): id for sample should equals to xhtml page name with the sample -->
<root>
<group>
<name>Ajax Action</name>
@@ -6,26 +7,25 @@
<demo>
<id>ajax</id>
<name>a4j:ajax</name>
- <page>ajax</page>
+ <samples-folder>ajax/</samples-folder>
<samples>
<sample>
- <id>simple</id>
+ <id>ajax</id>
<name>Simple sample</name>
- <src>ajax/ajax.xhtml</src>
</sample>
<sample>
- <id>selects</id>
+ <id>selectsUpdates</id>
<name>Dynamic Selects</name>
- <src>ajax/ajax.xhtml</src>
</sample>
</samples>
</demo>
<demo new="true">
<id>commandButton</id>
<name>a4j:commandButton</name>
- <page>commandButton</page>
+ <samples-folder>commandButton/</samples-folder>
<samples>
<sample>
+ <id>commandButton</id>
<name>Command Button Simple</name>
</sample>
</samples>
@@ -33,9 +33,10 @@
<demo new="true">
<id>commandLink</id>
<name>a4j:commandLink</name>
- <page>commandLink</page>
+ <samples-folder>commandLink/</samples-folder>
<samples>
<sample>
+ <id>commandLink</id>
<name>Command Link Simple</name>
</sample>
</samples>
@@ -43,9 +44,10 @@
<demo new="true">
<id>jsFunction</id>
<name>a4j:jsFunction</name>
- <page>jsFunction</page>
+ <samples-folder>jsFunction/</samples-folder>
<samples>
<sample>
+ <id>jsFunction</id>
<name>jsFunction Simple</name>
</sample>
</samples>
@@ -53,9 +55,10 @@
<demo new="true">
<id>poll</id>
<name>a4j:poll</name>
- <page>poll</page>
+ <samples-folder>poll/</samples-folder>
<samples>
<sample>
+ <id>poll</id>
<name>Poll Simple</name>
</sample>
</samples>
@@ -63,9 +66,10 @@
<demo new="true">
<id>push</id>
<name>a4j:push</name>
- <page>push</page>
+ <samples-folder>push/</samples-folder>
<samples>
<sample>
+ <id>push</id>
<name>push Simple</name>
</sample>
</samples>
@@ -78,9 +82,10 @@
<demo new="true">
<id>queue</id>
<name>a4j:queue</name>
- <page>queue</page>
+ <samples-folder>queue/</samples-folder>
<samples>
<sample>
+ <id>queue</id>
<name>queue</name>
</sample>
</samples>
@@ -88,9 +93,10 @@
<demo new="true">
<id>attachQueue</id>
<name>a4j:attachQueue</name>
- <page>attachQueue</page>
+ <samples-folder>attachQueue/</samples-folder>
<samples>
<sample>
+ <id>attachQueue</id>
<name>attachQueue</name>
</sample>
</samples>
@@ -103,40 +109,60 @@
<demo new="true">
<id>outputPanel</id>
<name>a4j:outputPanel</name>
- <page>outputPanel</page>
+ <samples-folder>outputPanel/</samples-folder>
<samples>
<sample>
+ <id>simple</id>
<name>outputPanel Simple</name>
</sample>
+ <sample>
+ <id>compositemessages</id>
+ <name>Auto update for h:messages component</name>
+ </sample>
</samples>
</demo>
<demo new="true">
<id>status</id>
<name>a4j:status</name>
- <page>status</page>
+ <samples-folder>status</samples-folder>
<samples>
<sample>
- <name>status Simple</name>
+ <id>simple</id>
+ <name>Status Simple</name>
</sample>
+ <sample>
+ <id>referencedusage</id>
+ <name>Referenced status</name>
+ </sample>
+ <sample>
+ <id>viewusage</id>
+ <name>Common status for view</name>
+ </sample>
</samples>
</demo>
<demo new="true">
<id>mediaoutput</id>
<name>a4j:mediaOutput</name>
- <page>mediaOutput</page>
+ <samples-folder>mediaOutput</samples-folder>
<samples>
<sample>
- <name>mediaOutput Simple</name>
+ <id>imgUsage</id>
+ <name>mediaOutput for image output</name>
</sample>
+ <sample>
+ <id>imgUsage</id>
+ <name>mediaOutput for flash output</name>
+ </sample>
</samples>
</demo>
<demo new="true">
<id>log</id>
<name>a4j:log</name>
- <page>log</page>
+ <samples-folder>log</samples-folder>
<samples>
<sample>
- <name>log</name>
+ <id>log</id>
+ <name>Log usage</name>
</sample>
</samples>
</demo>
@@ -148,7 +174,6 @@
<demo>
<id>dataTable</id>
<name>rich:dataTable</name>
- <page>dataTable</page>
<samples>
<sample>
<name>Data Table Basic</name>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/ajax.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/ajax.xhtml 2010-05-19 14:10:24 UTC (rev 17125)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/ajax.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -6,13 +6,17 @@
xmlns:a4j="http://richfaces.org/a4j">
<ui:composition>
-
+ <p>The behavior that adds javascript call for sending Ajax request
+ to specified event on parent component</p>
<h:form>
<h:inputText value="#{userBean.name}">
<a4j:ajax event="keyup" render="out"/>
</h:inputText>
<h:outputText value="#{userBean.name}" id="out"/>
- </h:form>
+ </h:form>
+ <p>Typical use-case of dependent select components. When you
+ choosing the type in the first select - corresponding items appears in
+ second one.</p>
</ui:composition>
</html>
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml 2010-05-19 14:10:24 UTC (rev 17125)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax/selectsUpdates.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -6,6 +6,9 @@
xmlns:a4j="http://richfaces.org/a4j">
<ui:composition>
+ <p>Typical use-case of dependent select components. When you choosing
+ the type in the first select - corresponding items appears in second one.
+ </p>
<h:form>
<h:selectOneMenu value="#{selectsBean.currentType}"
valueChangeListener="#{selectsBean.valueChanged}">
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax.xhtml 2010-05-19 14:10:24 UTC (rev 17125)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/ajax.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -1,42 +1,14 @@
<!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: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="/templates/main.xhtml">
- <ui:define name="demoSampleParameters">
- <f:metadata>
- <f:viewParam name="demoName" value="#{demoNavigator.demoName}" converter="#{demoNavigator.demoViewConverter}" />
- <f:event listener="#{demoNavigator.preRenderEvent}" type="javax.faces.event.PreRenderViewEvent" />
- </f:metadata>
- </ui:define>
- <ui:define name="body">
- <h:link value="Ajax" includeViewParams="false">
- <f:param name="demoName" value="ajax/ajax" />
- </h:link>
- <h:outputText value=" | "/>
-
- <h:link value="Selects updates" includeViewParams="false">
- <f:param name="demoName" value="ajax/selectsUpdates" />
- </h:link>
-
-
- <p>
- The behavior that adds javascript call for sending Ajax request
- to specified event on parent component
- </p>
- <fieldset>
- <legend>Simple sample</legend>
- <ui:include src="#{demoNavigator.demoName}" />
- </fieldset>
-
- <p>Typical use-case of dependent select components. When you choosing
- the type in the first select - corresponding items appears in second one.
- </p>
-
-
- </ui:define>
- </ui:composition>
-
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j">
+
+<ui:composition template="/templates/component-sample.xhtml">
+
+ <fieldset><legend>#{demoNavigator.currentSample.name}</legend> <ui:include
+ src="#{demoNavigator.sampleURI}" /></fieldset>
+</ui:composition>
+
</html>
\ No newline at end of file
Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/button)
Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/commandButton.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/button/usage.xhtml)
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/commandButton.xhtml (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/commandButton.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -0,0 +1,29 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j">
+
+<ui:composition>
+ <style>
+ <!--
+ .outhello {
+ font-weight: bold;
+ }
+ -->
+ </style>
+ <h:form>
+ <h:panelGrid columns="3">
+ <h:outputText value="Name:" />
+ <h:inputText value="#{userBean.name}" />
+ <a4j:commandButton value="Say Hello" render="out" />
+ </h:panelGrid>
+ </h:form>
+ <br />
+ <a4j:outputPanel id="out">
+ <h:outputText value="Hello #{userBean.name} !" rendered="#{not empty userBean.name}" styleClass="outhello" />
+ </a4j:outputPanel>
+</ui:composition>
+
+</html>
\ No newline at end of file
Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/usage.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/button/usage.xhtml 2010-05-17 20:23:29 UTC (rev 17093)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandButton/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -1,29 +0,0 @@
-<!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:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:a4j="http://richfaces.org/a4j">
-
-<ui:composition>
- <style>
- <!--
- .outhello {
- font-weight: bold;
- }
- -->
- </style>
- <h:form>
- <h:panelGrid columns="3">
- <h:outputText value="Name:" />
- <h:inputText value="#{userBean.name}" />
- <a4j:commandButton value="Say Hello" render="out" />
- </h:panelGrid>
- </h:form>
- <br />
- <a4j:outputPanel id="out">
- <h:outputText value="Hello #{userBean.name} !" rendered="#{not empty userBean.name}" styleClass="outhello" />
- </a4j:outputPanel>
-</ui:composition>
-
-</html>
\ No newline at end of file
Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/link)
Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/commandLink.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/link/usage.xhtml)
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/commandLink.xhtml (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/commandLink.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -0,0 +1,28 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j">
+
+ <ui:composition>
+ <style>
+ <!--
+ .outhello {
+ font-weight: bold;
+ }
+ -->
+ </style>
+ <h:form>
+ <h:panelGrid columns="3">
+ <h:outputText value="Name:" />
+ <h:inputText value="#{userBean.name}" />
+ <a4j:commandLink value="Say Hello" render="out" />
+ </h:panelGrid>
+ </h:form>
+ <br />
+ <a4j:outputPanel id="out">
+ <h:outputText value="Hello #{userBean.name} !" rendered="#{not empty userBean.name}" styleClass="outhello" />
+ </a4j:outputPanel>
+</ui:composition>
+</html>
\ No newline at end of file
Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/usage.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/link/usage.xhtml 2010-05-17 20:23:29 UTC (rev 17093)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/commandLink/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -1,28 +0,0 @@
-<!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:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:a4j="http://richfaces.org/a4j">
-
- <ui:composition>
- <style>
- <!--
- .outhello {
- font-weight: bold;
- }
- -->
- </style>
- <h:form>
- <h:panelGrid columns="3">
- <h:outputText value="Name:" />
- <h:inputText value="#{userBean.name}" />
- <a4j:commandLink value="Say Hello" render="out" />
- </h:panelGrid>
- </h:form>
- <br />
- <a4j:outputPanel id="out">
- <h:outputText value="Hello #{userBean.name} !" rendered="#{not empty userBean.name}" styleClass="outhello" />
- </a4j:outputPanel>
-</ui:composition>
-</html>
\ No newline at end of file
Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/templates/component-sample.xhtml)
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/component-sample.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -0,0 +1,27 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:rich="http://java.sun.com/jsf/composite/rich">
+
+<ui:composition template="/templates/main.xhtml">
+ <ui:define name="demoSampleParameters">
+ <f:metadata>
+ <f:viewParam name="sample" value="#{demoNavigator.sample}" />
+ <f:viewParam name="demo" value="#{demoNavigator.demo}" />
+ </f:metadata>
+ </ui:define>
+ <ui:define name="body">
+ <ui:repeat value="#{demoNavigator.currentDemo.samples}" var="s">
+ <h:link value="#{s.name}" includeViewParams="true">
+ <f:param name="sample" value="#{s.id}" />
+ </h:link>
+ <h:outputText value=" | " />
+ </ui:repeat>
+ <fieldset><legend>#{demoNavigator.currentSample.name}</legend>
+ <ui:include src="#{demoNavigator.sampleURI}" /></fieldset>
+ </ui:define>
+</ui:composition>
+
+</html>
\ No newline at end of file
Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/jsFunction.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/usage.xhtml)
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/jsFunction.xhtml (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/jsFunction.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -0,0 +1,33 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j">
+
+ <ui:composition>
+ <table width="400">
+ <tbody>
+ <tr>
+ <td><span onmouseover="updateName('Kate')"
+ onmouseout="updateName('')">Kate</span></td>
+ <td><span onmouseover="updateName('John')"
+ onmouseout="updateName('')">John</span></td>
+ <td><span onmouseover="updateName('Alex')"
+ onmouseout="updateName('')">Alex</span></td>
+ </tr>
+ <tr>
+ <td colspan="3">Name: <b><h:outputText id="showname"
+ value="#{functionBean.text}" /></b></td>
+ </tr>
+ </tbody>
+ </table>
+ <h:form>
+ <a4j:jsFunction name="updateName" render="showname"
+ action="#{functionBean.processHover}">
+ <f:param name="name" />
+ </a4j:jsFunction>
+ </h:form>
+ </ui:composition>
+
+</html>
\ No newline at end of file
Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/usage.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/usage.xhtml 2010-05-19 14:10:24 UTC (rev 17125)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/jsFunction/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -1,33 +0,0 @@
-<!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:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:a4j="http://richfaces.org/a4j">
-
- <ui:composition>
- <table width="400">
- <tbody>
- <tr>
- <td><span onmouseover="updateName('Kate')"
- onmouseout="updateName('')">Kate</span></td>
- <td><span onmouseover="updateName('John')"
- onmouseout="updateName('')">John</span></td>
- <td><span onmouseover="updateName('Alex')"
- onmouseout="updateName('')">Alex</span></td>
- </tr>
- <tr>
- <td colspan="3">Name: <b><h:outputText id="showname"
- value="#{functionBean.text}" /></b></td>
- </tr>
- </tbody>
- </table>
- <h:form>
- <a4j:jsFunction name="updateName" render="showname"
- action="#{functionBean.processHover}">
- <f:param name="name" />
- </a4j:jsFunction>
- </h:form>
- </ui:composition>
-
-</html>
\ No newline at end of file
Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/log.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/usage.xhtml)
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/log.xhtml (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/log.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -0,0 +1,19 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j">
+
+ <ui:composition>
+ <h:form>
+ <h:inputText value="#{userBean.name}" />
+ <a4j:commandButton value="Submit" render="out"/>
+ <br/>
+ <a4j:outputPanel id="out">
+ <h:outputText value="Hello #{userBean.name}!" rendered="#{not empty userBean.name}"/>
+ </a4j:outputPanel>
+ </h:form>
+ <a4j:log/>
+ </ui:composition>
+</html>
\ No newline at end of file
Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/usage.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/usage.xhtml 2010-05-19 14:10:24 UTC (rev 17125)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/log/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -1,19 +0,0 @@
-<!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:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:a4j="http://richfaces.org/a4j">
-
- <ui:composition>
- <h:form>
- <h:inputText value="#{userBean.name}" />
- <a4j:commandButton value="Submit" render="out"/>
- <br/>
- <a4j:outputPanel id="out">
- <h:outputText value="Hello #{userBean.name}!" rendered="#{not empty userBean.name}"/>
- </a4j:outputPanel>
- </h:form>
- <a4j:log/>
- </ui:composition>
-</html>
\ No newline at end of file
Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/simple.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/usage.xhtml)
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/simple.xhtml (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/simple.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -0,0 +1,70 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:rich="http://java.sun.com/jsf/composite/rich"
+ xmlns:a4j="http://richfaces.org/a4j">
+
+<ui:composition>
+ <style type="text/css">
+ .col {
+ width:50%;
+ padding:10px;
+ padding: 0px 30px 0px 0px;
+ vertical-align: top;
+ }
+ </style>
+ <h:panelGrid columns="2" width="100%" columnClasses="col">
+
+ <f:verbatim>
+ This code does not work as expected. The expected echo text does not appear
+ below even the condition for <code>'renderer'</code> returns <code>true</code>.
+ Also, the error message does not appear when the length of the text reaches the limit.
+ </f:verbatim>
+ <f:verbatim>
+ This code works properly. The <code>h:message</code> is marked for update during
+ each Ajaxrequest/response. The place for bottom label is reserved with
+ <code>outputPanel</code> while the component is not rendered.
+ </f:verbatim>
+
+ <a4j:outputPanel layout="block">
+
+
+ <a4j:outputPanel layout="block">
+ <h:form>
+ <h:message for="text1" style="color:red" />
+
+ <h:outputText style="font-weight: bold;" value="Enter Text: "/>
+ <h:inputText id="text1" label="text1" value="#{opBean1.text}">
+ <f:validateLength maximum="10"/>
+ <a4j:ajax event="keyup" execute="@this" render="out1" onerror="function(){return false}"/>
+ </h:inputText>
+
+ <h:outputText id="out1" rendered="#{not empty opBean1.text}" value="Approved Text: #{opBean1.text}" />
+ </h:form>
+ </a4j:outputPanel>
+
+ </a4j:outputPanel>
+
+ <a4j:outputPanel layout="block">
+ <h:form>
+ <a4j:outputPanel layout="block">
+ <h:message for="text2" style="color:red" />
+ </a4j:outputPanel>
+
+ <h:outputText style="font-weight: bold;" value="Enter Text: "/>
+ <h:inputText id="text2" label="text2" value="#{opBean2.text}">
+ <f:validateLength maximum="10"/>
+ <a4j:ajax event="keyup" execute="@this" render="out2" />
+ </h:inputText>
+
+ <a4j:outputPanel id="out2" layout="block">
+ <h:outputText rendered="#{not empty opBean2.text}" value="Approved Text: #{opBean2.text}" />
+ </a4j:outputPanel>
+ </h:form>
+ </a4j:outputPanel>
+ </h:panelGrid>
+</ui:composition>
+
+</html>
\ No newline at end of file
Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/usage.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/usage.xhtml 2010-05-19 14:10:24 UTC (rev 17125)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/outputPanel/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -1,70 +0,0 @@
-<!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:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:rich="http://java.sun.com/jsf/composite/rich"
- xmlns:a4j="http://richfaces.org/a4j">
-
-<ui:composition>
- <style type="text/css">
- .col {
- width:50%;
- padding:10px;
- padding: 0px 30px 0px 0px;
- vertical-align: top;
- }
- </style>
- <h:panelGrid columns="2" width="100%" columnClasses="col">
-
- <f:verbatim>
- This code does not work as expected. The expected echo text does not appear
- below even the condition for <code>'renderer'</code> returns <code>true</code>.
- Also, the error message does not appear when the length of the text reaches the limit.
- </f:verbatim>
- <f:verbatim>
- This code works properly. The <code>h:message</code> is marked for update during
- each Ajaxrequest/response. The place for bottom label is reserved with
- <code>outputPanel</code> while the component is not rendered.
- </f:verbatim>
-
- <a4j:outputPanel layout="block">
-
-
- <a4j:outputPanel layout="block">
- <h:form>
- <h:message for="text1" style="color:red" />
-
- <h:outputText style="font-weight: bold;" value="Enter Text: "/>
- <h:inputText id="text1" label="text1" value="#{opBean1.text}">
- <f:validateLength maximum="10"/>
- <a4j:ajax event="keyup" execute="@this" render="out1" onerror="function(){return false}"/>
- </h:inputText>
-
- <h:outputText id="out1" rendered="#{not empty opBean1.text}" value="Approved Text: #{opBean1.text}" />
- </h:form>
- </a4j:outputPanel>
-
- </a4j:outputPanel>
-
- <a4j:outputPanel layout="block">
- <h:form>
- <a4j:outputPanel layout="block">
- <h:message for="text2" style="color:red" />
- </a4j:outputPanel>
-
- <h:outputText style="font-weight: bold;" value="Enter Text: "/>
- <h:inputText id="text2" label="text2" value="#{opBean2.text}">
- <f:validateLength maximum="10"/>
- <a4j:ajax event="keyup" execute="@this" render="out2" />
- </h:inputText>
-
- <a4j:outputPanel id="out2" layout="block">
- <h:outputText rendered="#{not empty opBean2.text}" value="Approved Text: #{opBean2.text}" />
- </a4j:outputPanel>
- </h:form>
- </a4j:outputPanel>
- </h:panelGrid>
-</ui:composition>
-
-</html>
\ No newline at end of file
Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/push.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/usage.xhtml)
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/push.xhtml (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/push.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -0,0 +1,48 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:a4j="http://richfaces.org/a4j">
+
+<ui:composition>
+ <h:form>
+ <h:dataTable value="#{choicesBean.choices}" var="choice" id="choiceVotes">
+ <f:facet name="header">
+ <h:outputText value="Voting for favorite fruit" />
+ </f:facet>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Choice name" />
+ </f:facet>
+ <h:outputText value="#{choice.label}" id="choiceLabel" />
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Current Votes" />
+ </f:facet>
+ <h:outputText value="#{choice.votesCount}" id="choiceVotes" />
+ </h:column>
+ </h:dataTable>
+
+ <a4j:jsFunction name="startPush" action="#{choicesBean.start}" execute="@this" render="push, stop, start"/>
+ <a4j:jsFunction name="stopPush" action="#{choicesBean.stop}" execute="@this" render="push, stop, start"/>
+
+ <h:commandButton onclick="startPush()" value="Start" id="start" disabled="#{choicesBean.enabled}" type="button"/>
+
+ <h:commandButton onclick="stopPush()" type="button" value="Stop" id="stop" disabled="#{!choicesBean.enabled}"/>
+
+ <a4j:outputPanel layout="block" id="tempResults">
+ <h:outputText
+ value="Latest update votes was: #{choicesBean.updateInfo} at #{choicesBean.timeStamp}"
+ rendered="#{choicesBean.enabled}" />
+ </a4j:outputPanel>
+
+ <a4j:push enabled="#{choicesBean.enabled}" interval="1000"
+ eventProducer="#{choicesBean.addListener}" id="push" action="#{choicesBean.processUpdates}">
+ <a4j:ajax render="choiceVotes push tempResults" />
+ </a4j:push>
+ </h:form>
+</ui:composition>
+
+</html>
\ No newline at end of file
Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/usage.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/usage.xhtml 2010-05-19 14:10:24 UTC (rev 17125)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/push/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -1,48 +0,0 @@
-<!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:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:a4j="http://richfaces.org/a4j">
-
-<ui:composition>
- <h:form>
- <h:dataTable value="#{choicesBean.choices}" var="choice" id="choiceVotes">
- <f:facet name="header">
- <h:outputText value="Voting for favorite fruit" />
- </f:facet>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Choice name" />
- </f:facet>
- <h:outputText value="#{choice.label}" id="choiceLabel" />
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Current Votes" />
- </f:facet>
- <h:outputText value="#{choice.votesCount}" id="choiceVotes" />
- </h:column>
- </h:dataTable>
-
- <a4j:jsFunction name="startPush" action="#{choicesBean.start}" execute="@this" render="push, stop, start"/>
- <a4j:jsFunction name="stopPush" action="#{choicesBean.stop}" execute="@this" render="push, stop, start"/>
-
- <h:commandButton onclick="startPush()" value="Start" id="start" disabled="#{choicesBean.enabled}" type="button"/>
-
- <h:commandButton onclick="stopPush()" type="button" value="Stop" id="stop" disabled="#{!choicesBean.enabled}"/>
-
- <a4j:outputPanel layout="block" id="tempResults">
- <h:outputText
- value="Latest update votes was: #{choicesBean.updateInfo} at #{choicesBean.timeStamp}"
- rendered="#{choicesBean.enabled}" />
- </a4j:outputPanel>
-
- <a4j:push enabled="#{choicesBean.enabled}" interval="1000"
- eventProducer="#{choicesBean.addListener}" id="push" action="#{choicesBean.processUpdates}">
- <a4j:ajax render="choiceVotes push tempResults" />
- </a4j:push>
- </h:form>
-</ui:composition>
-
-</html>
\ No newline at end of file
Copied: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/simple.xhtml (from rev 17093, root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/usage.xhtml)
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/simple.xhtml (rev 0)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/simple.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -0,0 +1,38 @@
+<!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:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets"
+ xmlns:rich="http://java.sun.com/jsf/composite/rich"
+ xmlns:a4j="http://richfaces.org/a4j">
+
+ <ui:composition>
+ <h:form>
+ <rich:panel id="psnel">
+ <f:facet name="header">
+ <h:outputText value="Panel with status" />
+ </f:facet>
+ <h:panelGrid columns="2">
+ <h:panelGrid columns="2">
+ <f:ajax event="keyup">
+ <h:outputText value="User name:" />
+ <h:inputText value="#{userBean.name}"/>
+ <h:outputText value="Adress:" />
+ <h:inputText value="#{userBean.address}"/>
+ </f:ajax>
+ </h:panelGrid>
+ <a4j:status>
+ <f:facet name="start">
+ <h:graphicImage value="/images/ai.gif"/>
+ </f:facet>
+ </a4j:status>
+ </h:panelGrid>
+ <h:commandButton value="Submit" type="button" action="#{userBean.store}">
+ <f:ajax render="out"/>
+ </h:commandButton>
+ <h:outputText value="#{userBean.recordStatus}" id="out"/>
+ </rich:panel>
+ </h:form>
+ </ui:composition>
+
+</html>
\ No newline at end of file
Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/usage.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/usage.xhtml 2010-05-19 14:10:24 UTC (rev 17125)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/status/usage.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -1,38 +0,0 @@
-<!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:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:rich="http://java.sun.com/jsf/composite/rich"
- xmlns:a4j="http://richfaces.org/a4j">
-
- <ui:composition>
- <h:form>
- <rich:panel id="psnel">
- <f:facet name="header">
- <h:outputText value="Panel with status" />
- </f:facet>
- <h:panelGrid columns="2">
- <h:panelGrid columns="2">
- <f:ajax event="keyup">
- <h:outputText value="User name:" />
- <h:inputText value="#{userBean.name}"/>
- <h:outputText value="Adress:" />
- <h:inputText value="#{userBean.address}"/>
- </f:ajax>
- </h:panelGrid>
- <a4j:status>
- <f:facet name="start">
- <h:graphicImage value="/images/ai.gif"/>
- </f:facet>
- </a4j:status>
- </h:panelGrid>
- <h:commandButton value="Submit" type="button" action="#{userBean.store}">
- <f:ajax render="out"/>
- </h:commandButton>
- <h:outputText value="#{userBean.recordStatus}" id="out"/>
- </rich:panel>
- </h:form>
- </ui:composition>
-
-</html>
\ No newline at end of file
Deleted: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/component-sample.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/component-sample.xhtml 2010-05-19 14:10:24 UTC (rev 17125)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/component-sample.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -1,17 +0,0 @@
-<!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:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core"
- xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:rich="http://java.sun.com/jsf/composite/rich">
-
-<ui:composition template="/templates/main.xhtml">
- <ui:define name="body">
- <fieldset>
- <legend></legend>
- </fieldset>
- <ui:insert/>
- </ui:define>
-</ui:composition>
-
-</html>
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml 2010-05-19 14:10:24 UTC (rev 17125)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/templates/includes/navigation.xhtml 2010-05-19 14:12:29 UTC (rev 17126)
@@ -17,7 +17,7 @@
<ul>
<a4j:repeat value="#{gr.demos}" var="d">
<li>
- <h:link outcome="#{d.demoURI}" value="#{d.name}" includeViewParams="false">
+ <h:link outcome="/richfaces/component-sample.xhtml" value="#{d.name}" includeViewParams="false">
<f:param name="demo" value="#{d.id}"/>
</h:link>
<h:outputText value="NEW!" rendered="#{d.newItem or gr.newItem}" style="color:red"/>
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r17125 - root/dist/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-19 10:10:24 -0400 (Wed, 19 May 2010)
New Revision: 17125
Added:
root/dist/trunk/pom.xml
Modified:
root/dist/trunk/richfaces-examples.xml
root/dist/trunk/richfaces.xml
Log:
RF-8461 Root Assembler
Added: root/dist/trunk/pom.xml
===================================================================
--- root/dist/trunk/pom.xml (rev 0)
+++ root/dist/trunk/pom.xml 2010-05-19 14:10:24 UTC (rev 17125)
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software 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 software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
+ http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-assembler</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Richfaces Assembler</name>
+
+ <modules>
+ <module>../../build/parent/tags/richfaces-parent-1</module>
+ <module>../../build/bom/trunk</module>
+ <!--<module>build/resources/trunk/checkstyle</module>-->
+ <module>../../commons/trunk</module>
+ <module>../../core/trunk</module>
+ <!--<module>cdk/${cdk.svn.dir}</module>-->
+ <!--<module>ui/core/${ui.svn.dir}</module>-->
+ <!--<module>ui-sandbox</module>-->
+ <module>../../examples</module>
+ <!--<module>examples-sandbox/${examples-sandbox.svn.dir}</module>-->
+ <!--<module>doc/${doc.svn.dir}</module>-->
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-4</version>
+ <executions>
+ <execution>
+ <configuration>
+ <finalName>richfaces-${version}</finalName>
+ <descriptor>richfaces.xml</descriptor>
+ </configuration>
+ <id>richfaces</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+<!--
+ <execution>
+ <configuration>
+ <finalName>richfaces-examples-${version}</finalName>
+ <descriptor>richfaces-examples.xml</descriptor>
+ </configuration>
+ <id>richfaces-examples</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ </execution>
+-->
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Modified: root/dist/trunk/richfaces-examples.xml
===================================================================
--- root/dist/trunk/richfaces-examples.xml 2010-05-19 13:07:49 UTC (rev 17124)
+++ root/dist/trunk/richfaces-examples.xml 2010-05-19 14:10:24 UTC (rev 17125)
@@ -9,7 +9,7 @@
</file>
<file>
<source>readme-examples.txt</source>
- <destName>readme.txt</destName>
+ <destName>readme.txt</destName>
</file>
<file>
<source>JBossORG-EULA.txt</source>
@@ -20,7 +20,7 @@
<moduleSet>
<includeSubModules>true</includeSubModules>
<includes>
- <!--include>org.richfaces.examples:components</include -->
+ <!--include>org.richfaces.examples:components</include -->
<include>org.richfaces.examples:richfaces-showcase</include>
<!--<include>org.richfaces.examples:photoalbum</include>-->
</includes>
@@ -33,8 +33,8 @@
<includes>
<include>src/**</include>
<include>readme.txt</include>
- <include>pom.xml</include>
-
+ <include>pom.xml</include>
+
<include>build.xml</include>
<include>maven-build.properties</include>
<include>maven-build.xml</include>
@@ -77,7 +77,7 @@
</fileSets>
</sources>
</moduleSet -->
-
+
<moduleSet>
<includeSubModules>true</includeSubModules>
<includes>
@@ -85,10 +85,10 @@
</includes>
<sources>
- <outputDirectoryMapping />
+ <outputDirectoryMapping/>
<fileSets>
- <fileSet>
- <includes>
+ <fileSet>
+ <includes>
<include>pom.xml</include>
</includes>
</fileSet>
Modified: root/dist/trunk/richfaces.xml
===================================================================
--- root/dist/trunk/richfaces.xml 2010-05-19 13:07:49 UTC (rev 17124)
+++ root/dist/trunk/richfaces.xml 2010-05-19 14:10:24 UTC (rev 17125)
@@ -9,10 +9,10 @@
</file>
<file>
<source>readme-ui.txt</source>
- <destName>readme.txt</destName>
+ <destName>readme.txt</destName>
</file>
<file>
- <source>JBossORG-EULA.txt</source>
+ <source>JBossORG-EULA.txt</source>
</file>
</files>
@@ -20,9 +20,10 @@
<moduleSet>
<includeSubModules>true</includeSubModules>
<includes>
- <include>org.richfaces.framework:richfaces-api</include>
- <include>org.richfaces.framework:richfaces-impl</include>
- <include>org.richfaces.ui.components:core-ui</include>
+ <include>org.richfaces.core:richfaces-core-api</include>
+ <include>org.richfaces.core:richfaces-core-impl</include>
+ <include>org.richfaces.commons:richfaces-commons-api</include>
+ <!--<include>org.richfaces.ui.components:core-ui</include>-->
</includes>
<sources>
@@ -34,21 +35,53 @@
<includes>
<include>*-sources.jar</include>
</includes>
- <outputDirectory>/lib/source</outputDirectory>
+ <outputDirectory>artifacts/core/</outputDirectory>
</fileSet>
<fileSet>
<directory>target/apidocs</directory>
- <outputDirectory>/apidocs/${module.artifactId}</outputDirectory>
+ <outputDirectory>docs/javadocs/${module.artifactId}</outputDirectory>
</fileSet>
+ <fileSet>
+ <directory>target/site/jsdoc</directory>
+ <outputDirectory>docs/jsdocs/${module.artifactId}</outputDirectory>
+ </fileSet>
</fileSets>
</sources>
<binaries>
<includeDependencies>false</includeDependencies>
- <outputDirectory>lib</outputDirectory>
+ <outputDirectory>artifacts/core</outputDirectory>
<outputFileNameMapping>${module.artifactId}-${module.version}.${module.extension}</outputFileNameMapping>
<unpack>false</unpack>
</binaries>
</moduleSet>
+
+ <moduleSet>
+ <includeSubModules>true</includeSubModules>
+ <includes>
+ <include>org.richfaces.examples:core-demo</include>
+ <include>org.richfaces.examples:richfaces-showcase</include>
+ </includes>
+
+ <sources>
+ <outputDirectoryMapping>examples/${module.artifactId}</outputDirectoryMapping>
+ <excludeSubModuleDirectories>false</excludeSubModuleDirectories>
+ <fileSets>
+ <fileSet>
+ <includes>
+ <include>src/**</include>
+ <include>readme.txt</include>
+ <include>pom.xml</include>
+
+<!--
+ <include>build.xml</include>
+ <include>maven-build.properties</include>
+ <include>maven-build.xml</include>
+-->
+ </includes>
+ </fileSet>
+ </fileSets>
+ </sources>
+ </moduleSet>
</moduleSets>
</assembly>
\ No newline at end of file
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r17124 - in root: core/trunk/impl/src/main/java/org/richfaces/renderkit and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-19 09:07:49 -0400 (Wed, 19 May 2010)
New Revision: 17124
Added:
root/core/trunk/impl/src/main/java/org/richfaces/context/OnOffResponseWriter.java
Removed:
root/core/trunk/impl/src/main/java/org/richfaces/renderkit/OnOffResponseWriter.java
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
Log:
https://jira.jboss.org/browse/RF-7856
https://jira.jboss.org/browse/RF-8630
Copied: root/core/trunk/impl/src/main/java/org/richfaces/context/OnOffResponseWriter.java (from rev 17119, root/core/trunk/impl/src/main/java/org/richfaces/renderkit/OnOffResponseWriter.java)
===================================================================
--- root/core/trunk/impl/src/main/java/org/richfaces/context/OnOffResponseWriter.java (rev 0)
+++ root/core/trunk/impl/src/main/java/org/richfaces/context/OnOffResponseWriter.java 2010-05-19 13:07:49 UTC (rev 17124)
@@ -0,0 +1,101 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software 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 software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.richfaces.context;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import javax.faces.context.ResponseWriter;
+import javax.faces.context.ResponseWriterWrapper;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public class OnOffResponseWriter extends ResponseWriterWrapper {
+
+ private static final Writer NO_OP_WRITER = new Writer() {
+
+ @Override
+ public void write(char[] cbuf, int off, int len) throws IOException {
+ //do nothing
+ }
+
+ public void write(char[] cbuf) throws IOException {
+ //do nothing
+ };
+
+ public void write(int c) throws IOException {
+ //do nothing
+ };
+
+ public void write(String str) throws IOException {
+ //do nothing
+ };
+
+ public void write(String str, int off, int len) throws IOException {
+ //do nothing
+ };
+
+ @Override
+ public void flush() throws IOException {
+ //do nothing
+ }
+
+ @Override
+ public void close() throws IOException {
+ //do nothing
+ }
+ };
+
+ private boolean switchedOn = false;
+
+ private ResponseWriter wrappedWriter;
+
+ private ResponseWriter stubWriter;
+
+ public OnOffResponseWriter(ResponseWriter wrappedWriter) {
+ super();
+ this.wrappedWriter = wrappedWriter;
+ }
+
+ @Override
+ public ResponseWriter getWrapped() {
+ if (!switchedOn) {
+ if (stubWriter == null) {
+ stubWriter = wrappedWriter.cloneWithWriter(NO_OP_WRITER);
+ }
+
+ return stubWriter;
+ } else {
+ return wrappedWriter;
+ }
+ }
+
+ public void setSwitchedOn(boolean newState) {
+ switchedOn = newState;
+ }
+
+ public boolean isSwitchedOn() {
+ return switchedOn;
+ }
+}
Deleted: root/core/trunk/impl/src/main/java/org/richfaces/renderkit/OnOffResponseWriter.java
===================================================================
--- root/core/trunk/impl/src/main/java/org/richfaces/renderkit/OnOffResponseWriter.java 2010-05-19 12:56:24 UTC (rev 17123)
+++ root/core/trunk/impl/src/main/java/org/richfaces/renderkit/OnOffResponseWriter.java 2010-05-19 13:07:49 UTC (rev 17124)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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 software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.richfaces.renderkit;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import javax.faces.context.ResponseWriter;
-import javax.faces.context.ResponseWriterWrapper;
-
-/**
- * @author Nick Belaevski
- *
- */
-public class OnOffResponseWriter extends ResponseWriterWrapper {
-
- private static final Writer NO_OP_WRITER = new Writer() {
-
- @Override
- public void write(char[] cbuf, int off, int len) throws IOException {
- //do nothing
- }
-
- public void write(char[] cbuf) throws IOException {
- //do nothing
- };
-
- public void write(int c) throws IOException {
- //do nothing
- };
-
- public void write(String str) throws IOException {
- //do nothing
- };
-
- public void write(String str, int off, int len) throws IOException {
- //do nothing
- };
-
- @Override
- public void flush() throws IOException {
- //do nothing
- }
-
- @Override
- public void close() throws IOException {
- //do nothing
- }
- };
-
- private boolean switchedOn = false;
-
- private ResponseWriter wrappedWriter;
-
- private ResponseWriter stubWriter;
-
- public OnOffResponseWriter(ResponseWriter wrappedWriter) {
- super();
- this.wrappedWriter = wrappedWriter;
- }
-
- @Override
- public ResponseWriter getWrapped() {
- if (!switchedOn) {
- if (stubWriter == null) {
- stubWriter = wrappedWriter.cloneWithWriter(NO_OP_WRITER);
- }
-
- return stubWriter;
- } else {
- return wrappedWriter;
- }
- }
-
- public void setSwitchedOn(boolean newState) {
- switchedOn = newState;
- }
-
- public boolean isSwitchedOn() {
- return switchedOn;
- }
-}
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-19 12:56:24 UTC (rev 17123)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-19 13:07:49 UTC (rev 17124)
@@ -55,6 +55,7 @@
import org.richfaces.component.UIDataTableBase;
import org.richfaces.component.UIExtendedDataTable;
import org.richfaces.component.util.HtmlUtil;
+import org.richfaces.context.OnOffResponseWriter;
@ResourceDependencies({ @ResourceDependency(library = "javax.faces", name = "jsf-uncompressed.js"),
@ResourceDependency(name = "jquery.js"), @ResourceDependency(name = "jquery.position.js"),
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r17123 - root/examples.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-19 08:56:24 -0400 (Wed, 19 May 2010)
New Revision: 17123
Modified:
root/examples/pom.xml
Log:
checkstyle for examples
Modified: root/examples/pom.xml
===================================================================
--- root/examples/pom.xml 2010-05-19 12:55:35 UTC (rev 17122)
+++ root/examples/pom.xml 2010-05-19 12:56:24 UTC (rev 17123)
@@ -47,14 +47,15 @@
<jetty.port>8080</jetty.port>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+ <richfaces.checkstyle.version>4.0.0-SNAPSHOT</richfaces.checkstyle.version>
</properties>
-
+
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.richfaces.ui</groupId>
<artifactId>core-bom</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -129,6 +130,24 @@
</profiles>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <!-- Configure checkstyle report for this module -->
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-build-checkstyle
+ </artifactId>
+ <version>${richfaces.checkstyle.version}
+ </version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
<plugins>
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
@@ -153,14 +172,6 @@
</plugins>
</build>
- <reporting>
- <plugins>
- <plugin>
- <artifactId>maven-checkstyle-plugin</artifactId>
- </plugin>
- </plugins>
- </reporting>
-
<repositories>
<repository>
<id>maven-repository2.dev.java.net</id>
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r17122 - root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-19 08:55:35 -0400 (Wed, 19 May 2010)
New Revision: 17122
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java
Log:
fix checkstyle
Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java 2010-05-19 12:46:50 UTC (rev 17121)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoDescriptor.java 2010-05-19 12:55:35 UTC (rev 17122)
@@ -3,7 +3,6 @@
import java.util.List;
import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlElementWrapper;
public class DemoDescriptor extends BaseDescriptor {
Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java 2010-05-19 12:46:50 UTC (rev 17121)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java 2010-05-19 12:55:35 UTC (rev 17122)
@@ -18,6 +18,28 @@
@ManagedBean
@SessionScoped
public class DemoNavigator {
+
+ private static Converter demoViewConverter = new Converter() {
+
+ public String getAsString(FacesContext context, UIComponent component, Object value) {
+ return (String) value;
+ }
+
+ public Object getAsObject(FacesContext context, UIComponent component, String value) {
+ NavigationHandler handler = context.getApplication().getNavigationHandler();
+
+ if (handler instanceof ConfigurableNavigationHandler) {
+ ConfigurableNavigationHandler navigationHandler = (ConfigurableNavigationHandler) handler;
+
+ NavigationCase navCase = navigationHandler.getNavigationCase(context, null, "/richfaces/" + value);
+
+ return navCase.getToViewId(context);
+ }
+
+ return null;
+ }
+ };
+
@ManagedProperty(value = "#{navigationParser.groupsList}")
private List<GroupDescriptor> groups;
private DemoDescriptor currentDemo = null;
@@ -37,7 +59,7 @@
if (null != currentDemo) {
if (null != currentSample) {
currentDemo.setActiveSampleById(currentSample);
- }else{
+ } else {
currentDemo.setActiveSample(currentDemo.getSamples().get(0));
currentSample = currentDemo.getActiveSample().getId();
}
@@ -126,27 +148,6 @@
System.out.println("DemoNavigator.preRenderEvent()");
}
- private static Converter demoViewConverter = new Converter() {
-
- public String getAsString(FacesContext context, UIComponent component, Object value) {
- return (String) value;
- }
-
- public Object getAsObject(FacesContext context, UIComponent component, String value) {
- NavigationHandler handler = context.getApplication().getNavigationHandler();
-
- if (handler instanceof ConfigurableNavigationHandler) {
- ConfigurableNavigationHandler navigationHandler = (ConfigurableNavigationHandler) handler;
-
- NavigationCase navCase = navigationHandler.getNavigationCase(context, null, "/richfaces/" + value);
-
- return navCase.getToViewId(context);
- }
-
- return null;
- }
- };
-
public Converter getDemoViewConverter() {
return demoViewConverter;
}
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r17121 - in root: ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-19 08:46:50 -0400 (Wed, 19 May 2010)
New Revision: 17121
Removed:
root/core/trunk/api/src/main/java/org/richfaces/event/PreRenderMetaComponentEvent.java
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
Log:
https://jira.jboss.org/browse/RF-7856
https://jira.jboss.org/browse/RF-8630
Deleted: root/core/trunk/api/src/main/java/org/richfaces/event/PreRenderMetaComponentEvent.java
===================================================================
--- root/core/trunk/api/src/main/java/org/richfaces/event/PreRenderMetaComponentEvent.java 2010-05-19 12:35:46 UTC (rev 17120)
+++ root/core/trunk/api/src/main/java/org/richfaces/event/PreRenderMetaComponentEvent.java 2010-05-19 12:46:50 UTC (rev 17121)
@@ -1,52 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2010, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software 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 software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.richfaces.event;
-
-import javax.faces.component.UIComponent;
-import javax.faces.event.PreRenderComponentEvent;
-
-/**
- * @author Nick Belaevski
- *
- */
-public class PreRenderMetaComponentEvent extends PreRenderComponentEvent {
-
- /**
- *
- */
- private static final long serialVersionUID = 5755546878106468912L;
-
- private String metaComponentId;
-
- public PreRenderMetaComponentEvent(UIComponent component, String metaComponentId) {
- super(component);
-
- this.metaComponentId = metaComponentId;
- }
-
- /**
- * @return the metaComponentId
- */
- public String getMetaComponentId() {
- return metaComponentId;
- }
-}
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-19 12:35:46 UTC (rev 17120)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-19 12:46:50 UTC (rev 17121)
@@ -35,12 +35,14 @@
import java.util.Map;
import javax.faces.FacesException;
+import javax.faces.application.Application;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.PartialResponseWriter;
import javax.faces.context.ResponseWriter;
+import javax.faces.event.PreRenderComponentEvent;
import org.ajax4jsf.javascript.JSFunction;
import org.ajax4jsf.javascript.JSReference;
@@ -319,17 +321,31 @@
encodeHeaderOrFooter(state, "header");
}
+ private void encodeBodyProlog(FacesContext context, UIComponent table, String tableBodyId) throws IOException {
+ ResponseWriter writer = context.getResponseWriter();
+ writer.startElement(HTML.DIV_ELEM, table);
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, tableBodyId, null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-body", null);
+ }
+
+ private void encodeBodyEpilog(FacesContext context) throws IOException {
+ ResponseWriter writer = context.getResponseWriter();
+ writer.endElement(HTML.DIV_ELEM);
+ }
+
public void encodeBody(RendererState state) throws IOException {
FacesContext context = state.getContext();
ResponseWriter writer = context.getResponseWriter();
UIDataTableBase table = state.getRow();
- //TODO nick - add startUpdate(...) for "noData" case
+ String tableBodyId = table.getClientId(context) + ":b";
- writer.startElement(HTML.DIV_ELEM, table);
- writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":b", null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-body", null);
if (table.getRowCount() == 0) {
+ EncoderVariance encoderVariance = state.getEncoderVariance();
+ encoderVariance.encodeStartUpdate(context, tableBodyId);
+
+ encodeBodyProlog(context, table, tableBodyId);
+
UIComponent facet = table.getFacet("noData");
if (facet != null && facet.isRendered()) {
facet.encodeAll(context);
@@ -339,7 +355,14 @@
writer.writeText(noDataLabel, "noDataLabel");
}
}
+
+ encodeBodyEpilog(context);
+
+ encoderVariance.encodeEndUpdate(context);
+
} else {
+ encodeBodyProlog(context, table, tableBodyId);
+
table.getAttributes().put("clientFirst", 0);
writer.startElement(HTML.DIV_ELEM, table);
writer.startElement(HTML.DIV_ELEM, table);
@@ -384,8 +407,9 @@
writer.endElement(HTML.TBOBY_ELEMENT);
writer.endElement(HTML.TABLE_ELEMENT);
writer.endElement(HTML.DIV_ELEM);
+
+ encodeBodyEpilog(context);
}
- writer.endElement(HTML.DIV_ELEM);
}
public void encodeFooter(RendererState state) throws IOException {
@@ -514,11 +538,19 @@
RendererState state = createRowHolder(context, component);
state.setEncoderVariance(EncoderVariance.partial);
+ Application application = context.getApplication();
+
if (UIExtendedDataTable.HEADER.equals(metaComponentId)) {
+ application.publishEvent(context, PreRenderComponentEvent.class, component);
+
encodeHeader(state);
} else if (UIExtendedDataTable.FOOTER.equals(metaComponentId)) {
+ application.publishEvent(context, PreRenderComponentEvent.class, component);
+
encodeFooter(state);
} else if (UIExtendedDataTable.BODY.equals(metaComponentId)) {
+ application.publishEvent(context, PreRenderComponentEvent.class, component);
+
encodeBody(state);
} else {
throw new IllegalArgumentException("Unsupported metaComponentIdentifier: " + metaComponentId);
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r17120 - in root: examples-sandbox/trunk and 14 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-19 08:35:46 -0400 (Wed, 19 May 2010)
New Revision: 17120
Modified:
root/examples-sandbox/trunk/pom.xml
root/examples/pom.xml
root/ui-sandbox/componentcontrol/trunk/bom/pom.xml
root/ui-sandbox/componentcontrol/trunk/parent/pom.xml
root/ui-sandbox/componentcontrol/trunk/pom.xml
root/ui-sandbox/datascroller/trunk/bom/pom.xml
root/ui-sandbox/datascroller/trunk/parent/pom.xml
root/ui-sandbox/datascroller/trunk/pom.xml
root/ui-sandbox/pom.xml
root/ui-sandbox/tables/trunk/bom/pom.xml
root/ui-sandbox/tables/trunk/parent/pom.xml
root/ui-sandbox/tables/trunk/pom.xml
root/ui-sandbox/tables/trunk/ui/pom.xml
root/ui/core/trunk/bom/pom.xml
root/ui/core/trunk/parent/pom.xml
root/ui/core/trunk/pom.xml
Log:
correct bom/parent structure
Modified: root/examples/pom.xml
===================================================================
--- root/examples/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/examples/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<groupId>org.richfaces.examples</groupId>
Modified: root/examples-sandbox/trunk/pom.xml
===================================================================
--- root/examples-sandbox/trunk/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/examples-sandbox/trunk/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -1,5 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software 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 software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -9,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<groupId>org.richfaces</groupId>
Modified: root/ui/core/trunk/bom/pom.xml
===================================================================
--- root/ui/core/trunk/bom/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui/core/trunk/bom/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/core/trunk/parent/pom.xml
===================================================================
--- root/ui/core/trunk/parent/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui/core/trunk/parent/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -25,9 +25,9 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1</version>
</parent>
<groupId>org.richfaces.ui</groupId>
@@ -36,10 +36,6 @@
<name>Richfaces UI Components: Core Parent</name>
<packaging>pom</packaging>
- <modules>
- <module>../api</module>
- </modules>
-
<dependencyManagement>
<dependencies>
<dependency>
@@ -88,6 +84,14 @@
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <fail>false</fail>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
<configuration>
Modified: root/ui/core/trunk/pom.xml
===================================================================
--- root/ui/core/trunk/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui/core/trunk/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<groupId>org.richfaces.ui</groupId>
@@ -39,6 +39,7 @@
<modules>
<module>bom</module>
<module>parent</module>
+ <module>api</module>
</modules>
<build>
Modified: root/ui-sandbox/componentcontrol/trunk/bom/pom.xml
===================================================================
--- root/ui-sandbox/componentcontrol/trunk/bom/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui-sandbox/componentcontrol/trunk/bom/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
@@ -51,10 +51,10 @@
</dependency>
<dependency>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>core-api</artifactId>
- <version>${richfaces.core.api.version}</version>
- </dependency>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core-api</artifactId>
+ <version>${richfaces.core.api.version}</version>
+ </dependency>
<dependency>
<groupId>org.richfaces.ui-sandbox</groupId>
<artifactId>component-control-api</artifactId>
Modified: root/ui-sandbox/componentcontrol/trunk/parent/pom.xml
===================================================================
--- root/ui-sandbox/componentcontrol/trunk/parent/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui-sandbox/componentcontrol/trunk/parent/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -25,21 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>component-control-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
<artifactId>component-control-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
<name>Richfaces UI Components: Component Control Parent Module</name>
<packaging>pom</packaging>
- <modules>
- <!--module>../api</module-->
- <module>../ui</module>
- </modules>
-
<dependencyManagement>
<dependencies>
<dependency>
Modified: root/ui-sandbox/componentcontrol/trunk/pom.xml
===================================================================
--- root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -39,6 +39,8 @@
<modules>
<module>bom</module>
<module>parent</module>
+ <!--module>api</module-->
+ <module>ui</module>
</modules>
<build>
Modified: root/ui-sandbox/datascroller/trunk/bom/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/bom/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui-sandbox/datascroller/trunk/bom/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
Modified: root/ui-sandbox/datascroller/trunk/parent/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/parent/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui-sandbox/datascroller/trunk/parent/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -25,21 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>datascroller-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
<artifactId>datascroller-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
<name>Richfaces UI Components: Datascroller Parent Module</name>
<packaging>pom</packaging>
- <modules>
- <module>../api</module>
- <module>../ui</module>
- </modules>
-
<dependencyManagement>
<dependencies>
<dependency>
Modified: root/ui-sandbox/datascroller/trunk/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -39,6 +39,8 @@
<modules>
<module>bom</module>
<module>parent</module>
+ <module>api</module>
+ <module>ui</module>
</modules>
<build>
Modified: root/ui-sandbox/pom.xml
===================================================================
--- root/ui-sandbox/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui-sandbox/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
Modified: root/ui-sandbox/tables/trunk/bom/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/bom/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui-sandbox/tables/trunk/bom/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>1-SNAPSHOT</version>
+ <version>1</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
Modified: root/ui-sandbox/tables/trunk/parent/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/parent/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui-sandbox/tables/trunk/parent/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -25,22 +25,17 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>tables-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
<artifactId>tables-parent</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
<name>Richfaces UI Components: Tables Parent</name>
<packaging>pom</packaging>
- <modules>
- <module>../api</module>
- <module>../impl</module>
- <module>../ui</module>
- </modules>
-
<dependencyManagement>
<dependencies>
<dependency>
Modified: root/ui-sandbox/tables/trunk/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui-sandbox/tables/trunk/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -37,7 +37,10 @@
<modules>
<module>bom</module>
<module>parent</module>
- </modules>
+ <module>api</module>
+ <module>impl</module>
+ <module>ui</module>
+ </modules>
<build>
<plugins>
Modified: root/ui-sandbox/tables/trunk/ui/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/ui/pom.xml 2010-05-19 11:58:31 UTC (rev 17119)
+++ root/ui-sandbox/tables/trunk/ui/pom.xml 2010-05-19 12:35:46 UTC (rev 17120)
@@ -39,6 +39,7 @@
<dependency>
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -107,5 +108,4 @@
<scope>test</scope>
</dependency>
</dependencies>
-
</project>
\ No newline at end of file
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r17119 - root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-05-19 07:58:31 -0400 (Wed, 19 May 2010)
New Revision: 17119
Modified:
root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java
Log:
rename sets vars
Modified: root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2010-05-19 11:16:48 UTC (rev 17118)
+++ root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2010-05-19 11:58:31 UTC (rev 17119)
@@ -54,11 +54,11 @@
data, execute, onbeforedomupdate, onbegin, oncomplete, onerror, onevent, queueId, render, similarityGroupingId, status, disabled, limitRender, immediate, behaviorListener
}
- private static final Set<String> ALL_LIST = Collections.singleton("@all");
- private static final Set<String> FORM_LIST = Collections.singleton("@form");
- private static final Set<String> THIS_LIST = Collections.singleton("@this");
- private static final Set<String> REGION_LIST = Collections.singleton("@region");
- private static final Set<String> NONE_LIST = Collections.singleton("@none");
+ private static final Set<String> ALL = Collections.singleton("@all");
+ private static final Set<String> FORM = Collections.singleton("@form");
+ private static final Set<String> THIS = Collections.singleton("@this");
+ private static final Set<String> REGION = Collections.singleton("@region");
+ private static final Set<String> NONE = Collections.singleton("@none");
@Override
public void setLiteralAttribute(String name, Object value) {
@@ -127,15 +127,15 @@
Set<String> list;
if (AjaxRendererUtils.ALL.equals(value)) {
- list = ALL_LIST;
+ list = ALL;
} else if (AjaxRendererUtils.FORM.equals(value)) {
- list = FORM_LIST;
+ list = FORM;
} else if (AjaxRendererUtils.THIS.equals(value)) {
- list = THIS_LIST;
+ list = THIS;
} else if (AjaxRendererUtils.REGION.equals(value)) {
- list = REGION_LIST;
+ list = REGION;
} else if (AjaxRendererUtils.NONE.equals(value)) {
- list = NONE_LIST;
+ list = NONE;
} else {
throw new FacesException(value + " : Invalid id keyword specified for '" + propertyName + "' attribute");
}
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r17118 - root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/tag.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-19 07:16:48 -0400 (Wed, 19 May 2010)
New Revision: 17118
Modified:
root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/tag/BehaviorRule.java
Log:
fix checkstyle
Modified: root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/tag/BehaviorRule.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/tag/BehaviorRule.java 2010-05-19 01:06:32 UTC (rev 17117)
+++ root/ui/core/trunk/api/src/main/java/org/richfaces/view/facelets/tag/BehaviorRule.java 2010-05-19 11:16:48 UTC (rev 17118)
@@ -87,10 +87,8 @@
type = Object.class;
}
return new ValueExpressionMetadata(name, type, attribute);
- } else
+ } else if (meta != null) {
- if (meta != null) {
-
if (meta.getWriteMethod(name) != null) {
if ("execute".equals(name) || "render".equals(name)) {
return new LiteralAttributeMetadata(name, attribute.getValue());
14 years, 4 months
- 1
- 0
JBoss Rich Faces SVN: r17117 - root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-18 21:06:32 -0400 (Tue, 18 May 2010)
New Revision: 17117
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
Log:
https://jira.jboss.org/browse/RF-7856
https://jira.jboss.org/browse/RF-8630
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-19 00:44:27 UTC (rev 17116)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/ExtendedDataTableRenderer.java 2010-05-19 01:06:32 UTC (rev 17117)
@@ -90,6 +90,8 @@
private Part current;
private Iterator<Part> partIterator;
+ private EncoderVariance encoderVariance = EncoderVariance.full;
+
public RendererState(FacesContext context, UIDataTableBase table) {
super(context);
this.table = table;
@@ -148,307 +150,266 @@
return partIterator.hasNext();
}
+ public EncoderVariance getEncoderVariance() {
+ return encoderVariance;
+ }
+
+ public void setEncoderVariance(EncoderVariance encoderVariance) {
+ this.encoderVariance = encoderVariance;
+ }
}
- private class BaseTableEncoderStrategy {
-
- void encodeStartUpdate(FacesContext context, String targetId) throws IOException {
+ private enum EncoderVariance {
+ full {
+ @Override
+ public void encodeStartUpdate(FacesContext context, String targetId) throws IOException {
+ //do nothing
+ }
- }
+ @Override
+ public void encodeEndUpdate(FacesContext context) throws IOException {
+ //do nothing
+ }
+ },
- void encodeEndUpdate(FacesContext context) throws IOException {
-
- }
+ partial {
+
+ private void switchResponseWriter(FacesContext context, boolean writerState) {
+ ResponseWriter writer = context.getResponseWriter();
+ ((OnOffResponseWriter) writer).setSwitchedOn(writerState);
+ }
+
+ @Override
+ public void encodeStartUpdate(FacesContext context, String targetId) throws IOException {
+ switchResponseWriter(context, true);
+
+ context.getPartialViewContext().getPartialResponseWriter().startUpdate(targetId);
+ }
+
+ @Override
+ public void encodeEndUpdate(FacesContext context) throws IOException {
+ context.getPartialViewContext().getPartialResponseWriter().endUpdate();
+
+ switchResponseWriter(context, false);
+ }
+ };
+
+ public abstract void encodeStartUpdate(FacesContext context, String targetId) throws IOException;
- private void encodeHeaderOrFooterCell(FacesContext context, ResponseWriter writer, UIComponent column,
- String facetName) throws IOException {
- if (column.isRendered()) {
+ public abstract void encodeEndUpdate(FacesContext context) throws IOException;
+
+ }
+
+ private void encodeHeaderOrFooterCell(FacesContext context, ResponseWriter writer, UIComponent column,
+ String facetName) throws IOException {
+ if (column.isRendered()) {
- String classAttribute = facetName + "Class";
- writer.startElement(HTML.TD_ELEM, column);
- if ("header".equals(facetName)) {
- writer.startElement(HTML.DIV_ELEM, column);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-resizer-holder rich-extable-cell-width-"
- + column.getId(), null);
- writer.startElement(HTML.DIV_ELEM, column);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-resizer", null);
- writer.endElement(HTML.DIV_ELEM);
- writer.endElement(HTML.DIV_ELEM);
- }
+ String classAttribute = facetName + "Class";
+ writer.startElement(HTML.TD_ELEM, column);
+ if ("header".equals(facetName)) {
writer.startElement(HTML.DIV_ELEM, column);
- writer
- .writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rich-extable-" + facetName + "-cell",
- "rich-extable-cell-width-" + column.getId(), (String) column.getAttributes().get(classAttribute)),
- null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-resizer-holder rich-extable-cell-width-"
+ + column.getId(), null);
writer.startElement(HTML.DIV_ELEM, column);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-" + facetName + "-cell-content", null);
- UIComponent facet = column.getFacet(facetName);
- if (facet != null && facet.isRendered()) {
- facet.encodeAll(context);
- }
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-resizer", null);
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.DIV_ELEM);
- writer.endElement(HTML.TD_ELEM);
}
- }
-
- private void encodeHeaderOrFooter(RendererState state, String name) throws IOException {
- FacesContext context = state.getContext();
- ResponseWriter writer = context.getResponseWriter();
- UIDataTableBase table = state.getRow();
- if (table.isColumnFacetPresent(name)) {
- writer.startElement(HTML.DIV_ELEM, table);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rich-extable-" + name, (String) table
- .getAttributes().get(name + "Class")), null);
- writer.startElement(HTML.TABLE_ELEMENT, table);
- writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
- writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null);
- writer.startElement(HTML.TBOBY_ELEMENT, table);
- writer.startElement(HTML.TR_ELEMENT, table);
- for (state.startIterate(); state.hasNextPart();) {
- Part part = state.nextPart();
- PartName partName = part.getName();
- Iterator<UIComponent> columns = part.getColumns().iterator();
- if (columns.hasNext()) {
- writer.startElement(HTML.TD_ELEM, table);
- if (PartName.frozen.equals(partName) && "footer".equals(name)) {
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-footer-align", null);
- }
- writer.startElement(HTML.DIV_ELEM, table);
- if (PartName.frozen.equals(partName)) {
- if ("header".equals(name)) {
- writer
- .writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":frozenHeader", null);
- }
- } else {
- writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":" + name, null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable"
- + ("footer".equals(name) ? "-footer" : "") + "-part rich-extable-part-width", null);
- }
-
- String tableId = table.getClientId(context) + ":cf" + name.charAt(0) + partName.name().charAt(0);
- encodeStartUpdate(context, tableId);
-
- writer.startElement(HTML.TABLE_ELEMENT, table);
- writer.writeAttribute(HTML.ID_ATTRIBUTE, tableId, null);
- writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
- writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null);
- writer.startElement(HTML.TBOBY_ELEMENT, table);
- writer.startElement(HTML.TR_ELEMENT, table);
- while (columns.hasNext()) {
- encodeHeaderOrFooterCell(context, writer, columns.next(), name);
- }
- writer.endElement(HTML.TR_ELEMENT);
- writer.endElement(HTML.TBOBY_ELEMENT);
- writer.endElement(HTML.TABLE_ELEMENT);
-
- encodeEndUpdate(context);
-
- writer.endElement(HTML.DIV_ELEM);
- writer.endElement(HTML.TD_ELEM);
- }
- }
- writer.endElement(HTML.TR_ELEMENT);
- writer.endElement(HTML.TBOBY_ELEMENT);
- writer.endElement(HTML.TABLE_ELEMENT);
- writer.endElement(HTML.DIV_ELEM);
+ writer.startElement(HTML.DIV_ELEM, column);
+ writer
+ .writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rich-extable-" + facetName + "-cell",
+ "rich-extable-cell-width-" + column.getId(), (String) column.getAttributes().get(classAttribute)),
+ null);
+ writer.startElement(HTML.DIV_ELEM, column);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-" + facetName + "-cell-content", null);
+ UIComponent facet = column.getFacet(facetName);
+ if (facet != null && facet.isRendered()) {
+ facet.encodeAll(context);
}
+ writer.endElement(HTML.DIV_ELEM);
+ writer.endElement(HTML.DIV_ELEM);
+ writer.endElement(HTML.TD_ELEM);
}
+ }
- public void encodeHeader(RendererState state) throws IOException {
- FacesContext context = state.getContext();
- ResponseWriter writer = context.getResponseWriter();
- UIDataTableBase table = state.getRow();
-
- UIComponent header = table.getFacet("header");
- if (header != null && header.isRendered()) {
- String elementId = table.getClientId(context) + ":tfh";
-
- encodeStartUpdate(context, elementId);
-
- writer.startElement(HTML.DIV_ELEM, table);
- writer.writeAttribute(HTML.ID_ATTRIBUTE, elementId, null);
- header.encodeAll(context);
- writer.endElement(HTML.DIV_ELEM);
-
- encodeEndUpdate(context);
- }
-
- encodeHeaderOrFooter(state, "header");
- }
-
- public void encodeBody(RendererState state) throws IOException {
- FacesContext context = state.getContext();
- ResponseWriter writer = context.getResponseWriter();
- UIDataTableBase table = state.getRow();
+ private void encodeHeaderOrFooter(RendererState state, String name) throws IOException {
+ FacesContext context = state.getContext();
+ ResponseWriter writer = context.getResponseWriter();
+ UIDataTableBase table = state.getRow();
+ if (table.isColumnFacetPresent(name)) {
writer.startElement(HTML.DIV_ELEM, table);
- writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":b", null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-body", null);
- if (table.getRowCount() == 0) {
- UIComponent facet = table.getFacet("noData");
- if (facet != null && facet.isRendered()) {
- facet.encodeAll(context);
- } else {
- Object noDataLabel = table.getAttributes().get("noDataLabel");
- if (noDataLabel != null) {
- writer.writeText(noDataLabel, "noDataLabel");
- }
- }
- } else {
- table.getAttributes().put("clientFirst", 0);
- writer.startElement(HTML.DIV_ELEM, table);
- writer.startElement(HTML.DIV_ELEM, table);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-spacer", null);
- writer.endElement(HTML.DIV_ELEM);
- writer.startElement(HTML.TABLE_ELEMENT, table);
- writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
- writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null);
- writer.startElement(HTML.TBOBY_ELEMENT, table);
- writer.startElement(HTML.TR_ELEMENT, table);
- for (state.startIterate(); state.hasNextPart();) {
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, HtmlUtil.concatClasses("rich-extable-" + name, (String) table
+ .getAttributes().get(name + "Class")), null);
+ writer.startElement(HTML.TABLE_ELEMENT, table);
+ writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
+ writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null);
+ writer.startElement(HTML.TBOBY_ELEMENT, table);
+ writer.startElement(HTML.TR_ELEMENT, table);
+ for (state.startIterate(); state.hasNextPart();) {
+ Part part = state.nextPart();
+ PartName partName = part.getName();
+ Iterator<UIComponent> columns = part.getColumns().iterator();
+ if (columns.hasNext()) {
writer.startElement(HTML.TD_ELEM, table);
+ if (PartName.frozen.equals(partName) && "footer".equals(name)) {
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-footer-align", null);
+ }
writer.startElement(HTML.DIV_ELEM, table);
- PartName partName = state.nextPart().getName();
- if (PartName.normal.equals(partName)) {
- writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":body", null);
- writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-part rich-extable-part-width", null);
+ if (PartName.frozen.equals(partName)) {
+ if ("header".equals(name)) {
+ writer
+ .writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":frozenHeader", null);
+ }
+ } else {
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":" + name, null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable"
+ + ("footer".equals(name) ? "-footer" : "") + "-part rich-extable-part-width", null);
}
-
- String targetId = table.getClientId(context) + ":tbt" + partName.name().charAt(0);
-
- encodeStartUpdate(context, targetId);
-
+
+ String tableId = table.getClientId(context) + ":cf" + name.charAt(0) + partName.name().charAt(0);
+ EncoderVariance encoderVariance = state.getEncoderVariance();
+ encoderVariance.encodeStartUpdate(context, tableId);
+
writer.startElement(HTML.TABLE_ELEMENT, table);
- writer.writeAttribute(HTML.ID_ATTRIBUTE, targetId, null);
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, tableId, null);
writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null);
writer.startElement(HTML.TBOBY_ELEMENT, table);
- writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":tb"
- + partName.toString().charAt(0), null);
- encodeRows(state);
+ writer.startElement(HTML.TR_ELEMENT, table);
+ while (columns.hasNext()) {
+ encodeHeaderOrFooterCell(context, writer, columns.next(), name);
+ }
+ writer.endElement(HTML.TR_ELEMENT);
writer.endElement(HTML.TBOBY_ELEMENT);
writer.endElement(HTML.TABLE_ELEMENT);
-
- encodeEndUpdate(context);
-
+
+ encoderVariance.encodeEndUpdate(context);
+
writer.endElement(HTML.DIV_ELEM);
writer.endElement(HTML.TD_ELEM);
}
- writer.endElement(HTML.TR_ELEMENT);
- writer.endElement(HTML.TBOBY_ELEMENT);
- writer.endElement(HTML.TABLE_ELEMENT);
- writer.endElement(HTML.DIV_ELEM);
}
+ writer.endElement(HTML.TR_ELEMENT);
+ writer.endElement(HTML.TBOBY_ELEMENT);
+ writer.endElement(HTML.TABLE_ELEMENT);
writer.endElement(HTML.DIV_ELEM);
}
+ }
- public void encodeFooter(RendererState state) throws IOException {
- FacesContext context = state.getContext();
- ResponseWriter writer = context.getResponseWriter();
- UIDataTableBase table = state.getRow();
-
- encodeHeaderOrFooter(state, "footer");
-
- UIComponent footer = table.getFacet("footer");
- if (footer != null && footer.isRendered()) {
- String elementId = table.getClientId(context) + ":tff";
-
- encodeStartUpdate(context, elementId);
-
- writer.startElement(HTML.DIV_ELEM, table);
- writer.writeAttribute(HTML.ID_ATTRIBUTE, elementId, null);
- footer.encodeAll(context);
- writer.endElement(HTML.DIV_ELEM);
+ public void encodeHeader(RendererState state) throws IOException {
+ FacesContext context = state.getContext();
+ ResponseWriter writer = context.getResponseWriter();
+ UIDataTableBase table = state.getRow();
- encodeEndUpdate(context);
- }
+ UIComponent header = table.getFacet("header");
+ if (header != null && header.isRendered()) {
+ String elementId = table.getClientId(context) + ":tfh";
+
+ EncoderVariance encoderVariance = state.getEncoderVariance();
+ encoderVariance.encodeStartUpdate(context, elementId);
+
+ writer.startElement(HTML.DIV_ELEM, table);
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, elementId, null);
+ header.encodeAll(context);
+ writer.endElement(HTML.DIV_ELEM);
+
+ encoderVariance.encodeEndUpdate(context);
}
-
- public void encodeMetaComponent(RendererState state, String metaComponentId) throws IOException {
- if (UIExtendedDataTable.HEADER.equals(metaComponentId)) {
- encodeHeader(state);
- } else if (UIExtendedDataTable.FOOTER.equals(metaComponentId)) {
- encodeFooter(state);
- } else if (UIExtendedDataTable.BODY.equals(metaComponentId)) {
- encodeBody(state);
- } else {
- throw new IllegalArgumentException("Unsupported metaComponentIdentifier: " + metaComponentId);
- }
- }
+
+ encodeHeaderOrFooter(state, "header");
}
- private class PartialTableEncoderStrategy extends BaseTableEncoderStrategy {
- private void switchResponseWriter(FacesContext context, boolean writerState) {
- ResponseWriter writer = context.getResponseWriter();
- if (writer instanceof OnOffResponseWriter) {
- ((OnOffResponseWriter) writer).setSwitchedOn(writerState);
+ public void encodeBody(RendererState state) throws IOException {
+ FacesContext context = state.getContext();
+ ResponseWriter writer = context.getResponseWriter();
+ UIDataTableBase table = state.getRow();
+
+ //TODO nick - add startUpdate(...) for "noData" case
+
+ writer.startElement(HTML.DIV_ELEM, table);
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":b", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-body", null);
+ if (table.getRowCount() == 0) {
+ UIComponent facet = table.getFacet("noData");
+ if (facet != null && facet.isRendered()) {
+ facet.encodeAll(context);
+ } else {
+ Object noDataLabel = table.getAttributes().get("noDataLabel");
+ if (noDataLabel != null) {
+ writer.writeText(noDataLabel, "noDataLabel");
+ }
}
- }
-
- private ResponseWriter install(FacesContext context) {
- ResponseWriter writer = context.getResponseWriter();
-
- assert !(writer instanceof OnOffResponseWriter);
-
- context.setResponseWriter(new OnOffResponseWriter(writer));
-
- return writer;
- }
-
- private void uninstall(FacesContext context, ResponseWriter initialResponseWriter) {
- ResponseWriter writer = context.getResponseWriter();
+ } else {
+ table.getAttributes().put("clientFirst", 0);
+ writer.startElement(HTML.DIV_ELEM, table);
+ writer.startElement(HTML.DIV_ELEM, table);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-spacer", null);
+ writer.endElement(HTML.DIV_ELEM);
+ writer.startElement(HTML.TABLE_ELEMENT, table);
+ writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
+ writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null);
+ writer.startElement(HTML.TBOBY_ELEMENT, table);
+ writer.startElement(HTML.TR_ELEMENT, table);
+ for (state.startIterate(); state.hasNextPart();) {
+ writer.startElement(HTML.TD_ELEM, table);
+ writer.startElement(HTML.DIV_ELEM, table);
+ PartName partName = state.nextPart().getName();
+ if (PartName.normal.equals(partName)) {
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":body", null);
+ writer.writeAttribute(HTML.CLASS_ATTRIBUTE, "rich-extable-part rich-extable-part-width", null);
+ }
- assert (writer instanceof OnOffResponseWriter);
-
- context.setResponseWriter(initialResponseWriter);
- }
+ String targetId = table.getClientId(context) + ":tbt" + partName.name().charAt(0);
- public void encodeHeader(RendererState state) throws IOException {
- FacesContext context = state.getContext();
- ResponseWriter writer = install(context);
- try {
- super.encodeHeader(state);
- } finally {
- uninstall(context, writer);
+ EncoderVariance encoderVariance = state.getEncoderVariance();
+ encoderVariance.encodeStartUpdate(context, targetId);
+
+ writer.startElement(HTML.TABLE_ELEMENT, table);
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, targetId, null);
+ writer.writeAttribute(HTML.CELLPADDING_ATTRIBUTE, "0", null);
+ writer.writeAttribute(HTML.CELLSPACING_ATTRIBUTE, "0", null);
+ writer.startElement(HTML.TBOBY_ELEMENT, table);
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, table.getClientId(context) + ":tb"
+ + partName.toString().charAt(0), null);
+ encodeRows(state);
+ writer.endElement(HTML.TBOBY_ELEMENT);
+ writer.endElement(HTML.TABLE_ELEMENT);
+
+ encoderVariance.encodeEndUpdate(context);
+
+ writer.endElement(HTML.DIV_ELEM);
+ writer.endElement(HTML.TD_ELEM);
}
- };
-
- public void encodeBody(RendererState state) throws IOException {
- FacesContext context = state.getContext();
- ResponseWriter writer = install(context);
- try {
- super.encodeBody(state);
- } finally {
- uninstall(context, writer);
- }
- };
-
- public void encodeFooter(RendererState state) throws IOException {
- FacesContext context = state.getContext();
- ResponseWriter writer = install(context);
- try {
- super.encodeFooter(state);
- } finally {
- uninstall(context, writer);
- }
- };
-
- void encodeStartUpdate(FacesContext context, String targetId) throws IOException {
- switchResponseWriter(context, true);
-
- context.getPartialViewContext().getPartialResponseWriter().startUpdate(targetId);
+ writer.endElement(HTML.TR_ELEMENT);
+ writer.endElement(HTML.TBOBY_ELEMENT);
+ writer.endElement(HTML.TABLE_ELEMENT);
+ writer.endElement(HTML.DIV_ELEM);
}
-
- void encodeEndUpdate(FacesContext context) throws IOException {
- context.getPartialViewContext().getPartialResponseWriter().endUpdate();
-
- switchResponseWriter(context, false);
- }
+ writer.endElement(HTML.DIV_ELEM);
}
- private BaseTableEncoderStrategy fullEncodeStrategy = new BaseTableEncoderStrategy();
+ public void encodeFooter(RendererState state) throws IOException {
+ FacesContext context = state.getContext();
+ ResponseWriter writer = context.getResponseWriter();
+ UIDataTableBase table = state.getRow();
- private BaseTableEncoderStrategy partialEncodeStrategy = new PartialTableEncoderStrategy();
+ encodeHeaderOrFooter(state, "footer");
+
+ UIComponent footer = table.getFacet("footer");
+ if (footer != null && footer.isRendered()) {
+ String elementId = table.getClientId(context) + ":tff";
+
+ EncoderVariance encoderVariance = state.getEncoderVariance();
+ encoderVariance.encodeStartUpdate(context, elementId);
+
+ writer.startElement(HTML.DIV_ELEM, table);
+ writer.writeAttribute(HTML.ID_ATTRIBUTE, elementId, null);
+ footer.encodeAll(context);
+ writer.endElement(HTML.DIV_ELEM);
+
+ encoderVariance.encodeEndUpdate(context);
+ }
+ }
@Override
protected Class<? extends UIComponent> getComponentClass() {
@@ -543,8 +504,28 @@
table.restoreOrigValue(context);
}
} else {
- RendererState state = createRowHolder(context, component);
- partialEncodeStrategy.encodeMetaComponent(state, metaComponentId);
+
+ ResponseWriter initialWriter = context.getResponseWriter();
+ assert !(initialWriter instanceof OnOffResponseWriter);
+
+ try {
+ context.setResponseWriter(new OnOffResponseWriter(initialWriter));
+
+ RendererState state = createRowHolder(context, component);
+ state.setEncoderVariance(EncoderVariance.partial);
+
+ if (UIExtendedDataTable.HEADER.equals(metaComponentId)) {
+ encodeHeader(state);
+ } else if (UIExtendedDataTable.FOOTER.equals(metaComponentId)) {
+ encodeFooter(state);
+ } else if (UIExtendedDataTable.BODY.equals(metaComponentId)) {
+ encodeBody(state);
+ } else {
+ throw new IllegalArgumentException("Unsupported metaComponentIdentifier: " + metaComponentId);
+ }
+ } finally {
+ context.setResponseWriter(initialWriter);
+ }
}
}
@@ -572,10 +553,10 @@
table.captureOrigValue(context);
table.setRowKey(context, null);
RendererState state = createRowHolder(context, table);
- fullEncodeStrategy.encodeHeader(state);
+ encodeHeader(state);
encodeStyle(state);
- fullEncodeStrategy.encodeBody(state);
- fullEncodeStrategy.encodeFooter(state);
+ encodeBody(state);
+ encodeFooter(state);
table.setRowKey(context, key);
table.restoreOrigValue(context);
}
14 years, 4 months
- 1
- 0