richfaces-svn-commits
March 2011
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 355 discussions
JBoss Rich Faces SVN: r22180 - branches/4.0.X/dist.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2011-03-12 08:12:51 -0500 (Sat, 12 Mar 2011)
New Revision: 22180
Modified:
branches/4.0.X/dist/readme-examples.txt
branches/4.0.X/dist/readme-ui.txt
Log:
https://issues.jboss.org/browse/RF-10742
https://issues.jboss.org/browse/RF-10741
Modified: branches/4.0.X/dist/readme-examples.txt
===================================================================
--- branches/4.0.X/dist/readme-examples.txt 2011-03-12 13:12:25 UTC (rev 22179)
+++ branches/4.0.X/dist/readme-examples.txt 2011-03-12 13:12:51 UTC (rev 22180)
@@ -2,7 +2,7 @@
RichFaces - Ajax enabled JSF 2.0 component library
- RichFaces 4.0.CR1 EXAMPLES
+ RichFaces 4.0.Final EXAMPLES
http://richfaces.org
March 2011
This software is distributed under the terms of the
Modified: branches/4.0.X/dist/readme-ui.txt
===================================================================
--- branches/4.0.X/dist/readme-ui.txt 2011-03-12 13:12:25 UTC (rev 22179)
+++ branches/4.0.X/dist/readme-ui.txt 2011-03-12 13:12:51 UTC (rev 22180)
@@ -2,7 +2,7 @@
RichFaces - Ajax enabled JSF 2.0 component library
- RichFaces 4.0.CR1
+ RichFaces 4.0.Final
http://www.jboss.org/richfaces
March 2011
This software is distributed under the terms of the
@@ -293,6 +293,29 @@
rich:graphValidator
+New in Version 4.0.Final
+----------------------
+ - Found more Taglib's problems during QE and made corresponding corrections for better IDE support
+ https://issues.jboss.org/browse/RF-9936
+ - Thorough review for all the component attributes done and corrections for not working ones were made.
+ - Bugfixing for CSV and Object Validation features.
+ - Refactoring Listeners classes, methods and Event names according to standard JSF convention.
+ https://issues.jboss.org/browse/RF-10712
+ - Review and update predefined rf-* CSS classes for components to satisfy naming convention
+ https://issues.jboss.org/browse/RF-9290
+ - TreeNode and TreeDataModel models support for rich:tree added.
+ https://issues.jboss.org/browse/RF-9718
+ - jQuery updated to 1.5.1. https://issues.jboss.org/browse/RF-10686
+ - richfaces-showcase design corrections at most.
+ Most important application change - reviewed current state for different JSF environments support and
+ finalized pom.xml profiles for:
+ richfaces-showcase (Mojara 2.0.3 - GAE build, Mojara 2.0.4 default build)
+ richfaces-archetype-simpleapp (Mojara 2.0.4 default build)
+ rf-gae-sample archetype (MyFaces 2.0.4 both GAE and default builds)
+ - Completed Push component demo - irc-sample.
+
+
+
New in Version 4.0.CR1
----------------------
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22179 - in branches/4.0.X: ui/input/api/src/main/java/org/richfaces/component and 5 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2011-03-12 08:12:25 -0500 (Sat, 12 Mar 2011)
New Revision: 22179
Removed:
branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml
branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml
Modified:
branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceInput.xhtml
branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceSelect.xhtml
branches/4.0.X/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java
branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java
branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java
branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java
branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelectComponent.java
branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java
branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java
branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml
branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml
branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java
branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java
branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTest.xhtml
branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTest.xhtml
Log:
https://issues.jboss.org/browse/RF-10730 inplaces stlying attributes to be changed . Reviewed by Gleb Galkin.
Modified: branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceInput.xhtml
===================================================================
--- branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceInput.xhtml 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceInput.xhtml 2011-03-12 13:12:25 UTC (rev 22179)
@@ -17,7 +17,13 @@
</in:inplaceInput>
<h:commandButton value="submit"/>
<in:inplaceInput showControls="true" defaultLabel="click to enter your name" saveOnBlur="true"
- onblur="RichFaces.$('form:ii').cancel()" id="ii">
+ onblur="RichFaces.$('form:ii').cancel()" id="ii"
+ activeClass="activeClass"
+ disabledClass="disabledClass"
+ editClass="editClass"
+ changedClass="changedClass"
+ styleClass="styleClass"
+ >
</in:inplaceInput>
</h:form>
</h:body>
Modified: branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceSelect.xhtml
===================================================================
--- branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceSelect.xhtml 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/examples/input-demo/src/main/webapp/examples/inplaceSelect.xhtml 2011-03-12 13:12:25 UTC (rev 22179)
@@ -19,7 +19,14 @@
<fieldset>
<legend>InplaceSelect Test App</legend>
Fresh off his victory in the Florida primary, Sen. John McCain is poised to take another big prize. Former
- <in:inplaceSelect id='ii' defaultLabel="" value="#{inputBean.value}" openOnEdit="true" saveOnSelect="false">
+ <in:inplaceSelect id='ii' defaultLabel="hello!" value="#{inputBean.value}" openOnEdit="true" saveOnSelect="false"
+ activeClass="activeClass"
+ changedClass="changedClass"
+ disabledClass="disabledClass"
+ styleClass="styleClass"
+ disabled="false"
+
+ >
<f:selectItem itemLabel="Label#1" itemValue="Value#1"/>
<f:selectItem itemLabel="Label#2" itemValue="Value#2"/>
<f:selectItem itemLabel="Label#3" itemValue="Value#3"/>
@@ -41,6 +48,7 @@
<ul>
<li><h:commandButton value="submit"></h:commandButton></li>
<li> <h:commandButton value="ShowPopup" onclick="#{misc:component('ii')}.showPopup(); return false;"/></li>
+ <li></li>
</ul>
Modified: branches/4.0.X/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java
===================================================================
--- branches/4.0.X/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/api/src/main/java/org/richfaces/component/InplaceComponent.java 2011-03-12 13:12:25 UTC (rev 22179)
@@ -40,19 +40,13 @@
public boolean isSaveOnBlur();
public InplaceState getState();
-
- public String getReadyStateClass();
- public String getEditStateClass();
+ public String getActiveClass();
- public String getChangedStateClass();
+ public String getChangedClass();
- public String getDisabledStateClass();
+ public String getDisabledClass();
- public String getEditClass();
-
- public String getNoneClass();
-
public abstract int getTabindex();
}
Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceInput.java 2011-03-12 13:12:25 UTC (rev 22179)
@@ -70,25 +70,16 @@
@Attribute
public abstract int getTabindex();
-
- @Attribute
- public abstract String getReadyStateClass();
@Attribute
- public abstract String getEditStateClass();
+ public abstract String getActiveClass();
@Attribute
- public abstract String getChangedStateClass();
+ public abstract String getChangedClass();
@Attribute
- public abstract String getDisabledStateClass();
-
- @Attribute
- public abstract String getEditClass();
-
- @Attribute
- public abstract String getNoneClass();
-
+ public abstract String getDisabledClass();
+
@Attribute(events=@EventName("click"))
public abstract String getOnclick();
Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractInplaceSelect.java 2011-03-12 13:12:25 UTC (rev 22179)
@@ -85,29 +85,20 @@
public abstract String getListClass();
@Attribute
- public abstract String getChangedStateClass();
+ public abstract String getChangedClass();
@Attribute
public abstract String getDefaultLabel();
@Attribute
- public abstract String getDisabledStateClass();
+ public abstract String getDisabledClass();
@Attribute
- public abstract String getEditStateClass();
-
- @Attribute
- public abstract String getReadyStateClass();
-
- @Attribute
- public abstract String getNoneClass();
-
+ public abstract String getActiveClass();
+
@Attribute()
public abstract String getEditEvent();
-
- @Attribute
- public abstract String getEditClass();
-
+
@Attribute(events=@EventName("inputclick"))
public abstract String getOninputclick();
Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelect.java 2011-03-12 13:12:25 UTC (rev 22179)
@@ -42,17 +42,14 @@
public abstract String getMaxListHeight();
@Attribute(hidden = true)
- public abstract String getReadyStateClass();
+ public abstract String getActiveClass();
@Attribute(hidden = true)
- public abstract String getEditStateClass();
+ public abstract String getChangedClass();
@Attribute(hidden = true)
- public abstract String getChangedStateClass();
+ public abstract String getDisabledClass();
- @Attribute(hidden = true)
- public abstract String getDisabledStateClass();
-
@Attribute
public abstract String getStyle();
Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelectComponent.java
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelectComponent.java 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractSelectComponent.java 2011-03-12 13:12:25 UTC (rev 22179)
@@ -48,18 +48,15 @@
@Attribute
public abstract String getSelectItemClass();
-
- @Attribute
- public abstract String getReadyStateClass();
@Attribute
- public abstract String getEditStateClass();
+ public abstract String getActiveClass();
@Attribute
- public abstract String getChangedStateClass();
+ public abstract String getChangedClass();
@Attribute
- public abstract String getDisabledStateClass();
+ public abstract String getDisabledClass();
@Attribute
public abstract String getListClass();
Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceInputRendererBase.java 2011-03-12 13:12:25 UTC (rev 22179)
@@ -134,40 +134,46 @@
}
return style;
}
+
+ public String getContainerStyleClasses(UIComponent component) {
+ InplaceComponent inplaceComponent = (InplaceComponent) component;
+ String style = "rf-ii";
+ if (inplaceComponent.isDisabled()) {
+ style = concatClasses(style, getDisableStateCss(inplaceComponent));
+ }
+ return style;
+ }
public String getEditStyleClass(UIComponent component, InplaceState inplaceState) {
InplaceComponent inplaceComponent = (InplaceComponent)component;
return (InplaceState.edit != inplaceState) ? concatClasses(getEditCss(inplaceComponent), getNoneCss(inplaceComponent)) : getEditCss(inplaceComponent);
}
-
+
public String getReadyStateCss(InplaceComponent component) {
- String css = component.getReadyStateClass();
- return concatClasses("rf-ii", css);
+ return "rf-ii";
}
public String getEditStateCss(InplaceComponent component) {
- String css = component.getEditStateClass();
+ String css = component.getActiveClass();
return concatClasses("rf-ii-act", css);
}
public String getChangedStateCss(InplaceComponent component) {
- String css = component.getChangedStateClass();
+ String css = component.getChangedClass();
return concatClasses("rf-ii-chng", css);
}
public String getDisableStateCss(InplaceComponent component) {
- String css = component.getDisabledStateClass();
+ String css = component.getDisabledClass();
return concatClasses("rf-ii-dis", css);
}
-
+
public String getEditCss(InplaceComponent component) {
- String css = component.getEditClass();
- return concatClasses("rf-ii-fld-cntr", css);
+ return "rf-ii-fld-cntr";
}
public String getNoneCss(InplaceComponent component) {
- String css = component.getNoneClass();
- return concatClasses("rf-ii-none", css);
+ return "rf-ii-none";
}
protected String getInputWidth(UIComponent component) {
Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/InplaceSelectRendererBase.java 2011-03-12 13:12:25 UTC (rev 22179)
@@ -114,35 +114,42 @@
}
return label;
}
-
- public String getReadyStateCss(InplaceComponent component) {
- String css = component.getReadyStateClass();
- return concatClasses("rf-is", css);
+
+ public String getContainerStyleClasses(UIComponent component) {
+ InplaceComponent inplaceComponent = (InplaceComponent) component;
+ String style = concatClasses("rf-is", component.getAttributes().get("styleClass"));
+ if (inplaceComponent.isDisabled()) {
+ style = concatClasses(style, getDisableStateCss(inplaceComponent));
+ }
+ return style;
}
public String getEditStateCss(InplaceComponent component) {
- String css = component.getEditStateClass();
+ String css = component.getActiveClass();
return concatClasses("rf-is-act", css);
}
public String getChangedStateCss(InplaceComponent component) {
- String css = component.getChangedStateClass();
+ String css = component.getChangedClass();
return concatClasses("rf-is-chng", css);
}
public String getDisableStateCss(InplaceComponent component) {
- String css = component.getDisabledStateClass();
+ String css = component.getDisabledClass();
return concatClasses("rf-is-dis", css);
}
+
+ public String getDisabledCss(UIComponent component) {
+ AbstractInplaceSelect inplaceSelect = (AbstractInplaceSelect) component;
+ return getDisableStateCss(inplaceSelect);
+ }
public String getEditCss(InplaceComponent component) {
- String css = component.getEditClass();
- return concatClasses("rf-is-fld-cntr", css);
+ return "rf-is-fld-cntr";
}
public String getNoneCss(InplaceComponent component) {
- String css = component.getNoneClass();
- return concatClasses("rf-is-none", css);
+ return "rf-is-none";
}
public String getListCss(UIComponent component) {
Modified: branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml 2011-03-12 13:12:25 UTC (rev 22179)
@@ -44,7 +44,7 @@
<cdk:object type="java.lang.String" name="defaultLabel" value="#{inplaceValue != null and inplaceValue.length() != 0 ? inplaceValue : '   '}" />
<span id="#{clientId}" cdk:passThroughWithExclusions="id class"
- class="#{concatClasses(getStateStyleClass(component, inplaceState), component.attributes['styleClass'])}">
+ class="#{concatClasses(getContainerStyleClasses(component), component.attributes['styleClass'])}">
<span id="#{clientId}Label" class="rf-ii-lbl#{inplaceValue == component.attributes['defaultLabel'] ? ' rf-ii-dflt-lbl' : ''}">
#{defaultLabel}
</span>
@@ -89,8 +89,8 @@
<cdk:scriptObject name="options">
<cdk:scriptOption name="readyCss" value="#{concatClasses('rf-ii', component.attributes['readyStateClass'])}"/>
<cdk:scriptOption name="noneCss" value="#{concatClasses('rf-ii-none', component.attributes['noneStateClass'])}"/>
- <cdk:scriptOption name="changedCss" value="#{concatClasses('rf-ii-chng', component.attributes['changedStateClass'])}"/>
- <cdk:scriptOption name="editCss" value="#{concatClasses('rf-ii-act', component.attributes['editStateClass'])}"/>
+ <cdk:scriptOption name="changedCss" value="#{concatClasses('rf-ii-chng', component.attributes['changedClass'])}"/>
+ <cdk:scriptOption name="editCss" value="#{concatClasses('rf-ii-act', component.attributes['activeClass'])}"/>
<cdk:scriptOption name="editEvent" value="#{getEditEvent(component)}"/>
<cdk:scriptOption name="defaultLabel" value="#{defaultLabel}" />
<cdk:scriptOption attributes="state saveOnBlur showControls" />
Modified: branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2011-03-12 13:12:25 UTC (rev 22179)
@@ -38,8 +38,7 @@
value="#{getConvertedSelectItems(facesContext, component)}" />
<cdk:object type="java.lang.String" name="defaultLabel" value="#{inplaceValue != null and inplaceValue.length() != 0 ? inplaceValue : '   '}" />
- <span id="#{clientId}" cdk:passThroughWithExclusions="id class"
- class="#{concatClasses(getStateStyleClass(component, inplaceState), component.attributes['styleClass'])}" >
+ <span id="#{clientId}" cdk:passThroughWithExclusions="id class" class="#{ getContainerStyleClasses(component) }" >
<span id="#{clientId}Label" class="rf-is-lbl#{inplaceValue == component.attributes['defaultLabel'] ? ' rf-is-dflt-lbl' : ''}">
#{defaultLabel}
@@ -103,8 +102,8 @@
<cdk:scriptObject name="options">
<cdk:scriptOption name="items" value="#{clientSelectItems}" />
<cdk:scriptOption name="noneCss" value="#{concatClasses('rf-is-none', component.attributes['noneStateClass'])}"/>
- <cdk:scriptOption name="changedCss" value="#{concatClasses('rf-is-chng', component.attributes['changedStateClass'])}"/>
- <cdk:scriptOption name="editCss" value="#{concatClasses('rf-is-act', component.attributes['editStateClass'])}"/>
+ <cdk:scriptOption name="changedCss" value="#{concatClasses('rf-is-chng', component.attributes['changedClass'])}"/>
+ <cdk:scriptOption name="editCss" value="#{concatClasses('rf-is-act', component.attributes['activeClass'])}"/>
<cdk:scriptOption name="selectItemCss" value="#{concatClasses('rf-is-sel', component.attributes['selectItemClass'])}"/>
<cdk:scriptOption name="editEvent" value="#{getEditEvent(component)}"/>
<cdk:scriptOption name="defaultLabel" value="#{defaultLabel}" />
Modified: branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceInputRendererTest.java 2011-03-12 13:12:25 UTC (rev 22179)
@@ -5,6 +5,7 @@
import java.io.IOException;
+import org.junit.Ignore;
import org.junit.Test;
import org.xml.sax.SAXException;
@@ -28,13 +29,7 @@
public void testDefaultWithControlsEncode() throws IOException, SAXException {
doTestDefaultWithControlsEncode(PAGE_NAME, BASE_ID);
}
-
- @Test
- public void testEditEncode() throws IOException, SAXException {
- doTestEditEncode(PAGE_NAME, BASE_ID);
- }
-
@Test
public void testEdit() throws Exception {
HtmlPage page = environment.getPage("/inplaceInputTest.jsf");
Modified: branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/test/java/org/richfaces/renderkit/InplaceSelectRendererTest.java 2011-03-12 13:12:25 UTC (rev 22179)
@@ -41,24 +41,11 @@
}
@Test
+ @Ignore
public void testEditEncode() throws IOException, SAXException {
doTestEditEncode(PAGE_NAME, BASE_ID);
}
- @Test
- @Ignore
- public void testEdit() throws Exception {
- HtmlPage page = environment.getPage("/inplaceSelectTest.jsf");
- String defaultComponentId = BASE_ID + DEFAULT;
- edit(page, defaultComponentId, 1);
-
- HtmlElement input = page.getFirstByXPath("//*[@id = '" + defaultComponentId + "Input']");
- assertNotNull(input);
-
- String label = input.getAttribute(HtmlConstants.VALUE_ATTRIBUTE);
- assertTrue("Label#3".equals(label));
- }
-
private void edit(HtmlPage page, String inplaceSelectId, int selectIndex) throws Exception {
HtmlElement span = page.getFirstByXPath("//*[@id = '" + inplaceSelectId + "']");
assertNotNull(span);
Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTest.xhtml
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTest.xhtml 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTest.xhtml 2011-03-12 13:12:25 UTC (rev 22179)
@@ -24,12 +24,6 @@
<br/>
<br/>
<br/>
- <h:panelGroup id="three" layout="block">
- <in:inplaceInput id="inplaceInputEdit" defaultLabel="Edit Text" state="edit" showControls="true" value="#{inputBean.value}"/>
- </h:panelGroup>
- <br/>
- <br/>
- <br/>
<h:panelGroup id="panel" layout="block">
<!-- click here for blur -->
</h:panelGroup>
Deleted: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml 2011-03-12 13:12:25 UTC (rev 22179)
@@ -1,38 +0,0 @@
-<span class="rf-ii rf-ii-act" id="form:inplaceInputEdit">
- <span class="rf-ii-lbl rf-ii-dflt-lbl" id="form:inplaceInputEditLabel">Edit Text</span>
- <input class="rf-ii-none" id="form:inplaceInputEditFocus"
- style="position: absolute; top: 0px; left: 0px; outline-style: none;"
- type="image" tabindex="-1" />
- <span class="rf-ii-fld-cntr" id="form:inplaceInputEditEdit">
- <input autocomplete="off" class="rf-ii-fld" id="form:inplaceInputEditInput"
- name="form:inplaceInputEdit" style="width: 100%;" type="text" />
- <span class="rf-ii-btn-prepos">
- <span class="rf-ii-btn-pos">
- <span class="rf-ii-btn-shadow" id="form:inplaceInputEditBtnshadow">
- <span class="rf-ii-btn-shdw-t"></span>
- <span class="rf-ii-btn-shdw-l"></span>
- <span class="rf-ii-btn-shdw-r"></span>
- <span class="rf-ii-btn-shdw-b"></span>
- <span id="form:inplaceInputEditBtn" style="position : relative" tabindex="-1">
- <input class="rf-ii-btn" id="form:inplaceInputEditOkbtn"
- onmousedown="this.className='rf-ii-btn-p'" onmouseout="this.className='rf-ii-btn'"
- onmouseup="this.className='rf-ii-btn'"
- src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces"
- type="image"
- tabindex="-1" />
- <input class="rf-ii-btn" id="form:inplaceInputEditCancelbtn"
- onmousedown="this.className='rf-ii-btn-press'" onmouseout="this.className='rf-ii-btn'"
- onmouseup="this.className='rf-ii-btn'"
- src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces"
- type="image"
- tabindex="-1" />
- <br />
- </span>
- </span>
- </span>
- </span>
- </span>
- <script type="text/javascript">
- // ignored
- </script>
-</span>
\ No newline at end of file
Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTest.xhtml
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTest.xhtml 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTest.xhtml 2011-03-12 13:12:25 UTC (rev 22179)
@@ -24,12 +24,6 @@
<f:selectItem itemLabel="Label#3" itemValue="Value#3" />
<f:selectItem itemLabel="Label#4" itemValue="Value#4" />
</in:inplaceSelect>
- <in:inplaceSelect id="inplaceSelectEdit" state="edit" showControls="true" defaultLabel="Edit Text" value="#{selectBean.value}">
- <f:selectItem itemLabel="Label#1" itemValue="Value#1" />
- <f:selectItem itemLabel="Label#2" itemValue="Value#2" />
- <f:selectItem itemLabel="Label#3" itemValue="Value#3" />
- <f:selectItem itemLabel="Label#4" itemValue="Value#4" />
- </in:inplaceSelect>
<h:panelGroup id="out" layout="block">
<h:outputText id="inplaceSelectValue"
value="Entered Value: #{selectBean.value}" />
Deleted: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2011-03-12 12:58:29 UTC (rev 22178)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2011-03-12 13:12:25 UTC (rev 22179)
@@ -1,46 +0,0 @@
-<span class="rf-is rf-is-act" id="form:inplaceSelectEdit">
- <span class="rf-is-lbl rf-is-dflt-lbl" id="form:inplaceSelectEditLabel">Edit Text</span>
- <input class="rf-is-none" id="form:inplaceSelectEditFocus" name="form:inplaceSelectEditFocus" style="position: absolute; top: 0px; left: 0px; outline-style: none;" type="image" />
- <span class="rf-is-fld-cntr" id="form:inplaceSelectEditEdit">
- <input id="form:inplaceSelectEditselValue" name="form:inplaceSelectEdit" type="hidden" />
- <input autocomplete="off" class="rf-is-fld" id="form:inplaceSelectEditInput" name="form:inplaceSelectEditInput" readonly="readonly" type="text" />
- <span class="rf-is-btn-prepos">
- <span class="rf-is-btn-pos">
- <span class="rf-is-shdw" id="form:inplaceSelectEditBtnshadow">
- <span class="rf-is-shdw-t"></span>
- <span class="rf-is-shdw-l"></span>
- <span class="rf-is-shdw-r"></span>
- <span class="rf-is-shdw-b"></span>
- <span id="form:inplaceSelectEditBtn" style="position : relative;" tabindex="-1">
- <input class="rf-is-btn" id="form:inplaceSelectEditOkbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces" type="image" />
- <input class="rf-is-btn" id="form:inplaceSelectEditCancelbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces" type="image" />
- <br />
- </span>
- </span>
- </span>
- </span>
- <span class="rf-is-lst-cord" id="form:inplaceSelectEditList" style="display: none">
- <span class="rf-is-lst-pos" style="width: 200px">
- <span class="rf-is-shdw">
- <span class="rf-is-shdw-t"></span>
- <span class="rf-is-shdw-l"></span>
- <span class="rf-is-shdw-r"></span>
- <span class="rf-is-shdw-b"></span>
- <span class="rf-is-lst-dec">
- <span class="rf-is-lst-scrl" style="height: 100px">
- <span id="form:inplaceSelectEditItems">
- <span id="form:inplaceSelectEditItem0" class="rf-is-opt">Label#1</span>
- <span id="form:inplaceSelectEditItem1" class="rf-is-opt">Label#2</span>
- <span id="form:inplaceSelectEditItem2" class="rf-is-opt">Label#3</span>
- <span id="form:inplaceSelectEditItem3" class="rf-is-opt">Label#4</span>
- </span>
- </span>
- </span>
- </span>
- </span>
- </span>
- </span>
- <script type="text/javascript">
- //ignore
- </script>
-</span>
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22178 - 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-12 07:58:29 -0500 (Sat, 12 Mar 2011)
New Revision: 22178
Modified:
branches/4.0.X/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js
Log:
RF-10231: fixed JS exception with removing DOM element. Verified by Alex Kolonitsky.
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-12 10:02:45 UTC (rev 22177)
+++ branches/4.0.X/ui/output/ui/src/main/resources/META-INF/resources/org.richfaces/popupPanel.js 2011-03-12 12:58:29 UTC (rev 22178)
@@ -175,12 +175,9 @@
this.borders = null;
if (this.domReattached) {
- var element = this.div;
- var parent = element.parent();
- if (parent) {
- parent.remove(element);
- }
+ this.div.remove();
}
+
this.markerId = null;
this.options = null;
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22177 - in branches/4.0.X/ui/input/ui/src: main/templates and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2011-03-12 05:02:45 -0500 (Sat, 12 Mar 2011)
New Revision: 22177
Modified:
branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js
branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml
branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestDefault.xmlunit.xml
branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml
branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml
branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml
branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml
Log:
https://jira.jboss.org/browse/RF-10690
Reviewed by Nick Belaevski
Modified: branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2011-03-11 19:31:01 UTC (rev 22176)
+++ branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.js 2011-03-12 10:02:45 UTC (rev 22177)
@@ -14,12 +14,15 @@
this.showControls = mergedOptions.showControls;
this.getInput().bind("focus", $.proxy(this.__editHandler, this));
if(this.showControls) {
+ var btnContainer = document.getElementById(id+"Btn");
+ if (btnContainer) {
+ btnContainer.tabIndex=-1;
+ }
this.okbtn = $(document.getElementById(id+"Okbtn"));
this.cancelbtn = $(document.getElementById(id+"Cancelbtn"));
this.okbtn.bind("mousedown", $.proxy(this.__saveBtnHandler, this));
this.cancelbtn.bind("mousedown", $.proxy(this.__cancelBtnHandler, this));
}
- this.focusElement = $(document.getElementById(id+"Focus"));
};
rf.ui.InplaceBase.extend(rf.ui.InplaceInput);
@@ -51,6 +54,7 @@
},
__keydownHandler: function(e) {
+ this.tabBlur = false;
switch(e.keyCode || e.which) {
case rf.KEYS.ESC:
e.preventDefault();
@@ -62,6 +66,9 @@
this.save();
this.onblur(e);
break;
+ case rf.KEYS.TAB:
+ this.tabBlur = true;
+ break;
}
},
@@ -117,7 +124,11 @@
},
onhide: function() {
- this.focusElement.focus();
+ if (this.tabBlur) {
+ this.tabBlur = false;
+ }else {
+ this.getInput().focus();
+ }
},
onfocus: function(e) {
@@ -128,7 +139,7 @@
}
},
- onblur: function(e) {
+ onblur: function(e) {
if(this.__isFocused()) {
this.__setFocused(false);
this.invokeEvent.call(this, "blur", document.getElementById(this.id), e);
Modified: branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml 2011-03-11 19:31:01 UTC (rev 22176)
+++ branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml 2011-03-12 10:02:45 UTC (rev 22177)
@@ -50,9 +50,9 @@
</span>
<c:if test="#{!component.attributes['disabled']}">
- <input id="#{clientId}Focus" type="image" style="position: absolute; top: 0px; left: 0px; outline-style: none;" class="rf-ii-none"/>
+ <input id="#{clientId}Focus" type="image" tabindex="-1" style="position: absolute; top: 0px; left: 0px; outline-style: none;" class="rf-ii-none"/>
<span id="#{clientId}Edit" class="#{getEditStyleClass(component, inplaceState)}">
- <input id="#{clientId}Input" autocomplete="off" name="#{clientId}"
+ <input id="#{clientId}Input" autocomplete="off" name="#{clientId}"
type="text" value="#{getInputValue(facesContext, component)}" class="rf-ii-fld" style="width: #{getInputWidth(component)};" cdk:passThrough="tabindex">
<cdk:call expression="renderInputHandlers(facesContext, component);"/>
</input>
@@ -70,12 +70,14 @@
id="#{clientId}Okbtn"
src="#{getResourcePath(facesContext, 'org.richfaces', 'ico_ok.gif')}"
class="rf-ii-btn" onmousedown="this.className='rf-ii-btn-p'"
- onmouseout="this.className='rf-ii-btn'" onmouseup="this.className='rf-ii-btn'" />
+ onmouseout="this.className='rf-ii-btn'" onmouseup="this.className='rf-ii-btn'"
+ tabindex="-1" />
<input type="image"
id="#{clientId}Cancelbtn"
src="#{getResourcePath(facesContext,'org.richfaces', 'ico_cancel.gif')}"
class="rf-ii-btn" onmousedown="this.className='rf-ii-btn-press'"
- onmouseout="this.className='rf-ii-btn'" onmouseup="this.className='rf-ii-btn'" />
+ onmouseout="this.className='rf-ii-btn'" onmouseup="this.className='rf-ii-btn'"
+ tabindex="-1" />
<br />
</span>
</span>
Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestDefault.xmlunit.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestDefault.xmlunit.xml 2011-03-11 19:31:01 UTC (rev 22176)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestDefault.xmlunit.xml 2011-03-12 10:02:45 UTC (rev 22177)
@@ -2,7 +2,7 @@
<span class="rf-ii-lbl rf-ii-dflt-lbl" id="form:inplaceInputDefaultLabel">Edit Text</span>
<input class="rf-ii-none" id="form:inplaceInputDefaultFocus"
style="position: absolute; top: 0px; left: 0px; outline-style: none;"
- type="image" />
+ type="image" tabindex="-1" />
<span class="rf-ii-fld-cntr rf-ii-none" id="form:inplaceInputDefaultEdit">
<input autocomplete="off" class="rf-ii-fld" id="form:inplaceInputDefaultInput"
name="form:inplaceInputDefault" style="width: 100%;" type="text" />
Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml 2011-03-11 19:31:01 UTC (rev 22176)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestEdit.xmlunit.xml 2011-03-12 10:02:45 UTC (rev 22177)
@@ -2,7 +2,7 @@
<span class="rf-ii-lbl rf-ii-dflt-lbl" id="form:inplaceInputEditLabel">Edit Text</span>
<input class="rf-ii-none" id="form:inplaceInputEditFocus"
style="position: absolute; top: 0px; left: 0px; outline-style: none;"
- type="image" />
+ type="image" tabindex="-1" />
<span class="rf-ii-fld-cntr" id="form:inplaceInputEditEdit">
<input autocomplete="off" class="rf-ii-fld" id="form:inplaceInputEditInput"
name="form:inplaceInputEdit" style="width: 100%;" type="text" />
@@ -13,17 +13,19 @@
<span class="rf-ii-btn-shdw-l"></span>
<span class="rf-ii-btn-shdw-r"></span>
<span class="rf-ii-btn-shdw-b"></span>
- <span id="form:inplaceInputEditBtn" style="position : relative">
+ <span id="form:inplaceInputEditBtn" style="position : relative" tabindex="-1">
<input class="rf-ii-btn" id="form:inplaceInputEditOkbtn"
onmousedown="this.className='rf-ii-btn-p'" onmouseout="this.className='rf-ii-btn'"
onmouseup="this.className='rf-ii-btn'"
src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces"
- type="image" />
+ type="image"
+ tabindex="-1" />
<input class="rf-ii-btn" id="form:inplaceInputEditCancelbtn"
onmousedown="this.className='rf-ii-btn-press'" onmouseout="this.className='rf-ii-btn'"
onmouseup="this.className='rf-ii-btn'"
src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces"
- type="image" />
+ type="image"
+ tabindex="-1" />
<br />
</span>
</span>
Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml 2011-03-11 19:31:01 UTC (rev 22176)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml 2011-03-12 10:02:45 UTC (rev 22177)
@@ -2,7 +2,7 @@
<span class="rf-ii-lbl rf-ii-dflt-lbl" id="form:inplaceInputWithControlsLabel">Edit Text</span>
<input class="rf-ii-none" id="form:inplaceInputWithControlsFocus"
style="position: absolute; top: 0px; left: 0px; outline-style: none;"
- type="image" />
+ type="image" tabindex="-1" />
<span class="rf-ii-fld-cntr rf-ii-none" id="form:inplaceInputWithControlsEdit">
<input autocomplete="off" class="rf-ii-fld"
id="form:inplaceInputWithControlsInput" name="form:inplaceInputWithControls"
@@ -14,17 +14,19 @@
<span class="rf-ii-btn-shdw-l"></span>
<span class="rf-ii-btn-shdw-r"></span>
<span class="rf-ii-btn-shdw-b"></span>
- <span id="form:inplaceInputWithControlsBtn" style="position : relative">
+ <span id="form:inplaceInputWithControlsBtn" style="position : relative" tabindex="-1">
<input class="rf-ii-btn" id="form:inplaceInputWithControlsOkbtn"
onmousedown="this.className='rf-ii-btn-p'" onmouseout="this.className='rf-ii-btn'"
onmouseup="this.className='rf-ii-btn'"
src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces"
- type="image" />
+ type="image"
+ tabindex="-1" />
<input class="rf-ii-btn" id="form:inplaceInputWithControlsCancelbtn"
onmousedown="this.className='rf-ii-btn-press'" onmouseout="this.className='rf-ii-btn'"
onmouseup="this.className='rf-ii-btn'"
src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces"
- type="image" />
+ type="image"
+ tabindex="-1" />
<br />
</span>
</span>
Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2011-03-11 19:31:01 UTC (rev 22176)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestEdit.xmlunit.xml 2011-03-12 10:02:45 UTC (rev 22177)
@@ -11,7 +11,7 @@
<span class="rf-is-shdw-l"></span>
<span class="rf-is-shdw-r"></span>
<span class="rf-is-shdw-b"></span>
- <span id="form:inplaceSelectEditBtn" style="position : relative;">
+ <span id="form:inplaceSelectEditBtn" style="position : relative;" tabindex="-1">
<input class="rf-is-btn" id="form:inplaceSelectEditOkbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces" type="image" />
<input class="rf-is-btn" id="form:inplaceSelectEditCancelbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces" type="image" />
<br />
Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2011-03-11 19:31:01 UTC (rev 22176)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2011-03-12 10:02:45 UTC (rev 22177)
@@ -11,7 +11,7 @@
<span class="rf-is-shdw-l"></span>
<span class="rf-is-shdw-r"></span>
<span class="rf-is-shdw-b"></span>
- <span id="form:inplaceSelectWithControlsBtn" style="position : relative;">
+ <span id="form:inplaceSelectWithControlsBtn" style="position : relative;" tabindex="-1">
<input class="rf-is-btn" id="form:inplaceSelectWithControlsOkbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/ico_ok.gif.jsf?ln=org.richfaces" type="image" />
<input class="rf-is-btn" id="form:inplaceSelectWithControlsCancelbtn" onmousedown="this.className='rf-is-btn-press'" onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces" type="image" />
<br />
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22176 - in branches/4.0.X/ui: core/ui/src/main/java/org/richfaces/view/facelets/html and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2011-03-11 14:31:01 -0500 (Fri, 11 Mar 2011)
New Revision: 22176
Added:
branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/RepeatHandler.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ExtendedDataTableHandler.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ListHandler.java
Modified:
branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/CollapsibleSubTableHandler.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataGridHandler.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/view/facelets/TreeHandler.java
Log:
RF-10737: rowKeyConverter is fixed for iteration components, a4j:repeat. CollapsibleSubTable cannot be fixed right now, so new issue is created. Verified by Nick Belaevski?\209?\142
Modified: branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java
===================================================================
--- branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java 2011-03-11 19:13:33 UTC (rev 22175)
+++ branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/component/UIRepeat.java 2011-03-11 19:31:01 UTC (rev 22176)
@@ -30,8 +30,11 @@
* @author Nick Belaevski
*
*/
-@JsfComponent(tag = @Tag(name = "repeat", type = TagType.Facelets), renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"),
-attributes = "rowKeyConverter-prop.xml")
+@JsfComponent(
+ tag = @Tag(name = "repeat", handler = "org.richfaces.view.facelets.html.RepeatHandler",type = TagType.Facelets),
+ renderer = @JsfRenderer(type = "org.richfaces.RepeatRenderer"),
+ attributes = "rowKeyConverter-prop.xml"
+)
public class UIRepeat extends UISequence {
public static final String COMPONENT_TYPE = "org.richfaces.Repeat";
Added: branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/RepeatHandler.java
===================================================================
--- branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/RepeatHandler.java (rev 0)
+++ branches/4.0.X/ui/core/ui/src/main/java/org/richfaces/view/facelets/html/RepeatHandler.java 2011-03-11 19:31:01 UTC (rev 22176)
@@ -0,0 +1,24 @@
+package org.richfaces.view.facelets.html;
+
+import org.richfaces.view.facelets.RowKeyConverterRule;
+
+import javax.faces.view.facelets.ComponentConfig;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.MetaRuleset;
+
+/**
+ * User: Gleb Galkin
+ * Date: 11.03.11
+ */
+public class RepeatHandler extends ComponentHandler {
+
+ public RepeatHandler(ComponentConfig config) {
+ super(config);
+ }
+
+ protected MetaRuleset createMetaRuleset(Class type) {
+ MetaRuleset metaRuleset = super.createMetaRuleset(type);
+ metaRuleset.addRule(RowKeyConverterRule.INSTANCE);
+ return metaRuleset;
+ }
+}
\ No newline at end of file
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-03-11 19:13:33 UTC (rev 22175)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractExtendedDataTable.java 2011-03-11 19:31:01 UTC (rev 22176)
@@ -22,9 +22,12 @@
package org.richfaces.component;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Map;
+import org.richfaces.cdk.annotations.*;
+import org.richfaces.context.ExtendedVisitContext;
+import org.richfaces.context.ExtendedVisitContextMode;
+import org.richfaces.log.Logger;
+import org.richfaces.log.RichfacesLogger;
+import org.richfaces.model.SelectionMode;
import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
@@ -32,19 +35,11 @@
import javax.faces.component.visit.VisitContext;
import javax.faces.component.visit.VisitResult;
import javax.faces.context.FacesContext;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Map;
-import org.richfaces.cdk.annotations.Attribute;
-import org.richfaces.cdk.annotations.EventName;
-import org.richfaces.cdk.annotations.JsfComponent;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.cdk.annotations.Tag;
-import org.richfaces.context.ExtendedVisitContext;
-import org.richfaces.context.ExtendedVisitContextMode;
-import org.richfaces.log.Logger;
-import org.richfaces.log.RichfacesLogger;
-import org.richfaces.model.SelectionMode;
-
/**
* @author Konstantin Mishin
*
@@ -56,7 +51,7 @@
family = AbstractExtendedDataTable.COMPONENT_FAMILY,
generate = "org.richfaces.component.UIExtendedDataTable",
renderer = @JsfRenderer(type = "org.richfaces.ExtendedDataTableRenderer"),
- tag = @Tag(name = "extendedDataTable"),
+ tag = @Tag(name = "extendedDataTable", handler = "org.richfaces.taglib.ExtendedDataTableHandler", type = TagType.Facelets),
attributes = "rowKeyConverter-prop.xml"
)
public abstract class AbstractExtendedDataTable extends UIDataTableBase implements MetaComponentResolver, MetaComponentEncoder {
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java 2011-03-11 19:13:33 UTC (rev 22175)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractList.java 2011-03-11 19:31:01 UTC (rev 22176)
@@ -21,29 +21,26 @@
package org.richfaces.component;
-import java.util.Iterator;
-
-import javax.faces.component.UIComponent;
-
-import org.richfaces.cdk.annotations.Attribute;
-import org.richfaces.cdk.annotations.EventName;
-import org.richfaces.cdk.annotations.Facet;
-import org.richfaces.cdk.annotations.JsfComponent;
-import org.richfaces.cdk.annotations.JsfRenderer;
-import org.richfaces.cdk.annotations.Tag;
-
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
import com.google.common.collect.Iterators;
import com.google.common.collect.Maps;
+import org.richfaces.cdk.annotations.*;
+import javax.faces.component.UIComponent;
+import java.util.Iterator;
+
/**
* JSF component class
*
*/
-@JsfComponent(type = "org.richfaces.List", family = "org.richfaces.List", facets = @Facet(name = AbstractList.TERM),tag=@Tag(name="list"),
- renderer = @JsfRenderer(type = "org.richfaces.ListRenderer"),
- attributes = "rowKeyConverter-prop.xml"
+@JsfComponent(
+ type = "org.richfaces.List",
+ family = "org.richfaces.List",
+ facets = @Facet(name = AbstractList.TERM),
+ tag = @Tag(name = "list", handler = "org.richfaces.taglib.ListHandler", type = TagType.Facelets),
+ renderer = @JsfRenderer(type = "org.richfaces.ListRenderer"),
+ attributes = "rowKeyConverter-prop.xml"
)
public abstract class AbstractList extends UISequence {
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/CollapsibleSubTableHandler.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/CollapsibleSubTableHandler.java 2011-03-11 19:13:33 UTC (rev 22175)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/CollapsibleSubTableHandler.java 2011-03-11 19:31:01 UTC (rev 22176)
@@ -23,38 +23,32 @@
package org.richfaces.taglib;
-import javax.faces.view.facelets.ComponentConfig;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.MetaRuleset;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
-
import org.richfaces.component.AbstractCollapsibleSubTable;
+import org.richfaces.view.facelets.RowKeyConverterRule;
+import javax.faces.view.facelets.*;
+
/**
* @author Anton Belevich
*
*/
public class CollapsibleSubTableHandler extends ComponentHandler {
- private static final CollapsibleSubTableHandlerMetaRule METARULE = new CollapsibleSubTableHandlerMetaRule();
-
-
public CollapsibleSubTableHandler(ComponentConfig config) {
super(config);
}
protected MetaRuleset createMetaRuleset(Class type) {
MetaRuleset m = super.createMetaRuleset(type);
- m.addRule(METARULE);
+ m.addRule(CollapsibleSubTableHandlerMetaRule.INSTANCE);
+ m.addRule(RowKeyConverterRule.INSTANCE);
return m;
}
static class CollapsibleSubTableHandlerMetaRule extends MetaRule {
+ public static final CollapsibleSubTableHandlerMetaRule INSTANCE = new CollapsibleSubTableHandlerMetaRule();
+
public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) {
if (meta.isTargetInstanceOf(AbstractCollapsibleSubTable.class) && "toggleListener".equals(name)) {
return new CollapsibleSubTableMapper(attribute);
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataGridHandler.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataGridHandler.java 2011-03-11 19:13:33 UTC (rev 22175)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataGridHandler.java 2011-03-11 19:31:01 UTC (rev 22176)
@@ -22,6 +22,8 @@
package org.richfaces.taglib;
+import org.richfaces.view.facelets.RowKeyConverterRule;
+
import javax.faces.view.facelets.ComponentConfig;
import javax.faces.view.facelets.ComponentHandler;
import javax.faces.view.facelets.MetaRuleset;
@@ -44,6 +46,7 @@
protected MetaRuleset createMetaRuleset(Class type) {
MetaRuleset metaRuleset = super.createMetaRuleset(type);
metaRuleset.alias(ELEMENTS, ROWS);
+ metaRuleset.addRule(RowKeyConverterRule.INSTANCE);
return metaRuleset;
}
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java 2011-03-11 19:13:33 UTC (rev 22175)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataTableHandler.java 2011-03-11 19:31:01 UTC (rev 22176)
@@ -23,36 +23,30 @@
package org.richfaces.taglib;
-import javax.faces.view.facelets.ComponentConfig;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.MetaRuleset;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
-
import org.richfaces.component.AbstractDataTable;
+import org.richfaces.view.facelets.RowKeyConverterRule;
+import javax.faces.view.facelets.*;
+
/**
* @author Anton Belevich
*
*/
public class DataTableHandler extends ComponentHandler {
- private static final SortingFilteringRule METARULE = new SortingFilteringRule();
-
public DataTableHandler(ComponentConfig config) {
super(config);
}
protected MetaRuleset createMetaRuleset(Class type) {
MetaRuleset m = super.createMetaRuleset(type);
- m.addRule(METARULE);
+ m.addRule(SortingFilteringRule.INSTANCE);
+ m.addRule(RowKeyConverterRule.INSTANCE);
return m;
}
static class SortingFilteringRule extends MetaRule {
+ private static final SortingFilteringRule INSTANCE = new SortingFilteringRule();
public Metadata applyRule(String name, TagAttribute attribute, MetadataTarget meta) {
if(meta.isTargetInstanceOf(AbstractDataTable.class)) {
Added: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ExtendedDataTableHandler.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ExtendedDataTableHandler.java (rev 0)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ExtendedDataTableHandler.java 2011-03-11 19:31:01 UTC (rev 22176)
@@ -0,0 +1,24 @@
+package org.richfaces.taglib;
+
+import org.richfaces.view.facelets.RowKeyConverterRule;
+
+import javax.faces.view.facelets.ComponentConfig;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.MetaRuleset;
+
+/**
+ * User: Gleb Galkin
+ * Date: 11.03.11
+ */
+public class ExtendedDataTableHandler extends ComponentHandler {
+
+ public ExtendedDataTableHandler(ComponentConfig config) {
+ super(config);
+ }
+
+ protected MetaRuleset createMetaRuleset(Class type) {
+ MetaRuleset metaRuleset = super.createMetaRuleset(type);
+ metaRuleset.addRule(RowKeyConverterRule.INSTANCE);
+ return metaRuleset;
+ }
+}
Added: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ListHandler.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ListHandler.java (rev 0)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/ListHandler.java 2011-03-11 19:31:01 UTC (rev 22176)
@@ -0,0 +1,24 @@
+package org.richfaces.taglib;
+
+import org.richfaces.view.facelets.RowKeyConverterRule;
+
+import javax.faces.view.facelets.ComponentConfig;
+import javax.faces.view.facelets.ComponentHandler;
+import javax.faces.view.facelets.MetaRuleset;
+
+/**
+ * User: Gleb Galkin
+ * Date: 11.03.11
+ */
+public class ListHandler extends ComponentHandler {
+
+ public ListHandler(ComponentConfig config) {
+ super(config);
+ }
+
+ protected MetaRuleset createMetaRuleset(Class type) {
+ MetaRuleset metaRuleset = super.createMetaRuleset(type);
+ metaRuleset.addRule(RowKeyConverterRule.INSTANCE);
+ return metaRuleset;
+ }
+}
\ No newline at end of file
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/view/facelets/TreeHandler.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/view/facelets/TreeHandler.java 2011-03-11 19:13:33 UTC (rev 22175)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/view/facelets/TreeHandler.java 2011-03-11 19:31:01 UTC (rev 22176)
@@ -21,27 +21,19 @@
*/
package org.richfaces.view.facelets;
-import static org.richfaces.component.AbstractTree.DEFAULT_TREE_NODE_FACET_NAME;
-import static org.richfaces.component.AbstractTree.DEFAULT_TREE_NODE_ID;
+import com.google.common.base.Strings;
+import org.richfaces.component.AbstractTree;
+import org.richfaces.component.AbstractTreeNode;
import javax.faces.application.Application;
import javax.faces.component.UIComponent;
import javax.faces.component.html.HtmlOutputText;
import javax.faces.context.FacesContext;
-import javax.faces.view.facelets.ComponentConfig;
-import javax.faces.view.facelets.ComponentHandler;
-import javax.faces.view.facelets.FaceletContext;
-import javax.faces.view.facelets.MetaRule;
-import javax.faces.view.facelets.MetaRuleset;
-import javax.faces.view.facelets.Metadata;
-import javax.faces.view.facelets.MetadataTarget;
-import javax.faces.view.facelets.TagAttribute;
+import javax.faces.view.facelets.*;
-import org.richfaces.component.AbstractTree;
-import org.richfaces.component.AbstractTreeNode;
+import static org.richfaces.component.AbstractTree.DEFAULT_TREE_NODE_FACET_NAME;
+import static org.richfaces.component.AbstractTree.DEFAULT_TREE_NODE_ID;
-import com.google.common.base.Strings;
-
/**
* @author Nick Belaevski
*
@@ -72,6 +64,7 @@
protected MetaRuleset createMetaRuleset(Class type) {
MetaRuleset metaRuleset = super.createMetaRuleset(type);
metaRuleset.addRule(RULE);
+ metaRuleset.addRule(RowKeyConverterRule.INSTANCE);
return metaRuleset;
}
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22175 - in branches/4.0.X: archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2011-03-11 14:13:33 -0500 (Fri, 11 Mar 2011)
New Revision: 22175
Modified:
branches/4.0.X/archetypes/richfaces-archetype-simpleapp/readme.txt
branches/4.0.X/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/readme.txt
branches/4.0.X/dist/readme-examples.txt
branches/4.0.X/examples/richfaces-showcase/readme.txt
Log:
Minor updates to readme files
Modified: branches/4.0.X/archetypes/richfaces-archetype-simpleapp/readme.txt
===================================================================
--- branches/4.0.X/archetypes/richfaces-archetype-simpleapp/readme.txt 2011-03-11 18:58:33 UTC (rev 22174)
+++ branches/4.0.X/archetypes/richfaces-archetype-simpleapp/readme.txt 2011-03-11 19:13:33 UTC (rev 22175)
@@ -10,7 +10,7 @@
========================================================================
-This project is an application generated with richfaces-achttype-simpleapp.
+This archetype will create a basic application generated with richfaces.
This file explains how to build and set up the project using Maven. If you
find any issue related to RichFaces framework, please report the issue on
the RichFaces user forum (http://community.jboss.org/en/richfaces) or
@@ -28,15 +28,28 @@
(e.g. Jboss AS 6)
- JDK 1.6
-Also optional Additional Software would make it easy for you to work
+Also optional additional Software would make it easy for you to work
with the sources of the application:
- Eclipse IDE + JBoss Tools (to explore and run the application
in IDE). You're obviously free to use any other IDE you wish, but
JBoss Tools is recommended.
-2. Build/Deploy
+2. Generate the project using the archetype.
+Maven will automatically create a project for you using the archetype
+command below. Just provide the variables and maven will do the rest.
+
+ mvn archetype:generate \
+ -DarchetypeGroupId=org.richfaces.archetypes \
+ -DarchetypeArtifactId=richfaces-archetype-simpleapp \
+ -DarchetypeVersion=4.0.0.Final \
+ -DgroupId=<yourGroupId> \
+ -DartifactId=<yourArtifactId> \
+ -Dversion=<yourSnapshotVersion>
+
+3. Build/Deploy
+
- Deploying on Tomcat
To build the project for Tomcat you need to navigate to the
@@ -82,4 +95,4 @@
For more information on RichFaces 4, please visit RichFaces
website at:
- - http://www.jboss.org/richfaces.
+ - http://richfaces.org
Modified: branches/4.0.X/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/readme.txt
===================================================================
--- branches/4.0.X/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/readme.txt 2011-03-11 18:58:33 UTC (rev 22174)
+++ branches/4.0.X/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/readme.txt 2011-03-11 19:13:33 UTC (rev 22175)
@@ -10,7 +10,7 @@
========================================================================
-This project is an application generated with richfaces-achttype-simpleapp.
+This project is an application generated with richfaces-archetype-simpleapp.
This file explains how to build and set up the project using Maven. If you
find any issue related to RichFaces framework, please report the issue on
the RichFaces user forum (http://community.jboss.org/en/richfaces) or
@@ -82,4 +82,4 @@
For more information on RichFaces 4, please visit RichFaces
website at:
- - http://www.jboss.org/richfaces.
+ - http://richfaces.org
Modified: branches/4.0.X/dist/readme-examples.txt
===================================================================
--- branches/4.0.X/dist/readme-examples.txt 2011-03-11 18:58:33 UTC (rev 22174)
+++ branches/4.0.X/dist/readme-examples.txt 2011-03-11 19:13:33 UTC (rev 22175)
@@ -11,7 +11,7 @@
========================================================================
RichFaces 4 is a component library for JSF2 and an advanced framework for
-easily integrating AJAX capabilities into business applications.
+easily integrating AJAX capabilities into enterprise applications.
This file explains how to set up the RichFaces examples bundled with the
distribution package. If you find any issue with the project, please report
@@ -27,7 +27,7 @@
In order to build the Examples applications you will need:
- Maven 2.1.0 or later
- Servers: Apache Tomcat 6.0 or any JEE6 application server
- (e.g. Jboss AS 6)
+ (e.g. Jboss AS 6/7)
- JDK 1.6
Also optional Additional Software would make it easy for you to work
@@ -83,10 +83,10 @@
USING AN IDE TO WORK WITH EXAMPLES
----------------------------------
-In order to explore, run and deploy the examples using Eclipse IDE you can use
+In order to explore, run and deploy the examples using Eclipse IDE you use
one of the following options:
- - You could use JBoss Tools with m2eclipse plugin and just import
+ - JBoss Tools with m2eclipse plugin and just import
the examples as maven-based projects.
* Open Eclipse and go to File > Import
* Expand the project type named Maven and select Import Maven
@@ -114,7 +114,7 @@
For more information on RichFaces 4, please visit RichFaces
website at:
- - http://www.jboss.org/richfaces.
+ - http://richfaces.org
Or check the Wiki for more information on build instructions for the examples at:
Modified: branches/4.0.X/examples/richfaces-showcase/readme.txt
===================================================================
--- branches/4.0.X/examples/richfaces-showcase/readme.txt 2011-03-11 18:58:33 UTC (rev 22174)
+++ branches/4.0.X/examples/richfaces-showcase/readme.txt 2011-03-11 19:13:33 UTC (rev 22175)
@@ -150,7 +150,7 @@
For more information on RichFaces 4, please visit RichFaces
website at:
- - http://www.jboss.org/richfaces.
+ - http://richfaces.org
Or check the Wiki for more information on build instructions for the examples at:
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22174 - branches/4.0.X/dist.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2011-03-11 13:58:33 -0500 (Fri, 11 Mar 2011)
New Revision: 22174
Modified:
branches/4.0.X/dist/readme-ui.txt
Log:
Minor readme corrections
Modified: branches/4.0.X/dist/readme-ui.txt
===================================================================
--- branches/4.0.X/dist/readme-ui.txt 2011-03-11 15:38:49 UTC (rev 22173)
+++ branches/4.0.X/dist/readme-ui.txt 2011-03-11 18:58:33 UTC (rev 22174)
@@ -11,9 +11,9 @@
========================================================================
RichFaces 4 is a component library for JSF2 and an advanced framework for
-easily integrating AJAX capabilities into business applications.
+easily integrating AJAX capabilities into enterprise applications.
-This file explains how to obtain and install the RichFaces component
+This file explains how to get started and install the RichFaces component
library. If you find any issue with the project, please report the issue
on the RichFaces user forum (http://community.jboss.org/en/richfaces)
or jira (https://issues.jboss.org/browse/RF).
@@ -22,11 +22,11 @@
FEATURES
--------
- - 100+ AJAX enabled components in two libraries.
+ - Many AJAX enabled components in two libraries.
* a4j page centric AJAX controls.
* rich self contained, ready to use components.
- - Whole set of JSF2 benefits while working with AJAX.
- - Skinnability mechanism.
+ - Complete JSF2 support with advanced extentions
+ - Easily skin your entire application
- Component Development Kit (CDK).
- Dynamic resource handling.
- Testing facilities for components, actions, listeners and pages
@@ -60,7 +60,7 @@
richfaces-components-ui-4.x.jar to your application libraries
folder.
- - From 'framerok' directory: Copy richfaces-core-api-4.x.jar and
+ - From 'framework' directory: Copy richfaces-core-api-4.x.jar and
richfaces-core-impl-4.x.jar to your application libraries folder.
In addition to the RichFaces jars, a number of dependencies are
@@ -82,6 +82,8 @@
Validation. Should be added only if it's not provided by a
server (Java EE 6 servers).
+ For the latest updates, and information on this please see:
+ http://community.jboss.org/docs/DOC-16484
2. Using Maven
@@ -96,7 +98,7 @@
GETTING STARTED
---------------
-1. After setting up the project to use RichFaces component library, no
+1. Aside from the steps above to use RichFaces component library, no
special configuration steps are necessary. You don't need to modify
web.xml or faces-config.xml as with previous versions of RichFaces,
except for a4j:push component that requires additional configuration
@@ -115,7 +117,6 @@
Getting Started Guide at http://community.jboss.org/wiki/GettingStartedWithRichFaces4x
-
MORE INFORMATION AND RESOURCES
------------------------------
@@ -123,7 +124,7 @@
previous versions, and answers to the most frequently asked questions (FAQ),
please visit RichFaces website at:
-http://www.jboss.org/richfaces.
+http://www.jboss.org/richfaces
Or the Wiki at:
@@ -136,7 +137,7 @@
Community support and help can be obtained from the RichFaces forums at:
- - http://community.jboss.org/en/richfaces?view=discussions
+ - http://community.jboss.org/en/richfaces
Also you can follow us on Twitter at:
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22173 - in branches/4.0.X/ui/iteration/ui/src/main: resources/META-INF/resources/org.richfaces and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2011-03-11 10:38:49 -0500 (Fri, 11 Mar 2011)
New Revision: 22173
Modified:
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableTogglerRendererBase.java
branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/collapsible-subtable.ecss
Log:
RF-10679 Reviewer: Nick Belaevski
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableTogglerRendererBase.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableTogglerRendererBase.java 2011-03-11 15:38:01 UTC (rev 22172)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableTogglerRendererBase.java 2011-03-11 15:38:49 UTC (rev 22173)
@@ -161,6 +161,7 @@
if (label != null && label.trim().length() > 0) {
writer.startElement(HtmlConstants.A_ELEMENT, control);
writer.writeAttribute(HtmlConstants.HREF_ATTR, "javascript:void(0);", null);
+ writer.writeAttribute(HtmlConstants.CLASS_ATTRIBUTE, "rf-csttg-lnk", null);
writer.writeText(label, null);
writer.endElement(HtmlConstants.A_ELEMENT);
}
Modified: branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/collapsible-subtable.ecss
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/collapsible-subtable.ecss 2011-03-11 15:38:01 UTC (rev 22172)
+++ branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/collapsible-subtable.ecss 2011-03-11 15:38:49 UTC (rev 22173)
@@ -17,6 +17,10 @@
padding:0px;
}
+.rf-csttg-lnk {
+ vertical-align: top;
+}
+
.rf-cst, .rf-cst-nd {
border-bottom-width:'#{richSkin.tableBorderWidth}';
border-bottom-style:solid;
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22172 - branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2011-03-11 10:38:01 -0500 (Fri, 11 Mar 2011)
New Revision: 22172
Modified:
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model/Field.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model/FilterField.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model/SortField.java
Log:
RF-10717 Reviewer: Nick Belaevski
Modified: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model/Field.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model/Field.java 2011-03-11 15:37:21 UTC (rev 22171)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model/Field.java 2011-03-11 15:38:01 UTC (rev 22172)
@@ -22,14 +22,18 @@
package org.richfaces.model;
+import java.io.Serializable;
+
import javax.el.ValueExpression;
/**
* @author Konstantin Mishin
*
*/
-public abstract class Field {
+public abstract class Field implements Serializable{
+ private static final long serialVersionUID = 1448767072411366177L;
+
private ValueExpression expression;
public Field(ValueExpression expression) {
Modified: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model/FilterField.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model/FilterField.java 2011-03-11 15:37:21 UTC (rev 22171)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model/FilterField.java 2011-03-11 15:38:01 UTC (rev 22172)
@@ -30,6 +30,8 @@
*/
public class FilterField extends Field{
+ private static final long serialVersionUID = -935655586515863809L;
+
private Filter<?> filter;
private Object filterValue;
Modified: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model/SortField.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model/SortField.java 2011-03-11 15:37:21 UTC (rev 22171)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/model/SortField.java 2011-03-11 15:38:01 UTC (rev 22172)
@@ -34,6 +34,8 @@
*/
public class SortField extends Field {
+ private static final long serialVersionUID = 654268763477658266L;
+
private Comparator<?> comparator;
private SortOrder sortOrder;
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22171 - branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2011-03-11 10:37:21 -0500 (Fri, 11 Mar 2011)
New Revision: 22171
Modified:
branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.ecss
Log:
RF-10684 Reviewer: Nick Belaevski
Modified: branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.ecss
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.ecss 2011-03-11 15:36:17 UTC (rev 22170)
+++ branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datatable.ecss 2011-03-11 15:37:21 UTC (rev 22171)
@@ -1,12 +1,9 @@
.rf-dt{
background-color:'#{richSkin.tableBackgroundColor}';
border-collapse:collapse;
- border-left-width:'#{richSkin.tableBorderWidth}';
- border-left-style:solid;
- border-left-color:'#{richSkin.tableBorderColor}';
- border-top-width:'#{richSkin.tableBorderWidth}';
- border-top-style:solid;
- border-top-color:'#{richSkin.tableBorderColor}';
+ border-width:'#{richSkin.tableBorderWidth}';
+ border-style:solid;
+ border-color:'#{richSkin.tableBorderColor}';
empty-cells:show;
}
13 years, 3 months
- 1
- 0