JBoss Rich Faces SVN: r9523 - trunk/ui/listShuttle/src/main/templates/org/richfaces.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-07-11 07:15:16 -0400 (Fri, 11 Jul 2008)
New Revision: 9523
Modified:
trunk/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
Log:
RF-3830
Modified: trunk/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx
===================================================================
--- trunk/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2008-07-11 10:51:59 UTC (rev 9522)
+++ trunk/ui/listShuttle/src/main/templates/org/richfaces/htmlListShuttle.jspx 2008-07-11 11:15:16 UTC (rev 9523)
@@ -18,7 +18,8 @@
<h:scripts>
new org.ajax4jsf.javascript.PrototypeScript(),
- scripts/ShuttleUtils.js
+ /org/richfaces/renderkit/html/scripts/utils.js,
+ scripts/ShuttleUtils.js,
scripts/SelectItem.js,
scripts/LayoutManager.js
scripts/Control.js,
16 years, 2 months
JBoss Rich Faces SVN: r9522 - trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-07-11 06:51:59 -0400 (Fri, 11 Jul 2008)
New Revision: 9522
Modified:
trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
Log:
add FF3 check method
Modified: trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js
===================================================================
--- trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2008-07-11 10:50:54 UTC (rev 9521)
+++ trunk/framework/impl/src/main/resources/org/richfaces/renderkit/html/scripts/utils.js 2008-07-11 10:51:59 UTC (rev 9522)
@@ -160,7 +160,8 @@
isIE6: (!window.opera && /MSIE\s*[6][\d,\.]+;/.test(navigator.userAgent)),
isSafari: /Safari/.test(navigator.userAgent),
isOpera: !!window.opera,
- isObjectEval: (Richfaces.eval!=undefined)
+ isObjectEval: (Richfaces.eval!=undefined),
+ isFF3: (!window.opera && /Firefox\s*[\/]3[\.]/.test(navigator.userAgent))
};
Richfaces.eval = function(template, object) {
16 years, 2 months
JBoss Rich Faces SVN: r9521 - in trunk/ui/orderingList/src/main: templates/org/richfaces and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: abelevich
Date: 2008-07-11 06:50:54 -0400 (Fri, 11 Jul 2008)
New Revision: 9521
Modified:
trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
trunk/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
Log:
RF-3830
Modified: trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js
===================================================================
--- trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2008-07-11 10:10:03 UTC (rev 9520)
+++ trunk/ui/orderingList/src/main/resources/org/richfaces/renderkit/html/scripts/ListBase.js 2008-07-11 10:50:54 UTC (rev 9521)
@@ -59,14 +59,32 @@
this.controlClass = controlClass;
this.retrieveShuttleItems(containerId, controlClass);
-
+ this.counter;
this.shuttle = null;
this.sortOrder = Richfaces.ListBase.ASC;
this.clckHandler = function(e) {this.onclickHandler(window.event || e)}.bindAsEventListener(this);
this.shuttleTable.observe("click", this.clckHandler);
this.layoutManager = new LayoutManager(headerTableId, contentTableId);
+//--- http://jira.jboss.com/jira/browse/RF-3830 FF3 & Safari only!
+ this.tableElement = document.getElementById(contentTableId);
+ var rows = this.tableElement.tBodies[0].rows;
+ if (rows && rows[0]) {
+ this.firstTrElement = rows[0];
+ if (this.firstTrElement.addEventListener && (Richfaces.browser.isFF3 || Richfaces.browser.isSafari)) {
+ this.imagesOnLoad = this.imageLoadListener.bind(this);
+ this.firstTrElement.addEventListener('load',this.imagesOnLoad, true);
+ }
+ }
+//---
+ this.layoutManager.widthSynchronization();
+ },
+
+ imageLoadListener: function (evt){
this.layoutManager.widthSynchronization();
+ if (this.firstTrElement.removeEventListener && (Richfaces.browser.isFF3 || Richfaces.browser.isSafari)) {
+ this.firstTrElement.removeEventListener('load',this.imagesOnLoad, true);
+ }
},
destroy: function() {
@@ -75,6 +93,7 @@
for (var i = 0; i < items.length; i++) {
items[i].destroy();
}
+
},
setActiveItem : function(newActiveItem) {
Modified: trunk/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx
===================================================================
--- trunk/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2008-07-11 10:10:03 UTC (rev 9520)
+++ trunk/ui/orderingList/src/main/templates/org/richfaces/htmlOrderingList.jspx 2008-07-11 10:50:54 UTC (rev 9521)
@@ -17,6 +17,7 @@
<h:scripts>
new org.ajax4jsf.javascript.PrototypeScript(),
+ /org/richfaces/renderkit/html/scripts/utils.js,
scripts/ShuttleUtils.js,
scripts/SelectItem.js,
scripts/LayoutManager.js
16 years, 2 months
JBoss Rich Faces SVN: r9520 - in trunk/test-applications/facelets/src/main/webapp/pages: Info and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: mvitenkov
Date: 2008-07-11 06:10:03 -0400 (Fri, 11 Jul 2008)
New Revision: 9520
Added:
trunk/test-applications/facelets/src/main/webapp/pages/Info/
trunk/test-applications/facelets/src/main/webapp/pages/Info/Info.xhtml
Log:
Added: trunk/test-applications/facelets/src/main/webapp/pages/Info/Info.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/pages/Info/Info.xhtml (rev 0)
+++ trunk/test-applications/facelets/src/main/webapp/pages/Info/Info.xhtml 2008-07-11 10:10:03 UTC (rev 9520)
@@ -0,0 +1,34 @@
+<!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">
+
+ <f:subview id="infoSubview">
+ <h:panelGrid columns="2">
+ <h:outputText value="style:"></h:outputText>
+ <h:dataTable id="styleTableID" value="#{info.style}" var="info">
+ <h:column>
+ <h:outputText value="#{info.key}"></h:outputText>
+ </h:column>
+ <h:column>
+ <h:outputText value="#{info.value}"></h:outputText>
+ </h:column>
+ </h:dataTable>
+
+ <h:outputText value="attribute"></h:outputText>
+ <h:selectBooleanCheckbox value="#{option.attribute}" onchange="submit();"></h:selectBooleanCheckbox>
+
+
+ <h:outputText value="attribute:" rendered="#{option.attribute}"></h:outputText>
+ <h:dataTable id="attributeTableID" rendered="#{option.attribute}" value="#{info.attribute}" var="info">
+ <h:column>
+ <h:outputText value="#{info.key}"></h:outputText>
+ </h:column>
+ <h:column>
+ <h:outputText value="#{info.value}"></h:outputText>
+ </h:column>
+ </h:dataTable>
+ </h:panelGrid>
+</f:subview>
+</html>
\ No newline at end of file
16 years, 2 months
JBoss Rich Faces SVN: r9519 - in trunk/test-applications/facelets/src/main: java/sb and 20 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: mvitenkov
Date: 2008-07-11 05:12:26 -0400 (Fri, 11 Jul 2008)
New Revision: 9519
Modified:
trunk/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java
trunk/test-applications/facelets/src/main/java/sb/Sb.java
trunk/test-applications/facelets/src/main/java/separator/Separator.java
trunk/test-applications/facelets/src/main/java/spacer/Spacer.java
trunk/test-applications/facelets/src/main/java/tabPanel/TabPanel.java
trunk/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java
trunk/test-applications/facelets/src/main/java/toolBar/ToolBar.java
trunk/test-applications/facelets/src/main/java/tooltip/Tooltip.java
trunk/test-applications/facelets/src/main/java/tree/Bean.java
trunk/test-applications/facelets/src/main/java/virtualEarth/VirtualEarth.java
trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml
trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml
trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml
trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml
trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml
trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml
trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml
trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml
trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml
trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBarProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml
trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml
trunk/test-applications/facelets/src/main/webapp/Tree/TreeProperty.xhtml
trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml
trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml
Log:
Modified: trunk/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/java/sTP/SimpleTogglePanel.java 2008-07-11 09:12:26 UTC (rev 9519)
@@ -2,6 +2,10 @@
import javax.faces.event.ActionEvent;
+import org.richfaces.component.html.HtmlSimpleTogglePanel;
+
+import util.componentInfo.ComponentInfo;
+
public class SimpleTogglePanel {
private String switchType; // "client", "server"(default), "ajax"
@@ -12,7 +16,22 @@
private boolean rendered;
private String action;
private String actionListener;
+ private HtmlSimpleTogglePanel htmlSTP = null;
+ public HtmlSimpleTogglePanel getHtmlSTP() {
+ return htmlSTP;
+ }
+
+ public void setHtmlSTP(HtmlSimpleTogglePanel htmlSTP) {
+ this.htmlSTP = htmlSTP;
+ }
+
+ public String add(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlSTP);
+ return null;
+ }
+
public SimpleTogglePanel() {
width = "75%";
height = "100%";
Modified: trunk/test-applications/facelets/src/main/java/sb/Sb.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/sb/Sb.java 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/java/sb/Sb.java 2008-07-11 09:12:26 UTC (rev 9519)
@@ -8,6 +8,8 @@
import org.richfaces.component.html.HtmlSuggestionBox;
import org.richfaces.renderkit.html.SuggestionBoxRenderer;
+import util.componentInfo.ComponentInfo;
+
public class Sb implements Serializable {
private ArrayList cities;
@@ -35,6 +37,7 @@
private String value;
private String dir;
private int requestDelay;
+ private HtmlSuggestionBox htmlSB = null;
/*
* private static final String[] cit = { "Abba", "Abbeville", "Acworth",
@@ -97,6 +100,12 @@
return result;
}
+ public String add(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlSB);
+ return null;
+ }
+
public ArrayList getCities() {
return cities;
}
@@ -404,4 +413,12 @@
public void setDir(String dir) {
this.dir = dir;
}
+
+ public HtmlSuggestionBox getHtmlSB() {
+ return htmlSB;
+ }
+
+ public void setHtmlSB(HtmlSuggestionBox htmlSB) {
+ this.htmlSB = htmlSB;
+ }
}
Modified: trunk/test-applications/facelets/src/main/java/separator/Separator.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/separator/Separator.java 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/java/separator/Separator.java 2008-07-11 09:12:26 UTC (rev 9519)
@@ -1,5 +1,9 @@
package separator;
+import org.richfaces.component.html.HtmlSeparator;
+
+import util.componentInfo.ComponentInfo;
+
public class Separator {
@@ -11,10 +15,14 @@
private String align;
private String btnLabel="ON";
private String style;
-
+ private HtmlSeparator htmlSeparator = null;
private boolean rendered;
-
+ public String add(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlSeparator);
+ return null;
+ }
public String getBtnLabel() {
return btnLabel;
@@ -171,4 +179,16 @@
setLineType("solid");
setTitle("Test5");
}
+
+
+
+ public HtmlSeparator getHtmlSeparator() {
+ return htmlSeparator;
+ }
+
+
+
+ public void setHtmlSeparator(HtmlSeparator htmlSeparator) {
+ this.htmlSeparator = htmlSeparator;
+ }
}
Modified: trunk/test-applications/facelets/src/main/java/spacer/Spacer.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/spacer/Spacer.java 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/java/spacer/Spacer.java 2008-07-11 09:12:26 UTC (rev 9519)
@@ -1,5 +1,9 @@
package spacer;
+import org.richfaces.component.html.HtmlSpacer;
+
+import util.componentInfo.ComponentInfo;
+
public class Spacer {
private String width;
@@ -8,7 +12,22 @@
private String btn;
private String title;
private boolean rendered;
+ private HtmlSpacer htmlSpacer = null;
+ public HtmlSpacer getHtmlSpacer() {
+ return htmlSpacer;
+ }
+
+ public void setHtmlSpacer(HtmlSpacer htmlSpacer) {
+ this.htmlSpacer = htmlSpacer;
+ }
+
+ public String add(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlSpacer);
+ return null;
+ }
+
public Spacer() {
title = "title text";
height = "50px";
Modified: trunk/test-applications/facelets/src/main/java/tabPanel/TabPanel.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/tabPanel/TabPanel.java 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/java/tabPanel/TabPanel.java 2008-07-11 09:12:26 UTC (rev 9519)
@@ -1,5 +1,9 @@
package tabPanel;
+import org.richfaces.component.html.HtmlTabPanel;
+
+import util.componentInfo.ComponentInfo;
+
public class TabPanel {
private String width;
@@ -9,7 +13,6 @@
private String headerAlignment; //"left", "center" and "right".
private String headerSpacing;
private String selectedTab;
- //private String timeout;
private String labelWidth;
private String label;
private String activeTabStyle;
@@ -18,8 +21,7 @@
private String contentStyle;
private String BtnLabel="ON";
private boolean immediate;
-
-
+ private HtmlTabPanel htmlTabPanel = null;
private boolean rendered;
private boolean disabledTab;
@@ -60,6 +62,13 @@
setInactiveTabStyle(null);
}
}
+
+ public String add(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlTabPanel);
+ return null;
+ }
+
public String getHeaderAlignment() {
return headerAlignment;
}
@@ -266,4 +275,12 @@
setTitle("Title test 5");
}
+ public HtmlTabPanel getHtmlTabPanel() {
+ return htmlTabPanel;
+ }
+
+ public void setHtmlTabPanel(HtmlTabPanel htmlTabPanel) {
+ this.htmlTabPanel = htmlTabPanel;
+ }
+
}
Modified: trunk/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/java/togglePanel/TogglePanel.java 2008-07-11 09:12:26 UTC (rev 9519)
@@ -1,13 +1,30 @@
package togglePanel;
+import org.richfaces.component.html.HtmlTogglePanel;
+
+import util.componentInfo.ComponentInfo;
+
public class TogglePanel {
private String initialState;
private String stateOrder;
private String switchType;
+ private HtmlTogglePanel htmlToglePanel = null;
+ public HtmlTogglePanel getHtmlToglePanel() {
+ return htmlToglePanel;
+ }
+ public void setHtmlToglePanel(HtmlTogglePanel htmlToglePanel) {
+ this.htmlToglePanel = htmlToglePanel;
+ }
+ public String add(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlToglePanel);
+ return null;
+ }
+
public TogglePanel() {
initialState="asus";
switchType="server";
Modified: trunk/test-applications/facelets/src/main/java/toolBar/ToolBar.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/toolBar/ToolBar.java 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/java/toolBar/ToolBar.java 2008-07-11 09:12:26 UTC (rev 9519)
@@ -1,12 +1,16 @@
package toolBar;
+import org.richfaces.component.html.HtmlToolBar;
+
+import util.componentInfo.ComponentInfo;
+
public class ToolBar {
private String width;
private String height;
private String itemSeparator;//none, line, square, disc and grid
private String location;//A location of a group on a menu bar. Possible values are left and right
-
+ private HtmlToolBar htmlToolBar = null;
private String contentStyle;
private String separatorStyle;
private String btnLabel="ON";
@@ -39,6 +43,12 @@
}
}
+ public String add(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlToolBar);
+ return null;
+ }
+
public String getHeight() {
return height;
}
@@ -131,4 +141,14 @@
this.btnLabel = btnLabel;
}
+
+ public HtmlToolBar getHtmlToolBar() {
+ return htmlToolBar;
+ }
+
+
+ public void setHtmlToolBar(HtmlToolBar htmlToolBar) {
+ this.htmlToolBar = htmlToolBar;
+ }
+
}
Modified: trunk/test-applications/facelets/src/main/java/tooltip/Tooltip.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/tooltip/Tooltip.java 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/java/tooltip/Tooltip.java 2008-07-11 09:12:26 UTC (rev 9519)
@@ -1,5 +1,9 @@
package tooltip;
+import org.richfaces.component.html.HtmlToolTip;
+
+import util.componentInfo.ComponentInfo;
+
public class Tooltip {
private boolean followMouse;
@@ -16,7 +20,22 @@
private String style;
private String layout;
private String event;
+ private HtmlToolTip htmlToolTip = null;
+ public HtmlToolTip getHtmlToolTip() {
+ return htmlToolTip;
+ }
+
+ public void setHtmlToolTip(HtmlToolTip htmlToolTip) {
+ this.htmlToolTip = htmlToolTip;
+ }
+
+ public String add(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlToolTip);
+ return null;
+ }
+
public String getEvent() {
return event;
}
Modified: trunk/test-applications/facelets/src/main/java/tree/Bean.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/tree/Bean.java 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/java/tree/Bean.java 2008-07-11 09:12:26 UTC (rev 9519)
@@ -26,6 +26,8 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
+import util.componentInfo.ComponentInfo;
+
public class Bean {
private String switchType = "client";
private TreeNode data;
@@ -91,6 +93,12 @@
}
}
+ public String add(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(tree);
+ return null;
+ }
+
public String getIcon() {
return icon;
}
Modified: trunk/test-applications/facelets/src/main/java/virtualEarth/VirtualEarth.java
===================================================================
--- trunk/test-applications/facelets/src/main/java/virtualEarth/VirtualEarth.java 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/java/virtualEarth/VirtualEarth.java 2008-07-11 09:12:26 UTC (rev 9519)
@@ -1,5 +1,9 @@
package virtualEarth;
+import org.richfaces.component.html.HtmlVirtualEarth;
+
+import util.componentInfo.ComponentInfo;
+
public class VirtualEarth {
private String zoom;
private String version;
@@ -8,7 +12,22 @@
private boolean rendered;
private String dashboardSize;
private String mapStyle;
+ private HtmlVirtualEarth htmlVirtualEarth = null;
+ public HtmlVirtualEarth getHtmlVirtualEarth() {
+ return htmlVirtualEarth;
+ }
+
+ public void setHtmlVirtualEarth(HtmlVirtualEarth htmlVirtualEarth) {
+ this.htmlVirtualEarth = htmlVirtualEarth;
+ }
+
+ public String add(){
+ ComponentInfo info = ComponentInfo.getInstance();
+ info.addField(htmlVirtualEarth);
+ return null;
+ }
+
public VirtualEarth() {
version = "6";
zoom = "17";
Modified: trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/ModalPanel/ModalPanel.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -115,11 +115,11 @@
<f:facet name="controls">
<h:graphicImage value="/pics/error.gif"
onclick="Richfaces.hideModalPanel('modalPanelID2');return false;" />
- <h:form>
+
<a4j:commandLink action="#"
oncomplete="Richfaces.hideModalPanel('modalPanelID2')"
value="close" />
- </h:form>
+
</f:facet>
<h:inputText value="#{sb.property}" id="text" />
<rich:suggestionbox id="suggestionBoxId" eventsQueue="myEventsQueue"
Modified: trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTable.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -31,6 +31,7 @@
</h:panelGrid>
<rich:scrollableDataTable id="sdt" var="sdt" rowKeyVar="key" onRowDblClick="alert('row:#{key}')"
ajaxSingle="#{scrollableDT.ajaxSingle}"
+ binding="#{scrollableDT.htmlScrollableDataTable}"
value="#{scrollableDT.data}" rows="#{scrollableDT.rows}"
width="#{scrollableDT.width}" height="#{scrollableDT.height}"
hideWhenScrolling="#{scrollableDT.hideWhenScrolling}"
@@ -38,6 +39,7 @@
first="#{scrollableDT.first}" ignoreDupResponses="#{scrollableDT.ignoreDupResponses}"
bypassUpdates="#{scrollableDT.bypassUpdates}" rendered="#{scrollableDT.rendered}"
limitToList="#{scrollableDT.limitToList}"
+
timeout="#{scrollableDT.timeout}" sortMode="#{scrollableDT.sortMode}"
selection="#{scrollableDT.selection}" eventsQueue="myEventsQueue"
captionClass="#{style.captionClass}" columnClasses="#{style.columnClasses}" footerClass="#{style.footerClass}" headerClass="#{style.headerClass}" rowClasses="#{style.rowClasses}" activeClass="#{style.activeClass}" styleClass="#{style.styleClass}" style="#{style.style}" selectedClass="#{style.selectedClass}"
Modified: trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/ScrollableDataTable/ScrollableDataTableProperty.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -1,5 +1,6 @@
<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="scrollableDataTablePropertySubviewID">
+<h:commandButton action="#{scrollableDT.addHtmlScrollableDataTable}" value="add test" />
<h:panelGrid columns="2">
<h:outputText value="length:"></h:outputText>
<h:panelGroup>
Modified: trunk/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/Separator/Separator.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -4,7 +4,12 @@
<rich:separator id="separatorId" rendered="#{separator.rendered}" width="#{separator.width}" height="#{separator.height}"
title="#{separator.title}" lineType="#{separator.lineType}" align="#{separator.align}"
style="#{style.style}" styleClass="#{style.styleClass}"
- onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"></rich:separator>
+ onclick="#{event.onclick}" ondblclick="#{event.ondblclick}"
+ onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}"
+ onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
+ onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
+ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"
+ binding="#{separator.htmlSeparator}"></rich:separator>
<h:outputText value="Some text two..." styleClass="text"></h:outputText>
<rich:spacer height="20px"></rich:spacer>
</f:subview>
Modified: trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorProperty.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/Separator/SeparatorProperty.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -4,6 +4,7 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich" id="SeparatorPropertySubviewID">
+ <h:commandButton action="#{separator.add}" value="add test" />
<h:panelGrid columns="2">
<h:outputText value="Width (px or %): "></h:outputText>
<h:inputText value="#{separator.width}">
Modified: trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanel.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -17,7 +17,11 @@
<rich:simpleTogglePanel id="sTP" bodyClass="body" headerClass="head" label="simpleTogglePanel with some text" action="#{simpleTogglePanel.act}" actionListener="#{simpleTogglePanel.actListener}"
width="#{simpleTogglePanel.width}" height="#{simpleTogglePanel.height}" switchType="#{simpleTogglePanel.switchType}"
style="#{style.style}" styleClass="#{style.styleClass}"
- oncollapse="#{event.oncollapse}" onbeforedomupdate="#{event.onbeforedomupdate}" onexpand="#{event.onexpand}" opened="#{event.opened}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
+ oncollapse="#{event.oncollapse}" onbeforedomupdate="#{event.onbeforedomupdate}" onexpand="#{event.onexpand}"
+ opened="#{event.opened}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}"
+ onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
+ onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
+ onmouseup="#{event.onmouseup}" binding="#{simpleTogglePanel.htmlSTP}">
<f:facet name="closeMarker">
<h:outputText value="Close It"/>
</f:facet>
Modified: trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/SimpleTogglePanel/SimpleTogglePanelProperty.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -1,5 +1,6 @@
<f:subview xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core" xmlns:a4j="http://richfaces.org/a4j" xmlns:h="http://java.sun.com/jsf/html" xmlns:rich="http://richfaces.org/rich" id="stpPropertySubviewID">
+<h:commandButton action="#{simpleTogglePanel.add}" value="add test" />
<h:panelGrid columns="2" border="1">
<h:outputText value="Width:">
</h:outputText>
Modified: trunk/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/Spacer/Spacer.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -13,7 +13,12 @@
<rich:spacer id="spacerId" title="#{spacer.title}" width="#{spacer.width}" height="#{spacer.height}" rendered="#{spacer.rendered}"
styleClass="#{spacer.style}" style="#{style.style}"
- onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
+ onclick="#{event.onclick}" ondblclick="#{event.ondblclick}"
+ onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}"
+ onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
+ onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
+ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"
+ binding="#{spacer.htmlSpacer}">
</rich:spacer>
<h:outputText value="Some text two..." styleClass="text"></h:outputText>
</f:subview>
Modified: trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/Spacer/SpacerProperty.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -4,6 +4,7 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich" id="spacerPropertySubviewID">
+ <h:commandButton action="#{spacer.add}" value="add test" />
<h:panelGrid columns="2">
<h:outputText value="Width (px or %):"></h:outputText>
<h:inputText value="#{spacer.width}">
Modified: trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBox.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -13,7 +13,8 @@
focus="#{sb.forcus}" title="#{result.text}" summary="summary" shadowOpacity="#{sb.shadowOpacity}"
shadowDepth="#{sb.shadowDepth}" selectValueClass="mousemove" frequency="#{sb.frequency}" nothingLabel="nothingLabel work! "
entryClass="#{style.entryClass}" popupClass="#{style.popupClass}" popupStyle="#{style.popupStyle}" style="#{style.style}" styleClass="#{style.styleClass}" selectedClass="#{style.selectedClass}" rowClasses="#{style.rowClasses}"
- oncomplete="#{event.oncomplete}" onselect="#{event.onselect}" onbeforedomupdate="#{event.onbeforedomupdate}" onsubmit="#{event.onsubmit}">
+ oncomplete="#{event.oncomplete}" onselect="#{event.onselect}" onbeforedomupdate="#{event.onbeforedomupdate}" onsubmit="#{event.onsubmit}"
+ binding="#{sb.htmlSB}">
<h:column>
<h:outputText value="#{result.city}" />
</h:column>
Modified: trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxProperty.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/SuggestionBox/SuggestionBoxProperty.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -5,6 +5,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
id="suggestionboxPropertySubviewID">
+ <h:commandButton action="#{sb.add}" value="add test" />
<h:panelGrid columns="2" cellpadding="5px">
<h:outputText value="z-index"></h:outputText>
Modified: trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanel.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -5,7 +5,10 @@
height="#{tabPanel.height}" rendered="#{tabPanel.rendered}" title="#{tabPanel.title}" switchType="#{tabPanel.switchType}"
headerSpacing="#{tabPanel.headerSpacing}" selectedTab="#{tabPanel.selectedTab}" activeTabClass="#{tabPanel.activeTabStyle}"
disabledTabClass="#{tabPanel.disabledTabStyle}" inactiveTabClass="#{tabPanel.inactiveTabStyle}"
- contentClass="#{tabPanel.contentStyle}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}">
+ contentClass="#{tabPanel.contentStyle}" onclick="#{event.onclick}" ondblclick="#{event.ondblclick}"
+ onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
+ onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
+ onmouseup="#{event.onmouseup}" binding="#{tabPanel.htmlTabPanel}">
<rich:tab id="tabOne" labelWidth="#{tabPanel.labelWidth}" label="#{tabPanel.label}"
onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" ontabenter="#{event.ontabenter}" ontableave="#{event.ontableave}">
Modified: trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/TabPanel/TabPanelProperty.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -5,6 +5,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
id="tabPanelStraightforwardSubviewID">
+ <h:commandButton action="#{tabPanel.add}" value="add test" />
<h:panelGrid columns="2" cellspacing="10px">
<h:outputText value="Width (px or %):"></h:outputText>
<h:inputText value="#{tabPanel.width}" onchange="submit();" />
Modified: trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanel.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -5,7 +5,7 @@
onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}"
onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}"
onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}"
- onmouseup="#{event.onmouseup}">
+ onmouseup="#{event.onmouseup}" binding="#{togglePanel.htmlToglePanel}">
<f:facet name="blank">
<rich:panel>
<f:facet name="header">
Modified: trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelProperty.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/TogglePanel/TogglePanelProperty.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -5,6 +5,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
id="togglePanelPropertySubviewID">
+ <h:commandButton action="#{togglePanel.add}" value="add test" />
<h:panelGrid columns="2" cellpadding="5px" cellspacing="5px">
<h:outputText value="InitialState:"></h:outputText>
<h:selectOneRadio value="#{togglePanel.initialState}">
Modified: trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBar.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -7,7 +7,9 @@
itemSeparator="#{toolBar.itemSeparator}"
contentClass="#{toolBar.contentStyle}"
separatorClass="#{toolBar.separatorStyle}"
- contentStyle="contentStyle" style="#{style.style}" styleClass="#{style.styleClass}">
+ contentStyle="contentStyle" style="#{style.style}"
+ styleClass="#{style.styleClass}"
+ binding="#{toolBar.htmlToolBar}">
<h:outputText value="ToolBar" style="font-style: italic"></h:outputText>
<rich:toolBarGroup>
Modified: trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBarProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBarProperty.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/ToolBar/ToolBarProperty.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -4,6 +4,7 @@
xmlns:a4j="http://richfaces.org/a4j"
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich" id="toolBarPropertySubviewID">
+ <h:commandButton action="#{toolBar.add}" value="add test" />
<h:panelGrid columns="2">
<h:outputText value="Image location:"></h:outputText>
<h:selectOneRadio value="#{toolBar.location}">
Modified: trunk/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/Tooltip/Tooltip.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -40,7 +40,11 @@
hideDelay="#{tooltip.hideDelay}" showDelay="#{tooltip.showDelay}" layout="#{tooltip.layout}"
horizontalOffset="#{tooltip.horizontalOffset}" verticalOffset="#{tooltip.verticalOffset}" followMouse="#{tooltip.followMouse}"
direction="#{tooltip.direction}" disabled="#{tooltip.disabled}" rendered="#{tooltip.rendered}"
- event="#{tooltip.event}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}" onhide="#{event.onhide}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onshow="#{event.onshow}">
+ event="#{tooltip.event}" onclick="#{event.onclick}" oncomplete="#{event.oncomplete}" ondblclick="#{event.ondblclick}"
+ onhide="#{event.onhide}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}"
+ onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}"
+ onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" onshow="#{event.onshow}"
+ binding="#{tooltip.htmlToolTip}">
<h:graphicImage id="pricsID" value="/pics/ajax_process.gif"></h:graphicImage>
<h:outputLink value="http://www.jboss.com/"><f:verbatim>Link</f:verbatim></h:outputLink>
</rich:toolTip>
Modified: trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/Tooltip/TooltipProperty.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -5,6 +5,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
id="toolTipStraightforwardSubviewID">
+ <h:commandButton action="#{tooltip.add}" value="add test" />
<h:panelGrid columns="2">
<a4j:commandLink
Modified: trunk/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/Tree/Tree.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -133,7 +133,7 @@
<!-- Drag and Drop API for rich:tree component -->
<div style="FONT-WEIGHT: bold;">Drag and Drop example</div>
<br />
- <h:form>
+
<rich:dragIndicator id="treeIndicator">
<f:facet name="single">
<f:verbatim>{marker} {nodeParam}({treeParam})</f:verbatim>
@@ -190,5 +190,5 @@
</h:panelGroup>
</h:panelGrid>
- </h:form>
+
</f:subview>
Modified: trunk/test-applications/facelets/src/main/webapp/Tree/TreeProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Tree/TreeProperty.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/Tree/TreeProperty.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -5,6 +5,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich" id="treePropertySubviewID">
<br />
+ <h:commandButton action="#{bean.add}" value="add test" />
<br />
<div style="FONT-WEIGHT: bold;">rich:findComponent</div>
<h:panelGrid columns="2">
Modified: trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarth.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -4,7 +4,8 @@
<rich:virtualEarth id="vEarthID" lng="#{virtualEarth.lng}" onLoadMap="alert('LoadMap')" rendered="#{virtualEarth.rendered}" version="#{virtualEarth.version}" lat="#{virtualEarth.lat}" zoom="#{virtualEarth.zoom}"
dashboardSize="#{virtualEarth.dashboardSize}" mapStyle="#{virtualEarth.mapStyle}" var="map"
- onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}" onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}"/>
+ onclick="#{event.onclick}" ondblclick="#{event.ondblclick}" onkeydown="#{event.onkeydown}" onkeypress="#{event.onkeypress}" onkeyup="#{event.onkeyup}" onmousedown="#{event.onmousedown}" onmousemove="#{event.onmousemove}"
+ onmouseout="#{event.onmouseout}" onmouseover="#{event.onmouseover}" onmouseup="#{event.onmouseup}" binding="#{virtualEarth.htmlVirtualEarth}"/>
</h:panelGrid>
Modified: trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml 2008-07-10 23:24:19 UTC (rev 9518)
+++ trunk/test-applications/facelets/src/main/webapp/VirtualEarth/VirtualEarthProperty.xhtml 2008-07-11 09:12:26 UTC (rev 9519)
@@ -5,11 +5,12 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:rich="http://richfaces.org/rich"
id="virtualEarthPropertySubviewID">
+ <h:commandButton action="#{virtualEarth.add}" value="add test" />
<h:panelGrid columns="2">
- <h:outputText value="lat(-97< x < 97):"></h:outputText>
+ <h:outputText value="lat(-97 < x > 97):"></h:outputText>
<h:inputText value="#{virtualEarth.lat}" onchange="submit();"></h:inputText>
- <h:outputText value="lng(-180< x < 180):"></h:outputText>
+ <h:outputText value="lng(-180 < x > 180):"></h:outputText>
<h:inputText value="#{virtualEarth.lng}" onchange="submit();"></h:inputText>
<h:outputText value="dashboardSize"></h:outputText>
16 years, 2 months
JBoss Rich Faces SVN: r9518 - in trunk: framework/impl/src/main/java/org/ajax4jsf/context and 10 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: alexsmirnov
Date: 2008-07-10 19:24:19 -0400 (Thu, 10 Jul 2008)
New Revision: 9518
Added:
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/event/ValidationListener.java
Removed:
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/renderkit/html/ValidationListener.java
Modified:
trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
trunk/framework/test/src/test/java/org/ajax4jsf/context/MockAjaxContext.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/LengthBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MaxBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinMaxBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotEmptyBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotNullBean.java
trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/Validable.java
trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/faces-config.xml
trunk/sandbox/samples/beanValidatorSample/src/main/webapp/pages/index.jsp
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.java
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/event/ValidationEvent.java
trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java
trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java
trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
Log:
Code review for a rich:message component.
BeanValidator now re-render only corresponding messages.
Modified: trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java
===================================================================
--- trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/framework/api/src/main/java/org/ajax4jsf/context/AjaxContext.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -100,6 +100,8 @@
public abstract void setAjaxAreasToProcess(Set<String> ajaxAreasToProcess);
+ public abstract void setSubmittedRegionClientId(String submittedClientId);
+
/**
* Get instance of current AJAX Context. Instance get by
* variable {@link AjaxContext#AJAX_CONTEXT_KEY}
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -652,6 +652,7 @@
* @param submittedClientId
* The submittedClientId to set.
*/
+ @Override
public void setSubmittedRegionClientId(String submittedClientId) {
this.submittedRegionClientId = submittedClientId;
}
Modified: trunk/framework/test/src/test/java/org/ajax4jsf/context/MockAjaxContext.java
===================================================================
--- trunk/framework/test/src/test/java/org/ajax4jsf/context/MockAjaxContext.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/framework/test/src/test/java/org/ajax4jsf/context/MockAjaxContext.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -315,4 +315,7 @@
return null;
}
+ public void setSubmittedRegionClientId(String submittedClientId) {
+ }
+
}
Modified: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/LengthBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/LengthBean.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/LengthBean.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -46,8 +46,13 @@
this.intValue = intValue;
}
- public String getDescription() {
- return "String Length Validation";
+ public String getTextDescription() {
+ return "Validate String Length, for a range 2-10 chars";
}
+ public String getIntDescription() {
+ // TODO Auto-generated method stub
+ return "Integer Value, no restrictions";
+ }
+
}
Modified: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MaxBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MaxBean.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MaxBean.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -48,8 +48,13 @@
this.intValue = intValue;
}
- public String getDescription() {
- return "Max integer Validation";
+ public String getTextDescription() {
+ return "Text value, no restrictions";
}
+ public String getIntDescription() {
+ // TODO Auto-generated method stub
+ return "Integer Value, less then 10";
+ }
+
}
Modified: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinBean.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinBean.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -47,8 +47,13 @@
this.intValue = intValue;
}
- public String getDescription() {
- return "Min integer Validation";
+ public String getTextDescription() {
+ return "Text value, no restrictions";
}
+ public String getIntDescription() {
+ // TODO Auto-generated method stub
+ return "Integer Value, more then 1";
+ }
+
}
Modified: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinMaxBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinMaxBean.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/MinMaxBean.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -49,8 +49,13 @@
this.intValue = intValue;
}
- public String getDescription() {
- return "Min and Max integer Validation";
+ public String getTextDescription() {
+ return "Text Value, no restrictions";
}
+ public String getIntDescription() {
+ // TODO Auto-generated method stub
+ return "Integer Value, fron 2 to 10";
+ }
+
}
Modified: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotEmptyBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotEmptyBean.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotEmptyBean.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -45,8 +45,13 @@
this.intValue = intValue;
}
- public String getDescription() {
- return "Not Empty Validation";
+ public String getTextDescription() {
+ return "Text value, Not Empty Validation";
}
+ public String getIntDescription() {
+ // TODO Auto-generated method stub
+ return "Integer Value, no restrictions";
+ }
+
}
Modified: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotNullBean.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotNullBean.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/NotNullBean.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -44,8 +44,13 @@
this.intValue = intValue;
}
- public String getDescription() {
- return "Not Null Validation";
+ public String getTextDescription() {
+ return "Text Value, Not Null Validation";
}
+ public String getIntDescription() {
+ // TODO Auto-generated method stub
+ return "Integer Value, no restrictions";
+ }
+
}
Modified: trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/Validable.java
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/Validable.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/java/org/richfaces/Validable.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -11,7 +11,9 @@
public String getText();
- public String getDescription();
+ public String getTextDescription();
public int getIntValue();
+
+ public String getIntDescription();
}
Modified: trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/faces-config.xml 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/webapp/WEB-INF/faces-config.xml 2008-07-10 23:24:19 UTC (rev 9518)
@@ -12,4 +12,9 @@
<managed-bean-class>org.richfaces.DataBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>lengthBean</managed-bean-name>
+ <managed-bean-class>org.richfaces.LengthBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
</faces-config>
Modified: trunk/sandbox/samples/beanValidatorSample/src/main/webapp/pages/index.jsp
===================================================================
--- trunk/sandbox/samples/beanValidatorSample/src/main/webapp/pages/index.jsp 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/samples/beanValidatorSample/src/main/webapp/pages/index.jsp 2008-07-10 23:24:19 UTC (rev 9518)
@@ -3,21 +3,38 @@
<%@ taglib
uri="http://labs.jboss.com/jbossrichfaces/ui/ui/beanValidator"
prefix="v"%>
-<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+<%@taglib uri="http://richfaces.org/rich" prefix="rich"%>
<%@taglib prefix="a4j" uri="http://richfaces.org/a4j"%>
<html>
<head>
<title>Hibernate validator test</title>
</head>
<body>
+<h1>Using Hibernate validator annotations in the JSF beans</h1>
+<p>Validation requests send as AJAX from "onblur" event</p>
<f:view>
<h:form id="form">
+ <rich:panel>
+ <f:facet name="header">
+ <h2>Single input field with label and message</h2>
+ </f:facet>
+ <h:outputLabel for="ltext" value="#{lengthBean.textDescription}" />
+ <h:inputText id="ltext" value="#{lengthBean.text}">
+ <v:ajaxValidator event="onblur" />
+ </h:inputText>
+ <rich:message for="ltext" showDetail="true" showSummary="true" />
+ </rich:panel>
+ <h2>Input fields with label and message in the JSF dataTable</h2>
<h:dataTable value="#{data}" var="bean" id="table">
+ <f:facet name="header">
+ <h:outputText value="Validate values in the data table" />
+ </f:facet>
+
<h:column>
<f:facet name="header">
<h:outputText value="text field" />
</f:facet>
- <h:outputLabel for="text" value="Text input:" />
+ <h:outputLabel for="text" value="#{bean.textDescription}" />
<h:inputText id="text" value="#{bean.text}">
<v:ajaxValidator event="onblur" />
</h:inputText>
@@ -27,20 +44,14 @@
<f:facet name="header">
<h:outputText value="integer field" />
</f:facet>
- <h:outputLabel for="intValue" value="Number input:" />
+ <h:outputLabel for="intValue" value="#{bean.intDescription}" />
<h:inputText id="intValue" value="#{bean.intValue}">
<v:ajaxValidator event="onblur" />
</h:inputText>
- <rich:message for="intValue" />
+ <rich:message for="intValue" showDetail="true" showSummary="true" />
</h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="description" />
- </f:facet>
- <h:outputText value="#{bean.description}"></h:outputText>
- </h:column>
</h:dataTable>
- <h:commandButton value="Post submit"></h:commandButton>
+ <h:commandButton value="Non-AJAX Post submit"></h:commandButton>
</h:form>
<rich:messages />
</f:view>
Modified: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.java
===================================================================
--- trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/component/UIBeanValidator.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -4,12 +4,20 @@
package org.richfaces.component;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
import javax.el.ValueExpression;
import javax.faces.FacesException;
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
import javax.faces.component.UIComponentBase;
import javax.faces.component.UIInput;
+import javax.faces.component.UIMessage;
+import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
import javax.faces.event.AbortProcessingException;
import javax.faces.event.FacesEvent;
@@ -17,9 +25,13 @@
import javax.faces.validator.Validator;
import org.ajax4jsf.component.AjaxComponent;
+import org.ajax4jsf.component.AjaxContainer;
import org.ajax4jsf.component.AjaxSupport;
import org.ajax4jsf.component.EventValueExpression;
+import org.ajax4jsf.context.AjaxContext;
import org.ajax4jsf.event.AjaxEvent;
+import org.ajax4jsf.event.AjaxListener;
+import org.ajax4jsf.renderkit.AjaxContainerRenderer;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
import org.richfaces.event.ValidationEvent;
import org.richfaces.validator.FacesBeanValidator;
@@ -30,7 +42,7 @@
* JSF component class
*
*/
-public abstract class UIBeanValidator extends UIComponentBase implements AjaxComponent, AjaxSupport {
+public abstract class UIBeanValidator extends UIComponentBase implements AjaxComponent, AjaxSupport,AjaxContainer {
public static final String COMPONENT_TYPE = "org.richfaces.BeanValidator";
@@ -67,12 +79,15 @@
public void broadcast(FacesEvent event) throws AbortProcessingException {
super.broadcast(event);
if (event.getComponent() == this) {
+ FacesContext context = getFacesContext();
if (event instanceof ValidationEvent) {
// ByPass UpdateModelValue
- FacesContext.getCurrentInstance().renderResponse();
+ context.renderResponse();
} else if (event instanceof AjaxEvent) {
// TODO - find all UIMessages components for a parent UIInput.
// for an ajaxSingle component, re-render only target message.
+ AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
+ ajaxContext.setSubmittedRegionClientId(this.getClientId(context));
}
}
}
@@ -109,4 +124,72 @@
return getParent();
}
+ public void encodeAjax(FacesContext context) throws IOException {
+ AjaxContext ajaxContext = AjaxContext.getCurrentInstance(context);
+ Set<String> renderedAreas = ajaxContext.getAjaxRenderedAreas();
+ List<UIMessage> messages = getMessages(context);
+ for (UIMessage message : messages) {
+ if (message.isRendered()) {
+ message.encodeAll(context);
+ renderedAreas.add(message.getClientId(context));
+ }
+ }
+ // Write information about encoded areas after submission.
+ AjaxRendererUtils.encodeAreas(context, this);
+
+ }
+
+ public List<UIMessage> getMessages(FacesContext context){
+ ArrayList<UIMessage> messages = new ArrayList<UIMessage>();
+ findMessages(context.getViewRoot(),messages);
+ return messages;
+ }
+
+ /**
+ * Recursive search messages for the parent component.
+ * @param component
+ * @param messages
+ */
+ protected void findMessages(UIComponent component, ArrayList<UIMessage> messages) {
+ // TODO create more intellectual search, symmenric for an UIMessage algoritm.
+ Iterator<UIComponent> facetsAndChildren = component.getFacetsAndChildren();
+ while (facetsAndChildren.hasNext()) {
+ UIComponent child = (UIComponent) facetsAndChildren.next();
+ if (child instanceof UIMessage) {
+ UIMessage message = (UIMessage) child;
+ String messageFor = message.getFor();
+ if(null != messageFor && messageFor.equals(getParent().getId())){
+ messages.add(message);
+ }
+ } else {
+ findMessages(child, messages);
+ }
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.event.AjaxSource#addAjaxListener(org.ajax4jsf.event.AjaxListener)
+ */
+ public void addAjaxListener(AjaxListener listener) {
+ // TODO Auto-generated method stub
+
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.event.AjaxSource#getAjaxListeners()
+ */
+ public AjaxListener[] getAjaxListeners() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.ajax4jsf.event.AjaxSource#removeAjaxListener(org.ajax4jsf.event.AjaxListener)
+ */
+ public void removeAjaxListener(AjaxListener listener) {
+ // TODO Auto-generated method stub
+
+ }
+
+
}
Modified: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/event/ValidationEvent.java
===================================================================
--- trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/event/ValidationEvent.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/event/ValidationEvent.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -7,7 +7,6 @@
import javax.faces.event.FacesEvent;
import javax.faces.event.FacesListener;
-import org.richfaces.renderkit.html.ValidationListener;
/**
* @author asmirnov
Copied: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/event/ValidationListener.java (from rev 9517, trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/renderkit/html/ValidationListener.java)
===================================================================
--- trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/event/ValidationListener.java (rev 0)
+++ trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/event/ValidationListener.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -0,0 +1,17 @@
+/**
+ *
+ */
+package org.richfaces.event;
+
+import javax.faces.event.FacesListener;
+
+
+/**
+ * @author asmirnov
+ *
+ */
+public interface ValidationListener extends FacesListener {
+
+ public void processValidation(ValidationEvent event);
+
+}
Property changes on: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/event/ValidationListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Deleted: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/renderkit/html/ValidationListener.java
===================================================================
--- trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/renderkit/html/ValidationListener.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/renderkit/html/ValidationListener.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -1,18 +0,0 @@
-/**
- *
- */
-package org.richfaces.renderkit.html;
-
-import javax.faces.event.FacesListener;
-
-import org.richfaces.event.ValidationEvent;
-
-/**
- * @author asmirnov
- *
- */
-public interface ValidationListener extends FacesListener {
-
- public void processValidation(ValidationEvent event);
-
-}
Modified: trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java
===================================================================
--- trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/sandbox/ui/beanValidator/src/main/java/org/richfaces/validator/FacesBeanValidator.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -46,8 +46,9 @@
input.setValid(false);
// send all validation messages.
for (String msg : messages) {
+ // TODO - create Summary message ?
context.addMessage(component.getClientId(context), new FacesMessage(
- FacesMessage.SEVERITY_ERROR, msg, ""));
+ FacesMessage.SEVERITY_ERROR, "", msg));
}
}
}
Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/RichMessageBaseRenderer.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -15,10 +16,8 @@
import org.ajax4jsf.renderkit.HeaderResourcesRendererBase;
import org.ajax4jsf.renderkit.RendererUtils;
import org.ajax4jsf.resource.InternetResource;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.richfaces.component.UIRichMessages;
import org.richfaces.renderkit.html.HtmlRichMessageRenderer;
/**
@@ -42,7 +41,7 @@
private static final String ALL_NAME = "ALL";
- protected List acceptLevels = new ArrayList();
+// protected List acceptLevels = new ArrayList();
private final InternetResource[] styles = {getResource("/org/richfaces/renderkit/html/css/msg.css"),getResource("/org/richfaces/renderkit/html/css/msgs.css")};
@@ -71,7 +70,7 @@
if(ignoreThis){
stylesAll = rsrcs;
}else{
- Set rsrcsSet = new java.util.LinkedHashSet();
+ Set<InternetResource> rsrcsSet = new java.util.LinkedHashSet<InternetResource>();
for(int i = 0; i < rsrcs.length; i++ ){
rsrcsSet.add(rsrcs[i]);
}
@@ -88,9 +87,9 @@
return stylesAll;
}
- protected Iterator getMessageIterator(FacesContext context, String forClientId, UIComponent component) throws IOException{
+ protected Iterator<FacesMessage> getMessageIterator(FacesContext context, String forClientId, UIComponent component) throws IOException{
- Iterator msgIter = null;
+ Iterator<FacesMessage> msgIter = null;
if(forClientId != null){
@@ -99,7 +98,7 @@
UIComponent result = RendererUtils.getInstance().
findComponentFor(component, forClientId);
if (result == null) {
- msgIter = CollectionUtils.EMPTY_COLLECTION.iterator();
+ msgIter = Collections.<FacesMessage>emptyList().iterator();
} else {
msgIter = context.getMessages(result.getClientId(context));
}
@@ -261,10 +260,10 @@
}
- protected boolean isAcceptableMessagesPresent(Iterator messagesIter) {
+ protected boolean isAcceptableMessagesPresent(List<String> acceptLevels, Iterator<FacesMessage> messagesIter) {
while(messagesIter.hasNext()){
- FacesMessage message = (FacesMessage)(messagesIter.next());
- boolean exist = isAcceptableMessage(message);
+ FacesMessage message = (messagesIter.next());
+ boolean exist = isAcceptableMessage(message, acceptLevels);
if (exist) {
return true;
}
@@ -272,7 +271,7 @@
return false;
}
- protected boolean isAcceptableMessage(FacesMessage message){
+ protected boolean isAcceptableMessage(FacesMessage message, List<String> acceptLevels){
boolean accept = false;
@@ -302,9 +301,9 @@
return accept;
}
- protected List creatAcceptLevels(String [] levels){
+ protected List<String> creatAcceptLevels(String [] levels){
- List acceptLevels = new ArrayList();
+ List<String> acceptLevels = new ArrayList<String>();
for (int i = 0; i < levels.length; i++) {
acceptLevels.add(levels[i].toUpperCase());
Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessageRenderer.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.util.Iterator;
+import java.util.List;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
@@ -23,7 +24,7 @@
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
- Iterator msgIter = null;
+ Iterator<FacesMessage> msgIter = null;
UIRichMessage msgComponent = (UIRichMessage)component;
String forClientId = msgComponent.getFor();
@@ -59,8 +60,8 @@
ResponseWriter writer = context.getResponseWriter();
- acceptLevels = creatAcceptLevels(uiMsg.getLevel().split(","));
- if(isAcceptableMessage(facesMsg)){
+ List<String> acceptLevels = creatAcceptLevels(uiMsg.getLevel().split(","));
+ if(isAcceptableMessage(facesMsg, acceptLevels)){
outerStyles(uiMsg, context, writer, facesMsg);
renderMarkerFacet(uiMsg,context, writer,facesMsg);
renderLabel(uiMsg, context, writer, facesMsg);
@@ -180,7 +181,7 @@
}
- protected Class getComponentClass() {
+ protected Class<? extends UIComponent> getComponentClass() {
return UIMessage.class;
}
Modified: trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java
===================================================================
--- trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2008-07-10 16:48:43 UTC (rev 9517)
+++ trunk/ui/message/src/main/java/org/richfaces/renderkit/html/HtmlRichMessagesRenderer.java 2008-07-10 23:24:19 UTC (rev 9518)
@@ -5,6 +5,7 @@
import java.io.IOException;
import java.util.Iterator;
+import java.util.List;
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
@@ -22,7 +23,6 @@
*/
public class HtmlRichMessagesRenderer extends RichMessageBaseRenderer {
- private boolean isWroteTable = false;
protected void doEncodeEnd(ResponseWriter writer, FacesContext context, UIComponent component) throws IOException {
UIRichMessages uiMessages = (UIRichMessages)component;
@@ -34,18 +34,18 @@
forIds = "";
}
- Iterator messagesIter = getMessageIterator(context, forIds, component);
+ Iterator<FacesMessage> messagesIter = getMessageIterator(context, forIds, component);
boolean isDisplayNone = !messagesIter.hasNext();
+ String [] levels = uiMessages.getLevel().split(",");
+ List<String> acceptLevels = creatAcceptLevels(levels);
if(!isDisplayNone){
- String [] levels = uiMessages.getLevel().split(",");
- acceptLevels = creatAcceptLevels(levels);
- if (!isAcceptableMessagesPresent(messagesIter)) {
+ if (!isAcceptableMessagesPresent(acceptLevels, messagesIter)) {
isDisplayNone = true;
}
}
-
+ boolean isWroteTable = false;
layout = (String)uiMessages.getAttributes().get("layout");
if((layout != null) && (layout.equals("table"))){
@@ -69,13 +69,16 @@
messagesIter = getMessageIterator(context, forIds, component);
if(!messagesIter.hasNext()){
- renderBody(uiMessages, context, writer, null);
+ renderBody(uiMessages, context, writer, null,isWroteTable);
}else{
while(messagesIter.hasNext()){
FacesMessage facesMsg = (FacesMessage)(messagesIter.next());
-
- renderBody(uiMessages, context, writer, facesMsg);
+
+ if(isAcceptableMessage(facesMsg, acceptLevels)){
+
+ renderBody(uiMessages, context, writer, facesMsg,isWroteTable);
+ }
}
}
@@ -203,12 +206,9 @@
}
- public void renderBody(UIRichMessages uiMessages, FacesContext context, ResponseWriter writer,FacesMessage facesMsg) throws IOException{
+ public void renderBody(UIRichMessages uiMessages, FacesContext context, ResponseWriter writer,FacesMessage facesMsg,boolean isWroteTable) throws IOException{
if(uiMessages.isPassed() || facesMsg != null ){
-
- if(isAcceptableMessage(facesMsg)){
-
if(isWroteTable){
writer.startElement(HTML.TR_ELEMENT, uiMessages);
writer.startElement(HTML.td_ELEM, uiMessages);
@@ -227,11 +227,10 @@
writer.endElement("dt");
}
}
- }
}
- protected Class getComponentClass() {
+ protected Class<? extends UIComponent> getComponentClass() {
return UIMessages.class;
}
16 years, 2 months
JBoss Rich Faces SVN: r9517 - trunk/docs/cdkguide/en/src/main/resources/css.
by richfaces-svn-commits@lists.jboss.org
Author: artdaw
Date: 2008-07-10 12:48:43 -0400 (Thu, 10 Jul 2008)
New Revision: 9517
Modified:
trunk/docs/cdkguide/en/src/main/resources/css/html.css
Log:
http://jira.jboss.com/jira/browse/RF-3875 - styles fixing (tables font)
Modified: trunk/docs/cdkguide/en/src/main/resources/css/html.css
===================================================================
--- trunk/docs/cdkguide/en/src/main/resources/css/html.css 2008-07-10 16:48:05 UTC (rev 9516)
+++ trunk/docs/cdkguide/en/src/main/resources/css/html.css 2008-07-10 16:48:43 UTC (rev 9517)
@@ -6,6 +6,7 @@
color:#6699CC;
cursor:pointer;
}
+
body {
background-image:url(../images/community/bkg_gradient.gif);
background-repeat:repeat-x;
@@ -13,19 +14,29 @@
font-family:'Lucida Grande',Geneva,Verdana,Arial,sans-serif;
font-size:12px;
line-height:150%;
-margin:0pt auto;
-max-width:80em;
+max-width:1000px;
padding:0em 2em;
-text-align:justify;
+text-align:center;
}
+
+div.book, div.chapter, div.section{
+ width:1000px;
+ margin:0 auto;
+ text-align:justify;
+}
+
+#title, ul.docnav{
+ margin:0 auto;
+ width:1000px;
+
+}
+
/* Center all images and Figure/Table titles */
-div.mediaobject img {margin:auto;}
+div.mediaobject img {margin:left;}
-p.title {text-align:center;}
+p.title {text-align:left;}
-pre.CSS {line-height:8px;}
-
.css_normal {
line-height:0px;
color:#000000;
@@ -71,8 +82,34 @@
.css_string {
color:#2A00FF;
}
-code {
+code.code{
color:#000000;
-font-size:12px;
-font-family:courier;
+font-size:14px;
+font-family:monospace;
+}
+a.new {
+background:transparent url(../images/new.png) no-repeat scroll right top;
+padding-right:70px;
+}
+a.updated {
+background:transparent url(../images/updated.png) no-repeat scroll right top;
+padding-right:70px;
+}
+.tbi {color: #aaaaaa;}
+.tbi p {color: #333333;}
+
+div.note, div.tip, div.important{
+ height:100%;
+}
+
+pre.JAVA {
+line-height:10px;
+!line-height:15px;
+}
+pre.CSS {
+line-height:10px;
+!line-height:15px;
+}
+div.table-contents table{
+ font-size:12px;
}
\ No newline at end of file
16 years, 2 months
JBoss Rich Faces SVN: r9516 - in trunk/docs/cdkguide/en/src/main/docbook: modules and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: artdaw
Date: 2008-07-10 12:48:05 -0400 (Thu, 10 Jul 2008)
New Revision: 9516
Modified:
trunk/docs/cdkguide/en/src/main/docbook/includes/ccreate.xml
trunk/docs/cdkguide/en/src/main/docbook/modules/setup.xml
Log:
http://jira.jboss.com/jira/browse/RF-3692 - info about 'mvn clean install' command was added.
Modified: trunk/docs/cdkguide/en/src/main/docbook/includes/ccreate.xml
===================================================================
--- trunk/docs/cdkguide/en/src/main/docbook/includes/ccreate.xml 2008-07-10 15:59:23 UTC (rev 9515)
+++ trunk/docs/cdkguide/en/src/main/docbook/includes/ccreate.xml 2008-07-10 16:48:05 UTC (rev 9516)
@@ -2,52 +2,51 @@
<section id="ccreate" xreflabel="ccreate">
<?dbhtml filename="ccreate.html"?>
<sectioninfo>
-<keywordset>
-<keyword>create</keyword>
-<keyword>component</keyword>
-<keyword>CDK</keyword>
- <keyword>Guide</keyword>
-</keywordset>
-</sectioninfo>
-<title>Creating and building component skeleton</title>
-<para>
-Let's create a skeleton for the <emphasis role="bold"><property><inputDate></property></emphasis> component.
-</para>
-<para> You need to go to the <property>inputDate</property> directory and then launch the following command: </para>
-<programlisting role="XML"><![CDATA[...
+ <keywordset>
+ <keyword>create</keyword>
+ <keyword>component</keyword>
+ <keyword>CDK</keyword>
+ <keyword>Guide</keyword>
+ </keywordset>
+ </sectioninfo>
+ <title>Creating and building component skeleton</title>
+ <para> Let's create a skeleton for the <emphasis role="bold">
+ <property><inputDate></property>
+ </emphasis> component. </para>
+ <para> You need to go to the <property>inputDate</property> directory and then launch the
+ following command: </para>
+ <programlisting role="XML"><![CDATA[...
mvn cdk:create -Dname=inputDate
-...]]>
+...]]>
</programlisting>
-<para>
-As a result three artifacts will be created:
-</para>
-<itemizedlist>
-<listitem>
-<para>
-An XML configuration file for the metadata
-</para>
-</listitem>
-<listitem>
-<para>
-A UI class
-</para>
-</listitem>
-<listitem>
-<para>
-A JSP-like template
-</para>
-</listitem></itemizedlist>
-<para>
-In order to build the component you should stay in the <property>inputDate</property> directory
-and launch the following command:</para>
-<programlisting role="XML"><![CDATA[...
+ <para> As a result three artifacts will be created: </para>
+ <itemizedlist>
+ <listitem>
+ <para> An XML configuration file for the metadata </para>
+ </listitem>
+ <listitem>
+ <para> A UI class </para>
+ </listitem>
+ <listitem>
+ <para> A JSP-like template </para>
+ </listitem>
+ </itemizedlist>
+ <para> In order to build the component you should stay in the <property>inputDate</property>
+ directory and launch the following command:</para>
+ <programlisting role="XML"><![CDATA[...
mvn install
-...]]>
+...]]>
</programlisting>
-<para>
-This command generates and compiles the library and then creates a result JAR file.
-A directory named <property>target</property> will be created along with a <property>src</property> directory.
-If you get a file named <property>target/inputDate-1.0-SNAPSHOT.jar</property>, everything is set up successfully. </para>
+ <para> This command generates and compiles the library and then creates a result JAR file. A
+ directory named <property>target</property> will be created along with a
+ <property>src</property> directory. If you get a file named
+ <property>target/inputDate-1.0-SNAPSHOT.jar</property>, everything is set up
+ successfully. </para>
+ <para>
+ If you want to rebuild the component you could use the following command:
+ </para>
+ <programlisting role="XML"><![CDATA[...
+mvn clean install
+...]]>
+ </programlisting>
</section>
-
-
Modified: trunk/docs/cdkguide/en/src/main/docbook/modules/setup.xml
===================================================================
--- trunk/docs/cdkguide/en/src/main/docbook/modules/setup.xml 2008-07-10 15:59:23 UTC (rev 9515)
+++ trunk/docs/cdkguide/en/src/main/docbook/modules/setup.xml 2008-07-10 16:48:05 UTC (rev 9516)
@@ -5,44 +5,38 @@
<keywordset>
<keyword>setup</keyword>
<keyword>CDK</keyword>
- <keyword>Guide</keyword>
+ <keyword>Guide</keyword>
</keywordset>
</chapterinfo>
<title>Setting up the environment</title>
- <para>
- In order to start working with the <property>Component Development Kit (CDK)</property>
- and to create your rich component,
- it's necessary to have the following installed:
- </para>
- <itemizedlist>
- <listitem>
+ <para> In order to start working with the <property>Component Development Kit (CDK)</property>
+ and to create your rich component, it's necessary to have the following installed: </para>
+ <itemizedlist>
+ <listitem>
<para>
- <ulink url="http://java.sun.com/javase/downloads/index_jdk5.jsp">The Java SE 5 Development Kit (JDK)</ulink>
- </para>
+ <ulink url="http://java.sun.com/javase/downloads/index_jdk5.jsp">The Java SE 5
+ Development Kit (JDK)</ulink>
+ </para>
</listitem>
<listitem>
<para>
<ulink url="http://maven.apache.org/download.html">Apache Maven 2.0.9</ulink>
- </para>
+ </para>
</listitem>
<listitem>
<para>
<ulink url="http://tomcat.apache.org">Apache Tomcat 6.0</ulink>
- </para>
+ </para>
</listitem>
<listitem>
- <para>
- Browser (on client side)
- </para>
- </listitem>
+ <para> Browser (on client side) </para>
+ </listitem>
</itemizedlist>
- <para>
- After the <property>Maven</property> is installed you should configure it.
- In this case, please, go to the directory where you've just installed <property>Maven</property>,
- open a <property>conf/settings.xml</property> file for editing and add to the <property>profiles</property>
- section this code:
- </para>
+ <para> After the <property>Maven</property> is installed you should configure it. In this case,
+ please, go to the directory where you've just installed <property>Maven</property>,
+ open a <property>conf/settings.xml</property> file for editing and add to the
+ <property>profiles</property> section this code: </para>
<programlisting role="XML"><![CDATA[...
<profile>
<id>cdk</id>
@@ -97,41 +91,35 @@
</profile>
...]]>
</programlisting>
- <para>
- In order to activate new profile, please, add the following after the <property>profiles</property> section:
- </para>
+ <para> In order to activate new profile, please, add the following after the
+ <property>profiles</property> section: </para>
<programlisting role="XML"><![CDATA[...
<activeProfiles>
<activeProfile>cdk</activeProfile>
</activeProfiles>
-...]]>
+...]]>
</programlisting>
- <note>
+ <note>
<title>Note:</title>
- <para>
- In order to work with <property>Maven</property> from Eclipse,
- it's possible to download and install the <property>Maven</property> plugin.
- Please, follow the instruction at
- <ulink url="http://maven.apache.org/eclipse-plugin.html">Eclipse plugins for Maven page</ulink>
- </para>
+ <para> In order to work with <property>Maven</property> from Eclipse, it's possible
+ to download and install the <property>Maven</property> plugin. Please, follow the
+ instruction at <ulink url="http://maven.apache.org/eclipse-plugin.html">Eclipse plugins
+ for Maven page</ulink>
+ </para>
</note>
- <para>
- The environment is set up now to use the <property>Component Development Kit (CDK)</property>.
- </para>
- <para>
- We are going to create two components throughout the RichFaces CDK Developer Guide, but at first
- you need take the following steps in order to set up the <property>Project</property> and create your library:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- Create a new directory where all the components will be stored (for example <property>Sandbox</property>).
- </para>
+ <para> The environment is set up now to use the <property>Component Development Kit
+ (CDK)</property>. </para>
+ <para> We are going to create two components throughout the RichFaces CDK Developer Guide, but
+ at first you need take the following steps in order to set up the
+ <property>Project</property> and create your library: </para>
+ <itemizedlist>
+ <listitem>
+ <para> Create a new directory where all the components will be stored (for example
+ <property>Sandbox</property>). </para>
</listitem>
<listitem>
- <para>
- Create a file named <property>pom.xml</property> in the directory with the following content:
- </para>
+ <para> Create a file named <property>pom.xml</property> in the directory with the
+ following content: </para>
<programlisting role="XML"><![CDATA[...
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
@@ -195,18 +183,14 @@
</dependency>
</dependencies>
</project>
-...]]>
+...]]>
</programlisting>
- </listitem>
- <listitem>
- <para>
- Close the file
- </para>
- </listitem>
+ </listitem>
+ <listitem>
+ <para> Close the file </para>
+ </listitem>
</itemizedlist>
- <para>
- Here are some of these elements with descriptions:
- </para>
+ <para> Here are some of these elements with descriptions: </para>
<table>
<title>The POM elements</title>
<tgroup cols="2">
@@ -218,30 +202,18 @@
</thead>
<tbody>
<row>
- <entry>
- groupId
- </entry>
- <entry>
- Prefix for the Java package structure of your library
- </entry>
- </row>
+ <entry> groupId </entry>
+ <entry> Prefix for the Java package structure of your library </entry>
+ </row>
<row>
- <entry>
- url
- </entry>
- <entry>
- Namespace for your library to be used in the TLD file
- </entry>
+ <entry> url </entry>
+ <entry> Namespace for your library to be used in the TLD file </entry>
</row>
<row>
- <entry>
- version
- </entry>
- <entry>
- Version of your library
- </entry>
+ <entry> version </entry>
+ <entry> Version of your library </entry>
</row>
- </tbody>
- </tgroup>
- </table>
-</chapter>
\ No newline at end of file
+ </tbody>
+ </tgroup>
+ </table>
+</chapter>
16 years, 2 months
JBoss Rich Faces SVN: r9515 - trunk/docs/userguide/en/src/main/docbook/modules.
by richfaces-svn-commits@lists.jboss.org
Author: msorokin
Date: 2008-07-10 11:59:23 -0400 (Thu, 10 Jul 2008)
New Revision: 9515
Modified:
trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
Log:
http://jira.jboss.com/jira/browse/RF-3163
The article about Plug-n-Skin is rewritten and some info added.
Modified: trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2008-07-10 15:33:24 UTC (rev 9514)
+++ trunk/docs/userguide/en/src/main/docbook/modules/RFCarchitectover.xml 2008-07-10 15:59:23 UTC (rev 9515)
@@ -4023,7 +4023,7 @@
<para>
The
- <emphasis><property>"e;name"e;</property></emphasis>
+ <emphasis><property>"name"</property></emphasis>
attribute of <emphasis role="bold"><property><u:selector></property></emphasis> tag defines the CSS
selector, while
<emphasis><property>"name"</property></emphasis>
@@ -4056,16 +4056,19 @@
<title>Plug-n-Skin</title>
<para>
- Plug-n-Skin feature is designed to easily create a new
- custom skin which extends and overrides a base skin, it
- allows to redefine the look of a set of components by
- taking the base skin as basis and plugging-in custom
- styles as well as to unify the appearance of standard
- controls and RichFaces components.
+ Plug-n-Skin is a feature that gives a developer an opportunity
+ to easily create, customize and plug into a project a custom skin.
+ The skin can be created basing on parameters of some predefined RichFaces skin.
</para>
+
<para>
+ The feature also provides an option to unify
+ the appearance of rich controls with standard HTML elements.
+ </para>
+
+ <para>
In order to create your own skin using Plug-n-Skin
feature, you can follow these step by step instructions.
</para>
@@ -4093,7 +4096,8 @@
-DarchetypeArtifactId=maven-archetype-plug-n-skin
-DarchetypeVersion=RF-VERSION
-DartifactId=ARTIFACT-ID
--DgroupId=GROUP-ID -Dversion=VERSION
+-DgroupId=GROUP-ID
+-Dversion=VERSION
...
]]></programlisting>
<para>Primary keys for the command:</para>
@@ -4323,25 +4327,118 @@
</listitem>
</itemizedlist>
+ <para>Now you can start editing the XCSS files
+ located in "\src\main\resources\SKIN-PACKAGE\SKIN-NAME\css\".
+ New style properties can be assigned to the selectors (the selectors listed in the XCSS files) in two ways, which are both valid, and it'up to the developer what way to choose. </para>
+<itemizedlist>
+ <listitem><para>Applying a standard CSS coding approach, i.e. you can add css properties to the given selectors are you normally do while doing CSS coding.
+ The only thing, you have to keep in mind is that the selectors must me inside
+ <f:verbatim> <![CDATA[ ...]]> </f:verbatim> tags.</para>
+
+
+ For example
+
+ <programlisting role="XML">
+<![CDATA[...
+.rich-calendar-cell {
+background: #537df8;
+}
+...
+]]></programlisting>
+
+
+
+ </listitem>
+
+
+ <listitem><para>
+
+ Using XCSS coding approach, the same way as XCSS files are normally formed in RichFaces.
+ The XCSS tags have to be placed outside <f:verbatim> <![CDATA[ ...]]> </f:verbatim> tags.
+
+ </para>
+
+ <programlisting role="XML">
+ <![CDATA[...
+<u:selector name=".rich-calendar-cell">
+ <u:style name="border-bottom-color" skin="panelBorderColor"/>
+ <u:style name="border-right-color" skin="panelBorderColor"/>
+ <u:style name="background-color" skin="tableBackgroundColor"/>
+ <u:style name="font-size" skin="generalSizeFont"/>
+ <u:style name="font-family" skin="generalFamilyFont"/>
+</u:selector>
+...
+]]></programlisting>
+
+
+ </listitem>
+</itemizedlist>
+<para>
+
+
+
+
+</para>
+
<para>
- Having performed the previous steps you can proceed to
- building the new skin. This can be done by executing the
+ Having performed described above steps and edited the XCSS files
+ you can proceed to building the new skin and to plugging it into the project.
+ Building the new skin can be done by executing the
given below command in the command line in the root
folder of you skin project (the one that contains
pom.xml file).
</para>
- <programlisting role="XML"><![CDATA[...
+<programlisting role="XML"><![CDATA[...
mvn clean install
...
]]></programlisting>
-
- <para>
- Now, you can use your newly-created skin in your project
+ <para>In addition Plug-n-Skin has a number of predefined
+ fancy gradients that you can also you to make your application look nicer. The given below code snippet shows how the gradient can be used
+ </para>
+
+<programlisting role="XML"><![CDATA[...
+<u:selector name=".rich-combobox-item-selected">
+ <u:style name="border-width" value="1px" />
+ <u:style name="border-style" value="solid" />
+ <u:style name="border-color" skin="newBorder" />
+ <u:style name="background-position" value="0% 50%" />
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient">
+ <f:attribute name="valign" value="middle" />
+ <f:attribute name="gradientHeight" value="17px" />
+ <f:attribute name="baseColor" skin="headerBackgroundColor" />
+ </f:resource>
+ </u:style>
+</u:selector>
+...
+]]></programlisting>
+
+ <para>
+ So, as you can see, the <property>background-image</property> CSS property is defined with
+ <code>
+ <f:resource
+ f:key="org.richfaces.renderkit.html.CustomizeableGradient">
+ </code>
+ that sets the gradient. While the gradient type can be specified in the
+ <property>SKIN-NAME.properties</property> file with <property>gradientType</property> property.
+
+
+ The <property>gradientType</property> property can be set to one of the possible values glass, plastic, plain.
+ The gradient in it's turn can be can be adjusted using baseColor, gradientColor, gradientHeight, valign attributes.
+ Their usage is shown in the snippet above.
+
+
+ </para>
+
+
+
+ <para>
+ Now, you can use your newly-created and customized skin in your project
by adding your new skin parameters to web.xml file and
placing the jar file with your skin
( the jar file is located in "target" folder of your skin project)
@@ -4357,72 +4454,13 @@
]]></programlisting>
- <para>
- So, now having built your new skin you can start
- redefining style properties in the corresponding XCSS
- files(located in
- "\src\main\resources\SKIN-PACKAGE\SKIN-NAME\css\"
- folder). In the example below, it's shown how to
- redefine the style properties for the
- <emphasis role="bold"><property><rich:combobox></property></emphasis> component.
- </para>
+<section>
+ <title>Details of Usage</title>
+
+ <para>This section will cover some practical aspects of Plug-n-Skin implementation. </para>
+
+</section>
- <programlisting role="XML"><![CDATA[...
- <u:selector name=".rich-combobox-item-selected">
- <u:style name="border-width" value="1px" />
- <u:style name="border-style" value="solid" />
- <u:style name="border-color" skin="newBorder" />
- <u:style name="background-position" value="0% 50%" />
- <u:style name="background-image">
- <f:resource f:key="org.richfaces.renderkit.html.CustomizeableGradient">
- <f:attribute name="valign" value="middle" />
-
- <f:attribute name="gradientHeight" value="17px" />
- <f:attribute name="baseColor" skin="headerBackgroundColor" />
- </f:resource>
- </u:style>
- </u:selector>
-...
-]]></programlisting>
-
- <para>
- Please notice that
- <property>background-image</property>
- can be used to set a predefined gradient by means of
- <code>
- <f:resource
- f:key="org.richfaces.renderkit.html.CustomizeableGradient">
- </code>
- and the
- <property>gradientType</property>
- constant set to one of the possible values.
- </para>
-
- <para>
- You can also apply these style properties to
- <property>background-image</property>
- :
- </para>
- <itemizedlist>
-
- <listitem>
- <para>baseColor</para>
- </listitem>
- <listitem>
- <para>gradientColor</para>
- </listitem>
- <listitem>
- <para>gradientHeight</para>
- </listitem>
- <listitem>
- <para>valign</para>
- </listitem>
- <listitem>
- <para>gradientType</para>
- </listitem>
- </itemizedlist>
-
-
</section>
</section>
16 years, 2 months
JBoss Rich Faces SVN: r9514 - trunk/docs/cdkguide/en/src/main/docbook/includes.
by richfaces-svn-commits@lists.jboss.org
Author: smukhina
Date: 2008-07-10 11:33:24 -0400 (Thu, 10 Jul 2008)
New Revision: 9514
Modified:
trunk/docs/cdkguide/en/src/main/docbook/includes/ccreate.xml
Log:
http://jira.jboss.com/jira/browse/RF-3692
xml syntax is fixed for Doc for CDK
Modified: trunk/docs/cdkguide/en/src/main/docbook/includes/ccreate.xml
===================================================================
--- trunk/docs/cdkguide/en/src/main/docbook/includes/ccreate.xml 2008-07-10 15:26:07 UTC (rev 9513)
+++ trunk/docs/cdkguide/en/src/main/docbook/includes/ccreate.xml 2008-07-10 15:33:24 UTC (rev 9514)
@@ -2,57 +2,52 @@
<section id="ccreate" xreflabel="ccreate">
<?dbhtml filename="ccreate.html"?>
<sectioninfo>
- <keywordset>
- <keyword>create</keyword>
- <keyword>component</keyword>
- <keyword>CDK</keyword>
- <keyword>Guide</keyword>
- </keywordset>
- </sectioninfo>
- <title>Creating and building component skeleton</title>
- <para>
- Let's create a skeleton for the <emphasis role="bold"><property><inputDate></property></emphasis> component.
- </para>
- <para>
- You need to go to the <property>inputDate</property> directory and then launch the following command:
- </para>
- <programlisting role="XML"><![CDATA[...
+<keywordset>
+<keyword>create</keyword>
+<keyword>component</keyword>
+<keyword>CDK</keyword>
+ <keyword>Guide</keyword>
+</keywordset>
+</sectioninfo>
+<title>Creating and building component skeleton</title>
+<para>
+Let's create a skeleton for the <emphasis role="bold"><property><inputDate></property></emphasis> component.
+</para>
+<para> You need to go to the <property>inputDate</property> directory and then launch the following command: </para>
+<programlisting role="XML"><![CDATA[...
mvn cdk:create -Dname=inputDate
...]]>
- </programlisting>
- <para>
- As a result three artifacts will be created:
- </para>
- <itemizedlist>
- <listitem>
- <para>
- An XML configuration file for the metadata
- </para>
- </listitem>
- <listitem>
- <para>
- A UI class
- </para>
- </listitem>
- <listitem>
- <para>
- A JSP-like template
- </para>
- </listitem>
- </itemizedlist>
- <para>
- In order to build the component you should stay in the <property>inputDate</property> directory
- and launch the following command:
- </para>
- <programlisting role="XML"><![CDATA[...
+</programlisting>
+<para>
+As a result three artifacts will be created:
+</para>
+<itemizedlist>
+<listitem>
+<para>
+An XML configuration file for the metadata
+</para>
+</listitem>
+<listitem>
+<para>
+A UI class
+</para>
+</listitem>
+<listitem>
+<para>
+A JSP-like template
+</para>
+</listitem></itemizedlist>
+<para>
+In order to build the component you should stay in the <property>inputDate</property> directory
+and launch the following command:</para>
+<programlisting role="XML"><![CDATA[...
mvn install
...]]>
- </programlisting>
- <para>
- This command generates and compiles the library and then creates a result JAR file.
- A directory named <property>target</property> will be created along with a <property>src</property> directory.
- If you get a file named <property>target/inputDate-1.0-SNAPSHOT.jar</property>, everything is set up successfully.
- </para>
+</programlisting>
+<para>
+This command generates and compiles the library and then creates a result JAR file.
+A directory named <property>target</property> will be created along with a <property>src</property> directory.
+If you get a file named <property>target/inputDate-1.0-SNAPSHOT.jar</property>, everything is set up successfully. </para>
</section>
16 years, 2 months