March 2011 - richfaces-svn-commits

JBoss Rich Faces SVN: r22159 - branches/4.0.X/ui/common/ui/src/main/java/org/richfaces/component.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2011-03-11 06:56:56 -0500 (Fri, 11 Mar 2011) New Revision: 22159 Modified: branches/4.0.X/ui/common/ui/src/main/java/org/richfaces/component/UISequence.java Log: https://issues.jboss.org/browse/RF-10729 Reviewed by Ilya Modified: branches/4.0.X/ui/common/ui/src/main/java/org/richfaces/component/UISequence.java =================================================================== --- branches/4.0.X/ui/common/ui/src/main/java/org/richfaces/component/UISequence.java 2011-03-11 11:35:25 UTC (rev 22158) +++ branches/4.0.X/ui/common/ui/src/main/java/org/richfaces/component/UISequence.java 2011-03-11 11:56:56 UTC (rev 22159) @@ -54,6 +54,8 @@ private Object iterationStatusVarObject; + private Converter defaultRowKeyConverter; + protected enum PropertyKeys { first, rows, value, iterationStatusVar } @@ -137,7 +139,17 @@ @Override public Converter getRowKeyConverter() { - return getFacesContext().getApplication().createConverter(Integer.class); + Converter converter = super.getRowKeyConverter(); + + if (converter == null) { + if (defaultRowKeyConverter == null) { + defaultRowKeyConverter = getFacesContext().getApplication().createConverter(Integer.class); + } + + converter = defaultRowKeyConverter; + } + + return converter; } @Attribute

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r22158 - in branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces: renderkit/html/css and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2011-03-11 06:35:25 -0500 (Fri, 11 Mar 2011) New Revision: 22158 Removed: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/basic.xcss branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/basic_both.xcss branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/extended_both.xcss branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-bas-both.xcss branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-bas-classes.xcss branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-bas-styles.xcss branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-ext-both.xcss branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-ext-classes.xcss branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-ext-styles.xcss Log: Legacy XCSS files removed Reviewed by Ilya Deleted: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/basic.xcss =================================================================== --- branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/basic.xcss 2011-03-11 11:30:49 UTC (rev 22157) +++ branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/basic.xcss 2011-03-11 11:35:25 UTC (rev 22158) @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <u:selector name="input, select, textarea, button, keygen, isindex, legend, a"> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="controlTextColor" /> - </u:selector> - - <f:verbatim> - <![CDATA[ - fieldset { - border-width: 1px; - border-style: solid; - padding: 10px; - } - - hr { - border-width: 1px; - border-style: solid; - } - ]]> - </f:verbatim> - - <u:selector name="fieldset"> - <u:style name="border-color" skin="panelBorderColor" /> - </u:selector> - - <u:selector name="hr"> - <u:style name="border-color" skin="panelBorderColor" /> - </u:selector> - - <u:selector name="a"> - <u:style name="color" skin="generalLinkColor" /> - </u:selector> - - <u:selector name="a:hover"> - <u:style name="color" skin="hoverLinkColor" /> - </u:selector> - - <u:selector name="a:visited"> - <u:style name="color" skin="visitedLinkColor" /> - </u:selector> -</f:template> \ No newline at end of file Deleted: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/basic_both.xcss =================================================================== --- branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/basic_both.xcss 2011-03-11 11:30:49 UTC (rev 22157) +++ branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/basic_both.xcss 2011-03-11 11:35:25 UTC (rev 22158) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <f:importResource src="org/richfaces/renderkit/html/css/basic.xcss" /> - <f:importResource src="org/richfaces/renderkit/html/css/basic_classes.xcss" /> - -</f:template> \ No newline at end of file Deleted: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss =================================================================== --- branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss 2011-03-11 11:30:49 UTC (rev 22157) +++ branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/basic_classes.xcss 2011-03-11 11:35:25 UTC (rev 22158) @@ -1,413 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - - <u:selector name=".rich-container input, .rich-input, - .rich-container select, .rich-select, - - .rich-container textarea, .rich-textarea, - - .rich-container button, .rich-button, - - .rich-container keygen, .rich-keygen, - - .rich-container isindex, .rich-isindex, - - .rich-container legend, .rich-legend, - - .rich-container a, .rich-link, - - .rich-container fieldset, .rich-fieldset, - - .rich-field, .rich-field-edit, .rich-field-error, - - .rich-button, .rich-button-disabled, .rich-button-over, .rich-button-press"> - - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="controlTextColor" /> - </u:selector> - - <f:verbatim> - <![CDATA[ - .rich-container fieldset, .rich-fieldset { - border-width: 1px; - border-style: solid; - padding: 10px; - } - - .rich-container hr, .rich-hr { - border-width: 1px; - border-style: solid; - } - - .rich-container legend, .rich-legend { - font-weight : bold; - } - - .rich-container form, .rich-form { - padding : 0px; - margin : 0px; - } - ]]> - </f:verbatim> - - <u:selector name=".rich-container fieldset, .rich-fieldset"> - <u:style name="border-color" skin="panelBorderColor" /> - </u:selector> - - <u:selector name=".rich-container hr, .rich-hr"> - <u:style name="border-color" skin="panelBorderColor" /> - </u:selector> - - <u:selector name=".rich-container a, .rich-link"> - <u:style name="color" skin="generalLinkColor" /> - </u:selector> - - <u:selector name=".rich-container a:hover, .rich-link:hover"> - <u:style name="color" skin="hoverLinkColor" /> - </u:selector> - - <u:selector name=".rich-container a:visited, .rich-link:visited"> - <u:style name="color" skin="visitedLinkColor" /> - </u:selector> - - - - - <u:selector name=".rich-field, .rich-field-edit, .rich-field-error"> - <u:style name="border-width" value="1px" /> - <u:style name="border-style" value="inset" /> - <u:style name="border-color" skin="panelBorderColor" /> - </u:selector> - - <u:selector name=".rich-field"> - <u:style name="background-color" skin="controlBackgroundColor" /> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.ButtonBackgroundImage"/> - </u:style> - <u:style name="background-repeat" value="no-repeat" /> - <u:style name="background-position" value="1px 1px" /> - </u:selector> - - <u:selector name=".rich-field-edit"> - <u:style name="background-color" skin="editBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-field-error"> - <u:style name="background-color" skin="warningBackgroundColor" />; - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.InputErrorIcon"/> - </u:style> - <u:style name="background-repeat" value="no-repeat" /> - <u:style name="background-position" value="center left" /> - <u:style name="padding-left" value="7px" /> - </u:selector> - - - - <u:selector name=".rich-button, .rich-button-disabled, .rich-button-over, .rich-button-press"> - <u:style name="border-width" value="1px" /> - <u:style name="border-style" value="solid" /> - <u:style name="border-color" skin="panelBorderColor" /> - <u:style name="background-color" skin="trimColor" /> - <u:style name="padding" value="2px 10px 2px 10px" /> - <u:style name="text-align" value="center" /> - <u:style name="cursor" value="pointer" /> - <u:style name="background-repeat" value="repeat-x" /> - <u:style name="background-position" value="top left" /> - </u:selector> - - <u:selector name=".rich-button"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.StandardButtonBgImage"/> - </u:style> - </u:selector> - - <u:selector name=".rich-button-disabled"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.StandardButtonBgImage"/> - </u:style> - </u:selector> - - <u:selector name=".rich-button-over"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.StandardButtonBgImage"/> - </u:style> - </u:selector> - - <u:selector name=".rich-button-press"> - StandardButtonBgImage - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.StandardButtonPressedBgImage"/> - </u:style> - <u:style name="background-position" value="bottom left" /> - </u:selector> - - /*border color styles*/ - - <u:selector name=".rich-box-border-color-control-select"> - <u:style name="border-color" skin="selectControlColor" /> - </u:selector> - - <u:selector name=".rich-box-border-color-subborder"> - <u:style name="border-color" skin="subBorderColor" /> - </u:selector> - - <u:selector name=".rich-box-border-color-header"> - <u:style name="border-color" skin="headerBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-border-color-general"> - <u:style name="border-color" skin="generalBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-border-color-additional"> - <u:style name="border-color" skin="additionalBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-border-color-panel"> - <u:style name="border-color" skin="panelBorderColor" /> - </u:selector> - - <u:selector name=".rich-box-border-color-tip"> - <u:style name="border-color" skin="tipBorderColor" /> - </u:selector> - - <u:selector name=".rich-box-border-color-table"> - <u:style name="border-color" skin="tableBorderColor" /> - </u:selector> - - <u:selector name=".rich-box-border-control-select, .rich-box-border-subborder, .rich-box-border-header, - .rich-box-border-general, .rich-box-border-additional, .rich-box-border-panel, .rich-box-border-tip, .rich-box-border-table"> - <u:style name="border-style" value="solid" /> - <u:style name="border-width" value="1px" /> - </u:selector> - - <u:selector name=".rich-box-border-control-select"> - <u:style name="border-color" skin="selectControlColor" /> - </u:selector> - - <u:selector name=".rich-box-border-subborder"> - <u:style name="border-color" skin="subBorderColor" /> - </u:selector> - - <u:selector name=".rich-box-border-header"> - <u:style name="border-color" skin="headerBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-border-general"> - <u:style name="border-color" skin="generalBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-border-additional"> - <u:style name="border-color" skin="additionalBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-border-panel"> - <u:style name="border-color" skin="panelBorderColor" /> - </u:selector> - - <u:selector name=".rich-box-border-tip"> - <u:style name="border-color" skin="tipBorderColor" /> - </u:selector> - - <u:selector name=".rich-box-border-table"> - <u:style name="border-color" skin="tableBorderColor" /> - </u:selector> - - /*background color styles*/ - - <u:selector name=".rich-box-bgcolor-header"> - <u:style name="background-color" skin="headerBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-bgcolor-general"> - <u:style name="background-color" skin="generalBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-bgcolor-additional"> - <u:style name="background-color" skin="additionalBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-bgcolor-panel"> - <u:style name="background-color" skin="panelBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-bgcolor-tab"> - <u:style name="background-color" skin="tabBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-bgcolor-trim"> - <u:style name="background-color" skin="trimColor" /> - </u:selector> - - <u:selector name=".rich-box-bgcolor-tip"> - <u:style name="background-color" skin="tipBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-bgcolor-table"> - <u:style name="background-color" skin="tableBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-bgcolor-table-footer"> - <u:style name="background-color" skin="tableFooterBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-bgcolor-table-subfooter"> - <u:style name="background-color" skin="tableSubfooterBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-bgcolor-editor"> - <u:style name="background-color" skin="editorBackgroundColor" /> - </u:selector> - - <u:selector name=".rich-box-bgcolor-edit"> - <u:style name="background-color" skin="editBackgroundColor" /> - </u:selector> - - /*text color styles*/ - - <u:selector name=".rich-text-color-header"> - <u:style name="color" skin="headerTextColor" /> - </u:selector> - - <u:selector name=".rich-text-color-general"> - <u:style name="color" skin="generalTextColor" /> - </u:selector> - - <u:selector name=".rich-text-color-tab-disabled"> - <u:style name="color" skin="tabDisabledTextColor" /> - </u:selector> - - <u:selector name=".rich-text-color-select"> - <u:style name="color" skin="selectControlColor" /> - </u:selector> - - <u:selector name=".rich-text-color-link-general"> - <u:style name="color" skin="generalLinkColor" /> - </u:selector> - - <u:selector name=".rich-text-color-link-hover"> - <u:style name="color" skin="hoverLinkColor" /> - </u:selector> - - <u:selector name=".rich-text-color-link-visited"> - <u:style name="color" skin="visitedLinkColor" /> - </u:selector> - - /*font size styles*/ - - <u:selector name=".rich-font-size-general"> - <u:style name="font-size" skin="generalSizeFont" /> - </u:selector> - - <u:selector name=".rich-font-size-header"> - <u:style name="font-size" skin="headerSizeFont" /> - </u:selector> - - /*font family styles*/ - - <u:selector name=".rich-font-family-general"> - <u:style name="font-family" skin="generalFamilyFont" /> - </u:selector> - - <u:selector name=".rich-font-family-header"> - <u:style name="font-family" skin="headerFamilyFont" /> - </u:selector> - - /* text styles */ - - <u:selector name=".rich-text-general"> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="generalTextColor" /> - </u:selector> - - <u:selector name=".rich-text-header"> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="headerFamilyFont" /> - <u:style name="color" skin="headerTextColor" /> - </u:selector> - - <u:selector name=".rich-text-tab-disabled"> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="tabDisabledTextColor" /> - </u:selector> - - <u:selector name=".rich-text-control-select"> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="headerFamilyFont" /> - <u:style name="color" skin="selectControlColor" /> - </u:selector> - - /*gradient styles*/ - - <u:selector name=".rich-gradient-header-inverse"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.HeaderInverseGradientImage"/> - </u:style> - <u:style name="background-repeat" value="repeat-x" /> - </u:selector> - - <u:selector name=".rich-gradient-header"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.HeaderGradientImage"/> - </u:style> - <u:style name="background-repeat" value="repeat-x" /> - </u:selector> - - <u:selector name=".rich-gradient-tab"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.TabGradientImage"/> - </u:style> - <u:style name="background-repeat" value="repeat-x" /> - </u:selector> - - <u:selector name=".rich-gradient-tab-inverse"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.TabInverseGradientImage"/> - </u:style> - <u:style name="background-repeat" value="repeat-x" /> - </u:selector> - - <u:selector name=".rich-gradient-input"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.InputGradientImage"/> - </u:style> - <u:style name="background-repeat" value="repeat-x" /> - </u:selector> - - <u:selector name=".rich-gradient-menu-inverse"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.MenuInverseGradientImage"/> - </u:style> - <u:style name="background-repeat" value="repeat-x" /> - </u:selector> - - <u:selector name=".rich-gradient-menu"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.MenuGradientImage"/> - </u:style> - <u:style name="background-repeat" value="repeat-x" /> - </u:selector> - - <u:selector name=".rich-gradient-button-inverse"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.ButtonInverseGradientImage"/> - </u:style> - <u:style name="background-repeat" value="repeat-x" /> - </u:selector> - - <u:selector name=".rich-gradient-button"> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.gradientimages.ButtonGradientImage"/> - </u:style> - <u:style name="background-repeat" value="repeat-x" /> - </u:selector> - -</f:template> \ No newline at end of file Deleted: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss =================================================================== --- branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss 2011-03-11 11:30:49 UTC (rev 22157) +++ branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/extended.xcss 2011-03-11 11:35:25 UTC (rev 22158) @@ -1,124 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <u:selector name="input, select, textarea, button, keygen, isindex"> - <u:style name="border-width" value="1px" /> - <u:style name="border-color" skin="panelBorderColor" /> - <u:style name="color" skin="controlTextColor" /> - </u:selector> - - <f:verbatim> - <![CDATA[ - *|button { - border-width: 1px; - background-repeat : repeat-x; - background-position : top left; - } - - button[type="button"], button[type="reset"], button[type="submit"], input[type="reset"], input[type="submit"], input[type="button"] { - border-width: 1px; - background-repeat : repeat-x; - background-position : top left; - } - - ]]> - </f:verbatim> - - <u:selector name="*|button"> - <u:style name="border-color" skin="panelBorderColor" /> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="headerTextColor" /> - <u:style name="background-color" skin="headerBackgroundColor" /> - - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.ButtonBackgroundImage"/> - </u:style> - </u:selector> - - <u:selector name="button[type="button"], button[type="reset"], button[type="submit"], - input[type="reset"], input[type="submit"], input[type="button"]"> - <u:style name="border-color" skin="panelBorderColor" /> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="headerTextColor" /> - <u:style name="background-color" skin="headerBackgroundColor" /> - - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.ButtonBackgroundImage"/> - </u:style> - </u:selector> - - <u:selector name="*|button[disabled]"> - <u:style name="color" skin="tabDisabledTextColor" /> - <u:style name="border-color" skin="tableFooterBackgroundColor" /> - <u:style name="background-color" skin="tableFooterBackgroundColor" /> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage"/> - </u:style> - </u:selector> - - <u:selector name="button[type="button"][disabled], button[type="reset"][disabled], button[type="submit"][disabled], - input[type="reset"][disabled], input[type="submit"][disabled], input[type="button"][disabled]"> - <u:style name="color" skin="tabDisabledTextColor" /> - <u:style name="border-color" skin="tableFooterBackgroundColor" /> - <u:style name="background-color" skin="tableFooterBackgroundColor" /> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage"/> - </u:style> - </u:selector> - - <f:verbatim> - <![CDATA[ - *|textarea { - border-width: 1px; - border-style : inset; - background-repeat : no-repeat; - background-position : 1px 1px; - } - - textarea[type="textarea"], input[type="text"], input[type="password"], select { - border-width: 1px; - border-style : inset; - background-repeat : no-repeat; - background-position : 1px 1px; - } - ]]> - </f:verbatim> - - <u:selector name="*|textarea"> - <u:style name="border-color" skin="panelBorderColor" /> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="controlTextColor" /> - <u:style name="background-color" skin="controlBackgroundColor" /> - - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.InputBackgroundImage"/> - </u:style> - </u:selector> - - <u:selector name="textarea[type="textarea"], input[type="text"], input[type="password"], select"> - <u:style name="border-color" skin="panelBorderColor" /> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="controlTextColor" /> - <u:style name="background-color" skin="controlBackgroundColor" /> - - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.InputBackgroundImage"/> - </u:style> - </u:selector> - - <u:selector name="*|textarea[disabled], *|select[disabled]"> - <u:style name="color" skin="panelBorderColor" /> - </u:selector> - - <u:selector name="textarea[type="textarea"][disabled], input[type="text"][disabled], input[type="password"][disabled], select[disabled]"> - <u:style name="color" skin="panelBorderColor" /> - </u:selector> - -</f:template> \ No newline at end of file Deleted: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/extended_both.xcss =================================================================== --- branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/extended_both.xcss 2011-03-11 11:30:49 UTC (rev 22157) +++ branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/extended_both.xcss 2011-03-11 11:35:25 UTC (rev 22158) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <f:importResource src="org/richfaces/renderkit/html/css/extended.xcss" /> - <f:importResource src="org/richfaces/renderkit/html/css/extended_classes.xcss" /> - -</f:template> \ No newline at end of file Deleted: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss =================================================================== --- branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss 2011-03-11 11:30:49 UTC (rev 22157) +++ branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/renderkit/html/css/extended_classes.xcss 2011-03-11 11:35:25 UTC (rev 22158) @@ -1,159 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <u:selector name=".rich-container input, .rich-input, - .rich-container select, .rich-select, - .rich-container textarea, .rich-textarea, - .rich-container button, .rich-button, - .rich-container keygen, .rich-keygen, - .rich-container isindex, .rich-isindex"> - <u:style name="border-width" value="1px" /> - <u:style name="border-color" skin="panelBorderColor" /> - <u:style name="color" skin="controlTextColor" /> - </u:selector> - - <f:verbatim> - <![CDATA[ - .rich-container *|button, .rich-button { - border-width: 1px; - background-repeat : repeat-x; - background-position : top left; - } - - .rich-button, - .rich-container button[type="button"], .rich-button-button, - .rich-container button[type="reset"], .rich-button-reset, - .rich-container button[type="submit"], .rich-button-submit, - .rich-container input[type="reset"], .rich-input-reset, - .rich-container input[type="submit"], .rich-input-submit, - .rich-container input[type="button"], .rich-input-button { - border-width: 1px; - background-repeat : repeat-x; - background-position : top left; - } - - ]]> - </f:verbatim> - - <u:selector name=".rich-container *|button, .rich-button"> - <u:style name="border-color" skin="panelBorderColor" /> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="headerTextColor" /> - <u:style name="background-color" skin="headerBackgroundColor" /> - - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.ButtonBackgroundImage"/> - </u:style> - </u:selector> - - <u:selector name=" - .rich-button, - .rich-container button[type="button"], .rich-button-button, - .rich-container button[type="reset"], .rich-button-reset, - .rich-container button[type="submit"], .rich-button-submit, - .rich-container input[type="reset"], .rich-input-reset, - .rich-container input[type="submit"], .rich-input-submit, - .rich-container input[type="button"], .rich-input-button - "> - <u:style name="border-color" skin="panelBorderColor" /> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="headerTextColor" /> - <u:style name="background-color" skin="headerBackgroundColor" /> - - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.ButtonBackgroundImage"/> - </u:style> - </u:selector> - - - <u:selector name=".rich-container *|button[disabled]"> - <u:style name="color" skin="tabDisabledTextColor" /> - <u:style name="background-color" skin="tableFooterBackgroundColor" /> - <u:style name="border-color" skin="tableFooterBackgroundColor" /> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage"/> - </u:style> - </u:selector> - - <u:selector name=".rich-button-disabled, - .rich-container button[type="button"][disabled], .rich-button-button-disabled, - .rich-container button[type="reset"][disabled], .rich-button-reset-disabled, - .rich-container button[type="submit"][disabled], .rich-button-submit-disabled, - .rich-container input[type="reset"][disabled], .rich-input-reset-disabled, - .rich-container input[type="submit"][disabled], .rich-input-submit-disabled, - .rich-container input[type="button"][disabled], .rich-input-button-disabled"> - <u:style name="color" skin="tabDisabledTextColor" /> - <u:style name="background-color" skin="tableFooterBackgroundColor" /> - <u:style name="border-color" skin="tableFooterBackgroundColor" /> - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.ButtonDisabledBackgroundImage"/> - </u:style> - </u:selector> - - - <f:verbatim> - <![CDATA[ - .rich-container *|textarea { - border-width: 1px; - border-style : inset; - background-repeat : no-repeat; - background-position : 1px 1px; - } - - .rich-textarea, - .rich-container textarea[type="textarea"], .rich-textarea-textarea, - .rich-container input[type="text"], .rich-input-text, - .rich-container input[type="password"], .rich-input-password, - .rich-container select, .rich-select { - border-width: 1px; - border-style : inset; - background-repeat : no-repeat; - background-position : 1px 1px; - } - ]]> - </f:verbatim> - - <u:selector name=".rich-container *|textarea"> - <u:style name="border-color" skin="panelBorderColor" /> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="controlTextColor" /> - <u:style name="background-color" skin="controlBackgroundColor" /> - - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.InputBackgroundImage"/> - </u:style> - </u:selector> - - <u:selector name=".rich-textarea, - .rich-container textarea[type="textarea"], .rich-textarea-textarea, - .rich-container input[type="text"], .rich-input-text, - .rich-container input[type="password"], .rich-input-password, - .rich-container select, .rich-select"> - <u:style name="border-color" skin="panelBorderColor" /> - <u:style name="font-size" skin="generalSizeFont" /> - <u:style name="font-family" skin="generalFamilyFont" /> - <u:style name="color" skin="controlTextColor" /> - <u:style name="background-color" skin="controlBackgroundColor" /> - - <u:style name="background-image"> - <f:resource f:key="org.richfaces.renderkit.html.images.InputBackgroundImage"/> - </u:style> - </u:selector> - - <u:selector name=".rich-container *|textarea[disabled], .rich-container *|select[disabled]"> - <u:style name="color" skin="panelBorderColor" /> - </u:selector> - - <u:selector name=".rich-textarea-disabled, .rich-container textarea[type="textarea"][disabled], .rich-textarea-textarea-disabled, - .rich-container input[type="text"][disabled], .rich-input-text-disabled, - .rich-container input[type="password"][disabled], .rich-input-password-disabled, - .rich-container select[disabled], .rich-select-disabled"> - <u:style name="color" skin="panelBorderColor" /> - </u:selector> -</f:template> \ No newline at end of file Deleted: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-bas-both.xcss =================================================================== --- branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-bas-both.xcss 2011-03-11 11:30:49 UTC (rev 22157) +++ branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-bas-both.xcss 2011-03-11 11:35:25 UTC (rev 22158) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <f:importResource src="org/richfaces/renderkit/html/css/basic.xcss" /> - <f:importResource src="org/richfaces/renderkit/html/css/basic_classes.xcss" /> - - <f:importResource src="org/richfaces/skin.xcss" /> -</f:template> \ No newline at end of file Deleted: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-bas-classes.xcss =================================================================== --- branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-bas-classes.xcss 2011-03-11 11:30:49 UTC (rev 22157) +++ branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-bas-classes.xcss 2011-03-11 11:35:25 UTC (rev 22158) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <f:importResource src="org/richfaces/renderkit/html/css/basic_classes.xcss" /> - - <f:importResource src="org/richfaces/skin.xcss" /> -</f:template> \ No newline at end of file Deleted: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-bas-styles.xcss =================================================================== --- branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-bas-styles.xcss 2011-03-11 11:30:49 UTC (rev 22157) +++ branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-bas-styles.xcss 2011-03-11 11:35:25 UTC (rev 22158) @@ -1,10 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <f:importResource src="org/richfaces/renderkit/html/css/basic.xcss" /> - - <f:importResource src="org/richfaces/skin.xcss" /> -</f:template> \ No newline at end of file Deleted: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-ext-both.xcss =================================================================== --- branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-ext-both.xcss 2011-03-11 11:30:49 UTC (rev 22157) +++ branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-ext-both.xcss 2011-03-11 11:35:25 UTC (rev 22158) @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <f:importResource src="org/richfaces/renderkit/html/css/basic.xcss" /> - <f:importResource src="org/richfaces/renderkit/html/css/basic_classes.xcss" /> - - <f:importResource src="org/richfaces/renderkit/html/css/extended.xcss" /> - <f:importResource src="org/richfaces/renderkit/html/css/extended_classes.xcss" /> - - <f:importResource src="org/richfaces/skin.xcss" /> -</f:template> \ No newline at end of file Deleted: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-ext-classes.xcss =================================================================== --- branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-ext-classes.xcss 2011-03-11 11:30:49 UTC (rev 22157) +++ branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-ext-classes.xcss 2011-03-11 11:35:25 UTC (rev 22158) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <f:importResource src="org/richfaces/renderkit/html/css/basic_classes.xcss" /> - <f:importResource src="org/richfaces/renderkit/html/css/extended_classes.xcss" /> - - <f:importResource src="org/richfaces/skin.xcss" /> -</f:template> \ No newline at end of file Deleted: branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-ext-styles.xcss =================================================================== --- branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-ext-styles.xcss 2011-03-11 11:30:49 UTC (rev 22157) +++ branches/4.0.X/ui/core/ui/src/main/resources/org/richfaces/skin-ext-styles.xcss 2011-03-11 11:35:25 UTC (rev 22158) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<f:template xmlns:f='http:/jsf.exadel.com/template' - xmlns:u='http:/jsf.exadel.com/template/util' - xmlns="http://www.w3.org/1999/xhtml"> - - <f:importResource src="org/richfaces/renderkit/html/css/basic.xcss" /> - <f:importResource src="org/richfaces/renderkit/html/css/extended.xcss" /> - - <f:importResource src="org/richfaces/skin.xcss" /> -</f:template> \ No newline at end of file

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r22157 - in branches/4.0.X/examples/irc-client/src/main: webapp and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: ilya_shaikovsky Date: 2011-03-11 06:30:49 -0500 (Fri, 11 Mar 2011) New Revision: 22157 Added: branches/4.0.X/examples/irc-client/src/main/java/org/ircclient/controller/Message.java Modified: branches/4.0.X/examples/irc-client/src/main/java/org/ircclient/controller/ChatBean.java branches/4.0.X/examples/irc-client/src/main/webapp/chat.xhtml branches/4.0.X/examples/irc-client/src/main/webapp/welcome.xhtml Log: irc-client, clean-up according to Nick review performed. @Nick checked the result prior to commit Modified: branches/4.0.X/examples/irc-client/src/main/java/org/ircclient/controller/ChatBean.java =================================================================== --- branches/4.0.X/examples/irc-client/src/main/java/org/ircclient/controller/ChatBean.java 2011-03-11 11:07:30 UTC (rev 22156) +++ branches/4.0.X/examples/irc-client/src/main/java/org/ircclient/controller/ChatBean.java 2011-03-11 11:30:49 UTC (rev 22157) @@ -2,7 +2,7 @@ import java.io.IOException; import java.io.Serializable; -import java.text.MessageFormat; +import java.text.DateFormat; import java.util.Date; import javax.faces.application.FacesMessage; @@ -35,6 +35,7 @@ private String channelName; private String message; + private transient TopicsContext topicsContext; public String connect() { @@ -47,17 +48,20 @@ null, new FacesMessage(FacesMessage.SEVERITY_ERROR, this.getName() + " nick already in use", this.getName() + " nick already in use")); + return null; } catch (IOException e) { FacesContext.getCurrentInstance().addMessage( null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Sorry, server unresponsible. Try again later.", "Sorry, server unresponsible. Try again later.")); + return null; } catch (IrcException e) { FacesContext.getCurrentInstance().addMessage( null, new FacesMessage(FacesMessage.SEVERITY_ERROR, "Sorry, we encountered IRC services problems. Try again later.", "Sorry, we encountered IRC services problems. Try again later.")); + return null; } return "chat"; } @@ -74,12 +78,19 @@ return topicsContext; } + public String getMessagesSubtopic() { + return this.getUserName() + SUBTOPIC_SEPARATOR + channelName; + } + + public String getListSubtopic() { + return this.getUserName() + SUBTOPIC_SEPARATOR + channelName + "List"; + } + @Override protected void onMessage(String channel, String sender, String login, String hostname, String message) { - String channelName = channel.replace(CHANNEL_PREFIX, ""); try { - getTopicsContext().publish(new TopicKey("chat", this.getUserName() + SUBTOPIC_SEPARATOR + channelName), - MessageFormat.format("{0,time,medium} {1}: {2}", new Date(), sender, message)); + Message messageObject = new Message(message, sender, DateFormat.getInstance().format(new Date())); + getTopicsContext().publish(new TopicKey("chat", getMessagesSubtopic()), messageObject); } catch (MessageException e) { LOGGER.error(e.getMessage(), e); } @@ -88,7 +99,7 @@ @Override protected void onUserList(String channel, User[] users) { try { - getTopicsContext().publish(new TopicKey("chat", this.getUserName() + SUBTOPIC_SEPARATOR + channelName + "List"), null); + getTopicsContext().publish(new TopicKey("chat", getListSubtopic()), null); } catch (MessageException e) { LOGGER.error(e.getMessage(), e); } @@ -97,9 +108,9 @@ @Override protected void onJoin(String channel, String sender, String login, String hostname) { try { - getTopicsContext().publish(new TopicKey("chat", this.getUserName() + SUBTOPIC_SEPARATOR + channelName + "List"), null); - getTopicsContext().publish(new TopicKey("chat", this.getUserName() + SUBTOPIC_SEPARATOR + channelName), - MessageFormat.format("{0,time,medium} {1}: {2}", new Date(), sender, "joined channel")); + getTopicsContext().publish(new TopicKey("chat", getListSubtopic()), null); + Message messageObject = new Message("joined channel", sender, DateFormat.getInstance().format(new Date())); + getTopicsContext().publish(new TopicKey("chat", getMessagesSubtopic()), messageObject); } catch (MessageException e) { LOGGER.error(e.getMessage(), e); } @@ -108,9 +119,9 @@ @Override protected void onPart(String channel, String sender, String login, String hostname) { try { - getTopicsContext().publish(new TopicKey("chat", this.getUserName() + SUBTOPIC_SEPARATOR + channelName + "List"), null); - getTopicsContext().publish(new TopicKey("chat", this.getUserName() + SUBTOPIC_SEPARATOR + channelName), - MessageFormat.format("{0,time,medium} {1}: {2}", new Date(), sender, "left channel")); + getTopicsContext().publish(new TopicKey("chat", getListSubtopic()), null); + Message messageObject = new Message("left channel", sender, DateFormat.getInstance().format(new Date())); + getTopicsContext().publish(new TopicKey("chat", getMessagesSubtopic()), messageObject); } catch (MessageException e) { LOGGER.error(e.getMessage(), e); } @@ -119,9 +130,10 @@ @Override protected void onNickChange(String oldNick, String login, String hostname, String newNick) { try { - getTopicsContext().publish(new TopicKey("chat", this.getUserName() + SUBTOPIC_SEPARATOR + channelName + "List"), null); - getTopicsContext().publish(new TopicKey("chat", this.getUserName() + SUBTOPIC_SEPARATOR + channelName), - MessageFormat.format("{0,time,medium} {1}", new Date(), oldNick + " changed nick to " + newNick)); + getTopicsContext().publish(new TopicKey("chat", getListSubtopic()), null); + Message messageObject = new Message(" changed nick to " + newNick, oldNick, DateFormat.getInstance() + .format(new Date())); + getTopicsContext().publish(new TopicKey("chat", getMessagesSubtopic()), messageObject); } catch (MessageException e) { LOGGER.error(e.getMessage(), e); } @@ -130,9 +142,10 @@ @Override protected void onQuit(String sourceNick, String sourceLogin, String sourceHostname, String reason) { try { - getTopicsContext().publish(new TopicKey("chat", this.getUserName() + SUBTOPIC_SEPARATOR + channelName + "List"), null); - getTopicsContext().publish(new TopicKey("chat", this.getUserName() + SUBTOPIC_SEPARATOR + channelName), - MessageFormat.format("{0,time,medium} {1}: {2} {3}", new Date(), sourceNick, "joined channel", reason)); + getTopicsContext().publish(new TopicKey("chat", getListSubtopic()), null); + Message messageObject = new Message("left channel" + reason, sourceNick, DateFormat.getInstance().format( + new Date())); + getTopicsContext().publish(new TopicKey("chat", getMessagesSubtopic()), messageObject); } catch (MessageException e) { LOGGER.error(e.getMessage(), e); } @@ -145,8 +158,8 @@ public void send() { this.sendMessage(CHANNEL_PREFIX + channelName, message); try { - getTopicsContext().publish(new TopicKey("chat", this.getUserName() + SUBTOPIC_SEPARATOR + channelName), - MessageFormat.format("{0,time,medium} {1}: {2}", new Date(), this.getName(), message)); + Message messageObject = new Message(message, this.getName(), DateFormat.getInstance().format(new Date())); + getTopicsContext().publish(new TopicKey("chat", getMessagesSubtopic()), messageObject); } catch (MessageException e) { LOGGER.error(e.getMessage(), e); } @@ -187,4 +200,5 @@ public void setMessage(String message) { this.message = message; } + } Added: branches/4.0.X/examples/irc-client/src/main/java/org/ircclient/controller/Message.java =================================================================== --- branches/4.0.X/examples/irc-client/src/main/java/org/ircclient/controller/Message.java (rev 0) +++ branches/4.0.X/examples/irc-client/src/main/java/org/ircclient/controller/Message.java 2011-03-11 11:30:49 UTC (rev 22157) @@ -0,0 +1,40 @@ +package org.ircclient.controller; + +public class Message { + + private String text; + private String author; + private String timestamp; + + public Message(String text, String author, String timestamp) { + super(); + this.text = text; + this.author = author; + this.timestamp = timestamp; + } + + public String getText() { + return text; + } + + public void setText(String text) { + this.text = text; + } + + public String getAuthor() { + return author; + } + + public void setAuthor(String author) { + this.author = author; + } + + public String getTimestamp() { + return timestamp; + } + + public void setTimestamp(String timestamp) { + this.timestamp = timestamp; + } + +} Modified: branches/4.0.X/examples/irc-client/src/main/webapp/chat.xhtml =================================================================== --- branches/4.0.X/examples/irc-client/src/main/webapp/chat.xhtml 2011-03-11 11:07:30 UTC (rev 22156) +++ branches/4.0.X/examples/irc-client/src/main/webapp/chat.xhtml 2011-03-11 11:30:49 UTC (rev 22157) @@ -9,22 +9,28 @@ template="/templates/template.xhtml"> <ui:define name="body"> <style> -.chatOutput { - overflow: auto; - width: 80%; - height: 200px; - float: left; -} - -.chatList { - float: right; - width: 19%; - height: 200px; - overflow: auto; -} -</style> + .chatOutput { + overflow: auto; + width: 80%; + height: 200px; + float: left; + } + + .chatList { + float: right; + width: 19%; + height: 200px; + overflow: auto; + } + </style> + <script> + function getMessageString(data){ + return data.author + " - " +data.timestamp+ ": " + data.text; + } + </script> <rich:panel - header="Welcome to #{chatBean.channelName} channel at #{chatBean.serverName}" id="chatpanel"> + header="Welcome to #{chatBean.channelName} channel at #{chatBean.serverName}" + id="chatpanel"> <rich:panel styleClass="chatOutput" bodyClass="#{chatBean.channelName}Output" /> <rich:panel styleClass="chatList"> @@ -36,13 +42,13 @@ <br clear="all" /> <hr /> <h:form> - <a4j:push address="#{chatBean.userName}_#{chatBean.channelName}List@chat" + <a4j:push address="#{chatBean.listSubtopic}@chat" onerror="alert(event.rf.data)"> <a4j:ajax event="dataavailable" render="users" execute="@none" /> </a4j:push> - <a4j:push address="#{chatBean.userName}_#{chatBean.channelName}@chat" + <a4j:push address="#{chatBean.messagesSubtopic}@chat" onerror="alert(event.rf.data)" - ondataavailable="jQuery('<div />').prependTo('.#{chatBean.channelName}Output').text(event.rf.data)" /> + ondataavailable="jQuery('<div />').prependTo('.#{chatBean.channelName}Output').text(getMessageString(event.rf.data))" /> <h:inputTextarea value="#{chatBean.message}" rows="3" style="width:80%" id="nm" /> <a4j:commandButton value="Send" action="#{chatBean.send}" @@ -52,9 +58,9 @@ <h:form> <rich:panel header="Change nickname:"> <h:inputText valueChangeListener="#{chatBean.changeNick}" id="cn" /> - <a4j:commandButton value="Change" execute="@form" render="@none"/> + <a4j:commandButton value="Change" execute="@form" render="@none" /> </rich:panel> - <h:commandButton value="Disconnect" action="#{chatBean.leave}"/> + <h:commandButton value="Disconnect" action="#{chatBean.leave}" /> </h:form> </rich:panel> </ui:define> Modified: branches/4.0.X/examples/irc-client/src/main/webapp/welcome.xhtml =================================================================== --- branches/4.0.X/examples/irc-client/src/main/webapp/welcome.xhtml 2011-03-11 11:07:30 UTC (rev 22156) +++ branches/4.0.X/examples/irc-client/src/main/webapp/welcome.xhtml 2011-03-11 11:30:49 UTC (rev 22157) @@ -8,26 +8,9 @@ xmlns:c="http://java.sun.com/jsp/jstl/core" template="/templates/template.xhtml"> <ui:define name="body"> - <style> -.chatOutput { - overflow: auto; - width: 80%; - height: 200px; - float: left; -} - -.chatList { - float: right; - width: 19%; - height: 200px; - overflow: auto; -} -</style> <rich:panel header="Connect to IRC"> <h:form> - <a4j:outputPanel ajaxRendered="true"> - <h:messages style="color:red" /> - </a4j:outputPanel> + <rich:messages style="color:red" /> <h:panelGrid columns="2"> <h:outputText value="Your nickname:" /> <h:inputText required="true" id="name" value="#{chatBean.userName}" />

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r22156 - branches/4.0.X/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces.

by richfaces-svn-commits＠lists.jboss.org

Author: artdaw Date: 2011-03-11 06:07:30 -0500 (Fri, 11 Mar 2011) New Revision: 22156 Modified: branches/4.0.X/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js Log: RF-10221: RichFaces.ui.PopupPanel.showPopupPanel and RichFaces.ui.PopupPanel.hidePopupPanel are fixed. Verified by Anton Belevich. Modified: branches/4.0.X/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js =================================================================== --- branches/4.0.X/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2011-03-11 09:40:16 UTC (rev 22155) +++ branches/4.0.X/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2011-03-11 11:07:30 UTC (rev 22156) @@ -749,11 +749,11 @@ $.extend(richfaces.ui.PopupPanel, { showPopupPanel : function (id, opts, event) { - richfaces.Event.ready(richfaces.$(id).show()); + richfaces.Event.ready(function(){richfaces.$(id).show()}); }, hidePopupPanel : function (id, opts, event) { - richfaces.Event.ready(richfaces.$(id).hide()); + richfaces.Event.ready(function(){richfaces.$(id).hide()}); } });

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r22155 - modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2011-03-11 04:40:16 -0500 (Fri, 11 Mar 2011) New Revision: 22155 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java Log: fixed testIgnoreDuplicatedResponsesTrue Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java 2011-03-11 09:39:22 UTC (rev 22154) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jQueue/TestGlobalQueue.java 2011-03-11 09:40:16 UTC (rev 22155) @@ -228,7 +228,7 @@ assertEquals(queue.getRepeatedText(), ""); handle.waitForOpen(); handle.complete(); - waitGui.dontFail().waitForChange("b", retrieveText.locator(queue.repeatedText)); + waitGui.dontFail().waitForChange("", retrieveText.locator(queue.repeatedText)); assertEquals(queue.getRepeatedText(), "d"); } } \ No newline at end of file

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r22154 - in modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest: a4jAjax and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: lfryc(a)redhat.com Date: 2011-03-11 04:39:22 -0500 (Fri, 11 Mar 2011) New Revision: 22154 Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHCommandButton.java Log: added abstract ReloadTester and introduced tests for HCommandButton (RFPL-1079) Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-03-11 05:28:00 UTC (rev 22153) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-03-11 09:39:22 UTC (rev 22154) @@ -89,13 +89,13 @@ protected TextRetriever retrieveStatusChecker = retrieveText.locator(jq("#statusCheckerOutput")); protected PhaseInfo phaseInfo = new PhaseInfo(); protected LocatorReference<JQueryLocator> attributesRoot = new LocatorReference<JQueryLocator>( - pjq("span[id$=:attributes:panel]")); + pjq("span[id$=:attributes:panel]")); /** * timeout in miliseconds */ public static final long TIMEOUT = 5000; @Inject - @Templates({"plain", "richDataTable1", "a4jRepeat2", "hDataTable1", "uiRepeat2"}) + @Templates({ "plain", "richDataTable1", "a4jRepeat2", "hDataTable1", "uiRepeat2" }) private TemplatesList template; /** @@ -204,7 +204,7 @@ selenium.fireEvent(element, event); waitGui.failWith("Attribute on" + attributeName + " does not work correctly").until( - new EventFiredCondition(event)); + new EventFiredCondition(event)); } /** @@ -266,7 +266,7 @@ selenium.getEval(new JavaScript("window.metamerEvents = \"\";")); } - + public void testRequestEventsBeforeByAlert(String... events) { for (String event : events) { ReferencedLocator<JQueryLocator> input = ref(attributesRoot, "input[type=text][id$=on{0}Input]"); @@ -279,27 +279,27 @@ public void testRequestEventsAfter(String... events) { String[] actualEvents = selenium.getEval(new JavaScript("window.metamerEvents")).split(" "); assertEquals( - actualEvents, - events, - format("The events ({0}) don't came in right order ({1})", Arrays.deepToString(actualEvents), + actualEvents, + events, + format("The events ({0}) don't came in right order ({1})", Arrays.deepToString(actualEvents), Arrays.deepToString(events))); } - + public void testRequestEventsAfterByAlert(String... events) { List<String> list = new LinkedList<String>(); - + for (int i = 0; i < events.length; i++) { waitGui.dontFail().until(alertPresent); if (selenium.isAlertPresent()) { list.add(selenium.getAlert()); } } - + String[] actualEvents = list.toArray(new String[list.size()]); assertEquals( - actualEvents, - events, - format("The events ({0}) don't came in right order ({1})", Arrays.deepToString(actualEvents), + actualEvents, + events, + format("The events ({0}) don't came in right order ({1})", Arrays.deepToString(actualEvents), Arrays.deepToString(events))); } @@ -398,7 +398,7 @@ selenium.waitForPageToLoad(); assertTrue(selenium.getAttribute(attr).contains(value), "Attribute " + attribute + " should contain \"" + value - + "\"."); + + "\"."); } /** @@ -445,4 +445,37 @@ selenium.fireEvent(target, event); } } + + /** + * Abstract ReloadTester for testing + * + * @param <T> + * the type of input values which will be set, sent and then verified + */ + public abstract class ReloadTester<T> { + + public abstract void doRequest(T inputValue); + + public abstract void verifyResponse(T inputValue); + + public abstract T[] getInputValues(); + + public void testRerenderAll() { + for (T inputValue : getInputValues()) { + doRequest(inputValue); + verifyResponse(inputValue); + AbstractMetamerTest.this.rerenderAll(); + verifyResponse(inputValue); + } + } + + public void testFullPageRefresh() { + for (T inputValue : getInputValues()) { + doRequest(inputValue); + verifyResponse(inputValue); + AbstractMetamerTest.this.fullPageRefresh(); + verifyResponse(inputValue); + } + } + } } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java 2011-03-11 05:28:00 UTC (rev 22153) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/AbstractTestCommand.java 2011-03-11 09:39:22 UTC (rev 22154) @@ -46,11 +46,13 @@ private JQueryLocator output1 = pjq("div[id$=output1]"); private JQueryLocator output2 = pjq("div[id$=output2]"); + private LocalReloadTester reloadTester = new LocalReloadTester(); + public void testClick(JQueryLocator command, String text) { selenium.type(input, text); guardXhr(selenium).click(command); String outputValue = waitGui.failWith("Page was not updated").waitForChangeAndReturn("", - retrieveText.locator(output1)); + retrieveText.locator(output1)); assertEquals(outputValue, text, "Wrong output1"); assertEquals(selenium.getText(output2), text, "Wrong output2"); @@ -70,7 +72,7 @@ assertEquals(selenium.getText(output1), "", "Output should not change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, - PhaseId.RENDER_RESPONSE); + PhaseId.RENDER_RESPONSE); phaseInfo.assertListener(PhaseId.PROCESS_VALIDATIONS, "listener invoked"); } @@ -97,7 +99,7 @@ selenium.type(input, "RichFaces 4"); guardHttp(selenium).click(command); - + assertEquals(selenium.getText(output1), "RichFaces 4", "Output1 should not change"); assertEquals(selenium.getText(output2), "RichFaces 4", "Output2 should not change"); } @@ -134,7 +136,7 @@ assertEquals(selenium.getText(output1), "RichFaces 4", "Output should change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, - PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); + PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION, PhaseId.RENDER_RESPONSE); phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } @@ -154,7 +156,7 @@ assertEquals(selenium.getText(output1), "", "Output should not change"); phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES, PhaseId.PROCESS_VALIDATIONS, - PhaseId.RENDER_RESPONSE); + PhaseId.RENDER_RESPONSE); phaseInfo.assertListener(PhaseId.APPLY_REQUEST_VALUES, "listener invoked"); } @@ -203,7 +205,7 @@ selenium.type(input, "RichFaces 4"); guardXhr(selenium).click(command); String outputValue = waitGui.failWith("Page was not updated").waitForChangeAndReturn("", - retrieveText.locator(output1)); + retrieveText.locator(output1)); assertEquals(outputValue, "RichFaces 4", "Wrong output1"); assertEquals(selenium.getText(output2), "", "Wrong output2"); @@ -215,6 +217,38 @@ String statusCheckerTime = selenium.getText(statusChecker); guardXhr(selenium).click(command); - waitGui.failWith("Attribute status doesn't work").waitForChange(statusCheckerTime, retrieveText.locator(statusChecker)); + waitGui.failWith("Attribute status doesn't work").waitForChange(statusCheckerTime, + retrieveText.locator(statusChecker)); } + + public void testRerenderAll(JQueryLocator command) { + reloadTester.command = command; + reloadTester.testRerenderAll(); + } + + public void testFullPageRefresh(JQueryLocator command) { + reloadTester.command = command; + reloadTester.testFullPageRefresh(); + } + + private class LocalReloadTester extends ReloadTester<String> { + JQueryLocator command; + + @Override + public void doRequest(String inputValue) { + selenium.type(input, inputValue); + guardXhr(selenium).click(command); + } + + @Override + public void verifyResponse(String inputValue) { + assertEquals(selenium.getText(output1), inputValue, "Wrong output1"); + assertEquals(selenium.getText(output2), inputValue, "Wrong output2"); + } + + @Override + public String[] getInputValues() { + return new String[] { "RichFaces 3", "RichFaces 4" }; + } + }; } Modified: modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHCommandButton.java =================================================================== --- modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHCommandButton.java 2011-03-11 05:28:00 UTC (rev 22153) +++ modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jAjax/TestHCommandButton.java 2011-03-11 09:39:22 UTC (rev 22154) @@ -105,4 +105,14 @@ public void testStatus() { testStatus(button); } + + @Test + public void testFullPageRefresh() { + testFullPageRefresh(button); + } + + @Test + public void testRerenderAll() { + testRerenderAll(button); + } }

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r22153 - in modules/docs/trunk/Component_Reference/src/main/docbook/en-US: extras and 1 other directories.

by richfaces-svn-commits＠lists.jboss.org

Author: SeanRogers Date: 2011-03-11 00:28:00 -0500 (Fri, 11 Mar 2011) New Revision: 22153 Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/skinning/tabl-a4jlog.xml Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richextendedDataTable-Selecting_multiple_rows.xml_sample Log: Added a4jlog skinning reference, fixed value for multiple selection mode (RFPL-1244) Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml =================================================================== --- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml 2011-03-10 22:57:29 UTC (rev 22152) +++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Processing_management.xml 2011-03-11 05:28:00 UTC (rev 22153) @@ -184,6 +184,11 @@ </listitem> </itemizedlist> </section> + + <section id="sect-Component_Reference-a4jlog-Style_classes_and_skin_parameters"> + <title>Style classes and skin parameters</title> + <xi:include href="skinning/tabl-a4jlog.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> + </section> </section> <section id="sect-Component_Reference-Processing_management-a4jstatus"> Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml =================================================================== --- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml 2011-03-10 22:57:29 UTC (rev 22152) +++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/chap-Component_Reference-Tables_and_grids.xml 2011-03-11 05:28:00 UTC (rev 22153) @@ -878,7 +878,7 @@ Row selection is determined by the <varname>selectionMode</varname> attribute. Setting the attribute to <literal>none</literal> allows for no row selection capability. The example table shown in <xref linkend="exam-Component_Reference-richextendedDataTable-richextendedDataTable_example" /> does not allow row selection. </para> <para> - Setting the <varname>selectionMode</varname> attribute to <literal>single</literal> allows the user to select a single row at a time using the mouse. With the <varname>selectionMode</varname> attribute set to <literal>multi</literal>, the user can select multiple rows. Holding down the <keycap function="control">Ctrl</keycap> key while clicking selects additional rows with each click. Holding down the <keycap function="shift">Shift</keycap> key while clicking selects all the rows in a range. + Setting the <varname>selectionMode</varname> attribute to <literal>single</literal> allows the user to select a single row at a time using the mouse. With the <varname>selectionMode</varname> attribute set to <literal>multiple</literal>, the user can select multiple rows. Holding down the <keycap function="control">Ctrl</keycap> key while clicking selects additional rows with each click. Holding down the <keycap function="shift">Shift</keycap> key while clicking selects all the rows in a range. </para> <para> The <varname>selection</varname> attribute points to a collection of objects. It holds the <varname>rowKey</varname> identifiers to track which rows are selected. <xref linkend="exam-Component_Reference-richextendedDataTable-Selecting_multiple_rows" /> shows how to implement multiple row selection in the same table from <xref linkend="exam-Component_Reference-richextendedDataTable-richextendedDataTable_example" />. Modified: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richextendedDataTable-Selecting_multiple_rows.xml_sample =================================================================== --- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richextendedDataTable-Selecting_multiple_rows.xml_sample 2011-03-10 22:57:29 UTC (rev 22152) +++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/extras/exam-Component_Reference-richextendedDataTable-Selecting_multiple_rows.xml_sample 2011-03-11 05:28:00 UTC (rev 22153) @@ -1,5 +1,5 @@ <rich:extendedDataTable value="#{extTableSelectionBean.inventoryItems}" var="car" selection="#{extTableSelectionBean.selection}" id="table" frozenColumns="2" - style="height:300px; width:500px;" selectionMode="multi"> + style="height:300px; width:500px;" selectionMode="multiple"> ... Added: modules/docs/trunk/Component_Reference/src/main/docbook/en-US/skinning/tabl-a4jlog.xml =================================================================== --- modules/docs/trunk/Component_Reference/src/main/docbook/en-US/skinning/tabl-a4jlog.xml (rev 0) +++ modules/docs/trunk/Component_Reference/src/main/docbook/en-US/skinning/tabl-a4jlog.xml 2011-03-11 05:28:00 UTC (rev 22153) @@ -0,0 +1,280 @@ +<?xml version='1.0' encoding='utf-8' ?> +<!DOCTYPE table PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [ +]> + +<table id="tabl-a4jlog-Style_classes_and_corresponding_skin_parameters"> + <title>Style classes (selectors) and corresponding skin parameters</title> + <tgroup cols="3"> + <colspec colname="class"/> + <colspec colname="skin"/> + <colspec colname="css"/> + <spanspec spanname="noskin" namest="skin" nameend="css"/> + <thead> + <row> + <entry>Class (selector)</entry> + <entry>Skin Parameters</entry> + <entry>Mapped <acronym>CSS</acronym> properties</entry> + </row> + </thead> + <tbody> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log</classname></term> + <listitem> + <para> + This class defines styles for the log. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry><literal>generalTextColor</literal></entry> + <entry><literal>color</literal></entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-popup</classname></term> + <listitem> + <para> + This class defines styles for the log when it appears as a pop-up. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-popup-cnt</classname></term> + <listitem> + <para> + This class defines styles for the content of the log pop-up. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-inline</classname></term> + <listitem> + <para> + This class defines styles for the log when it appears in-line. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-contents</classname></term> + <listitem> + <para> + This class defines styles for the log contents. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-entry-lbl</classname></term> + <listitem> + <para> + This class defines styles for a label in the log. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-entry-lbl-debug</classname></term> + <listitem> + <para> + This class defines styles for the <guilabel>debug</guilabel> label in the log. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-entry-lbl-info</classname></term> + <listitem> + <para> + This class defines styles for the <guilabel>information</guilabel> label in the log. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-entry-lbl-warn</classname></term> + <listitem> + <para> + This class defines styles for the <guilabel>warning</guilabel> label in the log. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-entry-lbl-error</classname></term> + <listitem> + <para> + This class defines styles for the <guilabel>error</guilabel> label in the log. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-entry-msg</classname></term> + <listitem> + <para> + This class defines styles for a message in the log. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-entry-msg-debug</classname></term> + <listitem> + <para> + This class defines styles for the <guilabel>debug</guilabel> message in the log. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-entry-msg-info</classname></term> + <listitem> + <para> + This class defines styles for the <guilabel>information</guilabel> message in the log. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-entry-msg-warn</classname></term> + <listitem> + <para> + This class defines styles for the <guilabel>warning</guilabel> message in the log. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-entry-msg-error</classname></term> + <listitem> + <para> + This class defines styles for the <guilabel>error</guilabel> message in the log. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + <row> + <entry> + <variablelist> + <varlistentry> + <term><classname>.rf-log-entry-msg-xml</classname></term> + <listitem> + <para> + This class defines styles for an XML message in the log. + </para> + </listitem> + </varlistentry> + </variablelist> + </entry> + <entry spanname="noskin">No skin parameters.</entry> + </row> + + </tbody> + </tgroup> +</table>

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r22152 - branches/4.0.X/examples/validator-demo/src/main/webapp/examples.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2011-03-10 17:57:29 -0500 (Thu, 10 Mar 2011) New Revision: 22152 Modified: branches/4.0.X/examples/validator-demo/src/main/webapp/examples/beanValidation.xhtml Log: Test additional message attributes Modified: branches/4.0.X/examples/validator-demo/src/main/webapp/examples/beanValidation.xhtml =================================================================== --- branches/4.0.X/examples/validator-demo/src/main/webapp/examples/beanValidation.xhtml 2011-03-10 22:56:38 UTC (rev 22151) +++ branches/4.0.X/examples/validator-demo/src/main/webapp/examples/beanValidation.xhtml 2011-03-10 22:57:29 UTC (rev 22152) @@ -19,16 +19,16 @@ <h:inputText id="${bean.label}" value="#{bean.value}" label="#{bean.label}" converter="#{bean.converter}"> <csv:validator summary="Invalid value" /> </h:inputText> - <csv:message for="${bean.label}" /> + <csv:message for="${bean.label}" tooltip="true"/> </c:forEach> <h:outputLabel for="assertTrue" value="#{booleanBean.description}" /> <h:selectBooleanCheckbox id="assertTrue" value="#{booleanBean.value}" label="#{booleanBean.label}" > <csv:validator summary="Required checkbox" /> </h:selectBooleanCheckbox> - <csv:message for="assertTrue" /> + <csv:message for="assertTrue" showDetail="true" showSummary="true"/> </h:panelGrid> <h:commandButton value="Submit"></h:commandButton> - <csv:messages /> + <csv:messages showDetail="true" showSummary="true"/> </h:form> </ui:define> </ui:composition>

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r22151 - branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/renderkit/html.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2011-03-10 17:56:38 -0500 (Thu, 10 Mar 2011) New Revision: 22151 Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java Log: RESOLVED - issue RF-10732: https://issues.jboss.org/browse/RF-10732 Discussed with Nick. Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java 2011-03-10 22:49:07 UTC (rev 22150) +++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/renderkit/html/ClientValidatorRenderer.java 2011-03-10 22:56:38 UTC (rev 22151) @@ -160,7 +160,8 @@ validatorScript = createValidatorScript(behaviorContext, behavior, validators, null); } } catch (ConverterNotFoundException e) { - throw new FacesException(e); + // fallback to ajax-only validation + validatorScript = new AjaxOnlyScript(createAjaxScript(behaviorContext, behavior)); } String clientId = getComponentClientId(behaviorContext); String name = ScriptUtils.getValidJavascriptName(clientId + ":v");

13 years, 3 months

1
0
0 / 0

JBoss Rich Faces SVN: r22150 - in branches/4.0.X/ui/validator/ui/src: test/java/org/richfaces/javascript and 1 other directory.

by richfaces-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2011-03-10 17:49:07 -0500 (Thu, 10 Mar 2011) New Revision: 22150 Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/javascript/ClientScriptServiceImpl.java branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/ClientScriptServiceTest.java Log: RESOLVED - issue RF-10719: Validation: several javascript files not found https://issues.jboss.org/browse/RF-10719 Discussed with Nick. Modified: branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/javascript/ClientScriptServiceImpl.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/javascript/ClientScriptServiceImpl.java 2011-03-10 20:49:40 UTC (rev 22149) +++ branches/4.0.X/ui/validator/ui/src/main/java/org/richfaces/javascript/ClientScriptServiceImpl.java 2011-03-10 22:49:07 UTC (rev 22150) @@ -78,7 +78,7 @@ if (null == facesContext || null == javaClass) { throw new NullPointerException(); } - LibraryFunction function = getFromComputationMap(resourcesMapping, javaClass); + LibraryFunction function = NO_SCRIPT;// RF-10719, temporary disable. getFromComputationMap(resourcesMapping, javaClass); if(NO_SCRIPT == function) { if (defaultMapping.containsKey(javaClass)) { function = defaultMapping.get(javaClass); Modified: branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/ClientScriptServiceTest.java =================================================================== --- branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/ClientScriptServiceTest.java 2011-03-10 20:49:40 UTC (rev 22149) +++ branches/4.0.X/ui/validator/ui/src/test/java/org/richfaces/javascript/ClientScriptServiceTest.java 2011-03-10 22:49:07 UTC (rev 22150) @@ -20,6 +20,7 @@ import org.jboss.test.faces.mock.MockTestRunner; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.richfaces.resource.ResourceKey; @@ -84,6 +85,7 @@ * @throws Exception */ @Test + @Ignore public void testGetScriptAsJsfResource() throws Exception { LibraryFunction script = getScript(resource, ValidatorWithFacesResource.class); assertEquals(RESOURCE_NAME, getOnlyResource(script).getResourceName()); @@ -119,7 +121,7 @@ } private LibraryFunction getScript(Resource resource, Class<?> serverSideType) throws ScriptNotFoundException { - expect(resourceHandler.createResource(serverSideType.getSimpleName() + ".js", ORG_RICHFACES_CSV, TEXT_JAVASCRIPT)).andReturn(resource); +// expect(resourceHandler.createResource(serverSideType.getSimpleName() + ".js", ORG_RICHFACES_CSV, TEXT_JAVASCRIPT)).andReturn(resource); controller.replay(); LibraryFunction script = serviceImpl.getScript(environment.getFacesContext(), serverSideType); return script;

13 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

richfaces-svn-commits March 2011