richfaces-svn-commits
March 2011
richfaces-svn-commits@lists.jboss.org
- 1 participants
- 355 discussions
JBoss Rich Faces SVN: r22190 - in branches/4.0.X/archetypes/richfaces-archetype-simpleapp: src/main/resources/archetype-resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2011-03-13 07:25:09 -0400 (Sun, 13 Mar 2011)
New Revision: 22190
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
Log:
RF-10741 Final updates for release
Modified: branches/4.0.X/archetypes/richfaces-archetype-simpleapp/readme.txt
===================================================================
--- branches/4.0.X/archetypes/richfaces-archetype-simpleapp/readme.txt 2011-03-13 11:24:50 UTC (rev 22189)
+++ branches/4.0.X/archetypes/richfaces-archetype-simpleapp/readme.txt 2011-03-13 11:25:09 UTC (rev 22190)
@@ -2,8 +2,8 @@
RichFaces - Ajax enabled JSF 2.0 component library
- RichFaces 4.0.CR1
- http://richfaces.org
+ RichFaces 4.0.0.Final ARCHETYPE PROJECT
+ http://richfaces.org
March 2011
This software is distributed under the terms of the
FSF Lesser Gnu Public License (see lgpl.txt)
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-13 11:24:50 UTC (rev 22189)
+++ branches/4.0.X/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/readme.txt 2011-03-13 11:25:09 UTC (rev 22190)
@@ -2,8 +2,8 @@
RichFaces - Ajax enabled JSF 2.0 component library
- RichFaces 4.0.CR1
- http://richfaces.org
+ RichFaces 4.0.0.Final ARCHETYPE PROJECT
+ http://richfaces.org
March 2011
This software is distributed under the terms of the
FSF Lesser Gnu Public License (see lgpl.txt)
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22189 - branches/4.0.X/dist.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2011-03-13 07:24:50 -0400 (Sun, 13 Mar 2011)
New Revision: 22189
Modified:
branches/4.0.X/dist/readme-examples.txt
branches/4.0.X/dist/readme-ui.txt
Log:
RF-10741 Final updates to readme's for release
Modified: branches/4.0.X/dist/readme-examples.txt
===================================================================
--- branches/4.0.X/dist/readme-examples.txt 2011-03-12 20:27:55 UTC (rev 22188)
+++ branches/4.0.X/dist/readme-examples.txt 2011-03-13 11:24:50 UTC (rev 22189)
@@ -2,8 +2,8 @@
RichFaces - Ajax enabled JSF 2.0 component library
- RichFaces 4.0.Final EXAMPLES
- http://richfaces.org
+ RichFaces 4.0.0.Final EXAMPLES
+ http://richfaces.org
March 2011
This software is distributed under the terms of the
FSF Lesser Gnu Public License (see lgpl.txt)
Modified: branches/4.0.X/dist/readme-ui.txt
===================================================================
--- branches/4.0.X/dist/readme-ui.txt 2011-03-12 20:27:55 UTC (rev 22188)
+++ branches/4.0.X/dist/readme-ui.txt 2011-03-13 11:24:50 UTC (rev 22189)
@@ -2,8 +2,8 @@
RichFaces - Ajax enabled JSF 2.0 component library
- RichFaces 4.0.Final
- http://www.jboss.org/richfaces
+ RichFaces 4.0.0.Final
+ http://richfaces.org
March 2011
This software is distributed under the terms of the
FSF Lesser Gnu Public License (see lgpl.txt)
@@ -295,33 +295,34 @@
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.
+
+ - Minor, low risk stabilizations, and clean up tasks for the Final build to minimize risk.
+ - Thorough review of all the component attributes done and corrections were made based on complexity.
+ - Bug fixing for CSV and Object Validation features.
+ - Refactored 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.
+ - TreeNode and TreeDataModel model 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
+ - Several taglib issues found during QE and made corresponding corrections for better IDE support
+ https://issues.jboss.org/browse/RF-9936
+ - RichFaces showcase design corrections
+ - Reviewed current state of RichFaces showcase in 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.
+ - Completed Push component demo - irc-sample, with blog and documents before release
-
New in Version 4.0.CR1
----------------------
- - Finally completed with Taglib's corrections for better IDE support
+ - Completed nearly all taglib's corrections for better IDE support
https://issues.jboss.org/browse/RF-9936
- - Stabilized CSV feature with messages, localization and customization
+ - Stabilized the CSV feature with messages, localization and customization
improvements https://issues.jboss.org/browse/RF-10556
https://issues.jboss.org/browse/RF-10434 https://issues.jboss.org/browse/RF-10611
- Stabilized messages components https://issues.jboss.org/browse/RF-10293
@@ -334,7 +335,7 @@
- A lot of stabilization issues for MyFaces support got resolved
- Environment updates: JQuery 1.5, MyFaces 2.0.4, Mojara 2.0.4, Atmosphere 0.6.4
- RichFaces showcase has been updated with new design (https://issues.jboss.org/browse/RF-9636)
- and now runs under myFaces stable!
+ and now runs stable with MyFaces!
New in Version 4.0.M6
@@ -354,13 +355,12 @@
- All the richfaces components client side API are reviewed and stabilized.
API Tables will be documented soon in the component reference.
- Further review and corrections in components for improving IDE's support.
- - richfaces-showcase demo application is updated with new showcases for
+ - RichFaces showcase demo application is updated with new showcases for
validation components and new examples for previously released components.
- Further improvements in Component Development Kit.
- Stabilization works for migrated code. Automation tests with quint, junit.
Review of attributes and facets for consistency and stability are done
and most issues get fixed.
+
-
-
###
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22188 - branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2011-03-12 15:27:55 -0500 (Sat, 12 Mar 2011)
New Revision: 22188
Modified:
branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss
Log:
RF-10677
Modified: branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-03-12 19:32:40 UTC (rev 22187)
+++ branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/Autocomplete.ecss 2011-03-12 20:27:55 UTC (rev 22188)
@@ -25,12 +25,14 @@
background-repeat: repeat-x;
background-position: top left;
background-color: '#{richSkin.controlBackgroundColor}';
+ font-size: 1px;
}
.rf-au-fld-btn{
display: inline-block;
font-size: 1px;
white-space: nowrap;
+ vertical-align: top;
}
.rf-au-btn{
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22187 - branches/4.0.X/ui/input/ui/src/main/config.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2011-03-12 14:32:40 -0500 (Sat, 12 Mar 2011)
New Revision: 22187
Modified:
branches/4.0.X/ui/input/ui/src/main/config/faces-config.xml
Log:
RF-10694 Reviewer: Alex Kolonitsky
Modified: branches/4.0.X/ui/input/ui/src/main/config/faces-config.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/config/faces-config.xml 2011-03-12 19:20:38 UTC (rev 22186)
+++ branches/4.0.X/ui/input/ui/src/main/config/faces-config.xml 2011-03-12 19:32:40 UTC (rev 22187)
@@ -19,7 +19,14 @@
<component>
<component-type>org.richfaces.InputNumberSlider</component-type>
<component-class>org.richfaces.component.html.HtmlInputNumberSlider</component-class>
- <xi:include
+ <property>
+ <property-name>readonly</property-name>
+ <property-class>boolean</property-class>
+ <property-extension>
+ <cdk:hidden>true</cdk:hidden>
+ </property-extension>
+ </property>
+ <xi:include
xpointer="xmlns(cdk=http://jboss.org/schema/richfaces/cdk/extensions)xpointer(/cdk:..."
href="urn:attributes:javax.faces.component.UIInput.xml" />
<xi:include
@@ -230,6 +237,13 @@
<component>
<component-type>org.richfaces.InputNumberSpinner</component-type>
<component-class>org.richfaces.component.html.HtmlInputNumberSpinner</component-class>
+ <property>
+ <property-name>readonly</property-name>
+ <property-class>boolean</property-class>
+ <property-extension>
+ <cdk:hidden>true</cdk:hidden>
+ </property-extension>
+ </property>
<xi:include
xpointer="xmlns(cdk=http://jboss.org/schema/richfaces/cdk/extensions)xpointer(/cdk:..."
href="urn:attributes:javax.faces.component.UIInput.xml" />
@@ -410,7 +424,7 @@
<cdk:event-name>upclick</cdk:event-name>
</property-extension>
</property>
- <property>
+ <property>
<property-name>step</property-name>
<property-class>java.lang.String</property-class>
<default-value>"1"</default-value>
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22186 - branches/4.0.X/ui/input/ui/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2011-03-12 14:20:38 -0500 (Sat, 12 Mar 2011)
New Revision: 22186
Modified:
branches/4.0.X/ui/input/ui/src/main/templates/select.template.xml
Log:
RF-10744 Reviewer: Alex Kolonitsky
Modified: branches/4.0.X/ui/input/ui/src/main/templates/select.template.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/templates/select.template.xml 2011-03-12 17:00:28 UTC (rev 22185)
+++ branches/4.0.X/ui/input/ui/src/main/templates/select.template.xml 2011-03-12 19:20:38 UTC (rev 22186)
@@ -23,7 +23,7 @@
<span class="rf-sel-cntr">
<input id="#{clientId}selValue" name="#{clientId}" type="hidden" value="#{getInputValue(facesContext, component)}"/>
<cdk:object type="java.lang.String" name="label" value="#{getSelectLabel(facesContext, component)}" />
- <input cdk:passThroughWithExclusions="class autocomplete id value disabled name type readonly onchange onblur onfocus"
+ <input cdk:passThroughWithExclusions="class autocomplete id value disabled name type readonly onchange onblur onfocus style"
id="#{clientId}Input"
value="#{label}"
disabled="#{disabled}"
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22185 - branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2011-03-12 12:00:28 -0500 (Sat, 12 Mar 2011)
New Revision: 22185
Modified:
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
Log:
RF-10747: columnGroup for header and footer facets is fixed. Verified by Konstantin Mishin.
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2011-03-12 16:46:18 UTC (rev 22184)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2011-03-12 17:00:28 UTC (rev 22185)
@@ -22,19 +22,18 @@
package org.richfaces.renderkit;
-import java.io.IOException;
-import java.util.Iterator;
+import org.richfaces.component.Row;
+import org.richfaces.component.UIDataTableBase;
+import org.richfaces.component.util.HtmlUtil;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
+import java.io.IOException;
+import java.util.Iterator;
-import org.richfaces.component.Row;
-import org.richfaces.component.UIDataTableBase;
-import org.richfaces.component.util.HtmlUtil;
-
/**
* @author Anton Belevich
*
@@ -522,7 +521,9 @@
partialEnd(facesContext);
}
- if (!isColumnGroup){
+ if (isColumnGroup){
+ writer.endElement(HtmlConstants.TR_ELEMENT);
+ } else {
writer.endElement(element);
writer.endElement(HtmlConstants.TR_ELEMENT);
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22184 - in branches/4.0.X/ui/input/ui/src: main/templates and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2011-03-12 11:46:18 -0500 (Sat, 12 Mar 2011)
New Revision: 22184
Modified:
branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss
branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss
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/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml
branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml
Log:
RF-10692 Inplace Select with controls - rendered wrong
- reviewed by Pavel Yaschenko
Modified: branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2011-03-12 14:09:15 UTC (rev 22183)
+++ branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceInput.ecss 2011-03-12 16:46:18 UTC (rev 22184)
@@ -113,9 +113,15 @@
position: relative;
padding : 6px 6px 6px 6px;
top : -6px;
- right : -6px;
+ left : -6px;
}
+.rf-ii-btn-cntr {
+ position : relative;
+ display: block;
+ font-size: 0px;
+}
+
.rf-ii-btn-shdw-t {
background-position : left top;
background-image : url("#{resource['org.richfaces:bg_shadow.png']}");
Modified: branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2011-03-12 14:09:15 UTC (rev 22183)
+++ branches/4.0.X/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.ecss 2011-03-12 16:46:18 UTC (rev 22184)
@@ -176,6 +176,12 @@
left : -6px;
}
+.rf-is-btn-cntr {
+ position : relative;
+ display: block;
+ font-size: 0px;
+}
+
.rf-is-shdw-t {
display : block;
background-image : "url(#{resource['org.richfaces:bg_shadow.png']})";
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 14:09:15 UTC (rev 22183)
+++ branches/4.0.X/ui/input/ui/src/main/templates/inplaceInput.template.xml 2011-03-12 16:46:18 UTC (rev 22184)
@@ -59,13 +59,13 @@
<c:if test="#{component.attributes['showControls']}">
<span class="rf-ii-btn-prepos">
<span class="rf-ii-btn-pos">
- <span id="#{clientId}Btnshadow" class="rf-ii-btn-shadow">
+ <span id="#{clientId}Btnshadow" class="rf-ii-btn-shdw">
<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="#{clientId}Btn" style="position : relative">
+ <span id="#{clientId}Btn" class="rf-ii-btn-cntr">
<input type="image"
id="#{clientId}Okbtn"
src="#{getResourcePath(facesContext, 'org.richfaces', 'ico_ok.gif')}"
@@ -78,7 +78,6 @@
class="rf-ii-btn" onmousedown="this.className='rf-ii-btn-press'"
onmouseout="this.className='rf-ii-btn'" onmouseup="this.className='rf-ii-btn'"
tabindex="-1" />
- <br />
</span>
</span>
</span>
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 14:09:15 UTC (rev 22183)
+++ branches/4.0.X/ui/input/ui/src/main/templates/inplaceSelect.template.xml 2011-03-12 16:46:18 UTC (rev 22184)
@@ -64,16 +64,15 @@
<span class="rf-is-shdw-r"></span>
<span class="rf-is-shdw-b"></span>
- <span id="#{clientId}Btn" style="position : relative;">
+ <span id="#{clientId}Btn" class="rf-is-btn-cntr">
<input type="image" id="#{clientId}Okbtn"
src="#{getResourcePath(facesContext, 'org.richfaces', 'ico_ok.gif')}"
class="rf-is-btn" onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" />
- <input type="image" id="#{clientId}Cancelbtn"
+ <input type="image" id="#{clientId}Cancelbtn"
src="#{getResourcePath(facesContext,'org.richfaces', 'ico_cancel.gif')}"
class="rf-is-btn" onmousedown="this.className='rf-is-btn-press'"
onmouseout="this.className='rf-is-btn'" onmouseup="this.className='rf-is-btn'" />
- <br />
</span>
</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-12 14:09:15 UTC (rev 22183)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceInputTestWithControls.xmlunit.xml 2011-03-12 16:46:18 UTC (rev 22184)
@@ -9,12 +9,12 @@
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:inplaceInputWithControlsBtnshadow">
+ <span class="rf-ii-btn-shdw" id="form:inplaceInputWithControlsBtnshadow">
<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:inplaceInputWithControlsBtn" style="position : relative" tabindex="-1">
+ <span id="form:inplaceInputWithControlsBtn" class="rf-ii-btn-cntr" 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'"
@@ -27,7 +27,6 @@
src="/javax.faces.resource/ico_cancel.gif.jsf?ln=org.richfaces"
type="image"
tabindex="-1" />
- <br />
</span>
</span>
</span>
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-12 14:09:15 UTC (rev 22183)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/renderkit/inplaceSelectTestWithControls.xmlunit.xml 2011-03-12 16:46:18 UTC (rev 22184)
@@ -11,10 +11,9 @@
<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;" tabindex="-1">
+ <span id="form:inplaceSelectWithControlsBtn" class="rf-is-btn-cntr" 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 />
</span>
</span>
</span>
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22183 - in branches/4.0.X: examples/iteration-demo/src/main/java/org/richfaces/demo/model and 13 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: Alex.Kolonitsky
Date: 2011-03-12 09:09:15 -0500 (Sat, 12 Mar 2011)
New Revision: 22183
Added:
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleEvent.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleListener.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollEvent.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollListener.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollSource.java
Removed:
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerEvent.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerListener.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerSource.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/PagingEvent.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/PagingListener.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/ToggleEvent.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/ToggleListener.java
branches/4.0.X/ui/validator/api/src/main/java/org/richfaces/event/
Modified:
branches/4.0.X/examples/iteration-demo/src/main/java/org/richfaces/demo/SelectionChangeActionListenerImpl.java
branches/4.0.X/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeBean.java
branches/4.0.X/examples/iteration-demo/src/main/java/org/richfaces/demo/model/Employee.java
branches/4.0.X/examples/iteration-demo/src/main/webapp/dataTable.xhtml
branches/4.0.X/examples/misc-demo/src/main/webapp/pages/componentControl.xhtml
branches/4.0.X/ui/input/api/src/main/java/org/richfaces/event/FileUploadEvent.java
branches/4.0.X/ui/input/api/src/main/java/org/richfaces/event/FileUploadListener.java
branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/view/facelets/FileUploadHandler.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/component/Expandable.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeSelectionChangeEvent.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeSelectionChangeListener.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeToggleEvent.java
branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeToggleListener.java
branches/4.0.X/ui/iteration/ui/src/main/config/faces-config.xml
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataScroller.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/event/MethodExpressionTreeSelectionChangeListener.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/event/MethodExpressionTreeToggleListener.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.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/DataScrollerHandler.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/MethodExpressionScrollListener.java
branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/MethodExpressionToggleListener.java
branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/cdk/attributes/tree-serverEventListeners-props.xml
Log:
RF-10712 Refactoring Listeners classes, methods and Event names according to standard JSF convention. [WAS processUpload vs. processFileUpload - naming conventions]
- reviewed by Gleb Galkin
Modified: branches/4.0.X/examples/iteration-demo/src/main/java/org/richfaces/demo/SelectionChangeActionListenerImpl.java
===================================================================
--- branches/4.0.X/examples/iteration-demo/src/main/java/org/richfaces/demo/SelectionChangeActionListenerImpl.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/examples/iteration-demo/src/main/java/org/richfaces/demo/SelectionChangeActionListenerImpl.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -11,7 +11,7 @@
*/
public class SelectionChangeActionListenerImpl implements TreeSelectionChangeListener {
- public void processSelectionChange(TreeSelectionChangeEvent event) throws AbortProcessingException {
+ public void processTreeSelectionChange(TreeSelectionChangeEvent event) throws AbortProcessingException {
System.out.println("Inside Selection Change Action");
}
}
Modified: branches/4.0.X/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeBean.java
===================================================================
--- branches/4.0.X/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeBean.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/examples/iteration-demo/src/main/java/org/richfaces/demo/TreeBean.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -77,7 +77,7 @@
this.fromExpression = fromExpression;
}
- public void processSelectionChange(TreeSelectionChangeEvent event) throws AbortProcessingException {
+ public void processTreeSelectionChange(TreeSelectionChangeEvent event) throws AbortProcessingException {
FacesContext facesContext = FacesContext.getCurrentInstance();
facesContext.addMessage(getTree(event).getClientId(facesContext), createEventMessage(event, fromExpression));
@@ -97,7 +97,7 @@
this.fromExpression = fromExpression;
}
- public void processToggle(TreeToggleEvent event) throws AbortProcessingException {
+ public void processTreeToggle(TreeToggleEvent event) throws AbortProcessingException {
FacesContext facesContext = FacesContext.getCurrentInstance();
facesContext.addMessage(getTree(event).getClientId(facesContext), createEventMessage(event, fromExpression));
}
@@ -266,11 +266,11 @@
}
public void processSelectionChange(TreeSelectionChangeEvent event) {
- new SelectionChangeHandler(true).processSelectionChange(event);
+ new SelectionChangeHandler(true).processTreeSelectionChange(event);
}
public void processToggle(TreeToggleEvent event) {
- new ToggleHandler(true).processToggle(event);
+ new ToggleHandler(true).processTreeToggle(event);
}
public String getToggleNodeEvent() {
Modified: branches/4.0.X/examples/iteration-demo/src/main/java/org/richfaces/demo/model/Employee.java
===================================================================
--- branches/4.0.X/examples/iteration-demo/src/main/java/org/richfaces/demo/model/Employee.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/examples/iteration-demo/src/main/java/org/richfaces/demo/model/Employee.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -4,7 +4,7 @@
import java.util.List;
import java.util.Random;
-import org.richfaces.event.ToggleEvent;
+import org.richfaces.event.CollapsibleSubTableToggleEvent;
public class Employee {
@@ -100,7 +100,7 @@
return hash;
}
- public void toggle(ToggleEvent event) {
+ public void toggle(CollapsibleSubTableToggleEvent event) {
this.expand = event.isExpanded();
}
Modified: branches/4.0.X/examples/iteration-demo/src/main/webapp/dataTable.xhtml
===================================================================
--- branches/4.0.X/examples/iteration-demo/src/main/webapp/dataTable.xhtml 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/examples/iteration-demo/src/main/webapp/dataTable.xhtml 2011-03-12 14:09:15 UTC (rev 22183)
@@ -18,7 +18,8 @@
<it:dataScroller id="scroller1" for="richTable" page="#{dataBean.page}" maxPages="7"></it:dataScroller>
<it:dataTable keepSaved="true" id="richTable" var="record" rowKeyVar="rowKey" value="#{dataBean.employeeList}"
- rows="20" sortMode="single">
+ rows="20" sortMode="single" rowClass='#{record}'
+ cellClass="cellClQwerty" firstRowClass="firstRowClass123">
<f:facet name="caption">
<h:outputText id="captioFacet1" value="Caption Facet"/>
</f:facet>
@@ -60,7 +61,7 @@
<it:collapsibleSubTable id="collapsibleSubTable" var="company"
value="#{record.companies}" rows="1" switchType="ajax"
- expanded="true">
+ expanded="true" rowClass="#{company}">
<f:facet name="header">
<it:dataScroller id="subscroller" for="collapsibleSubTable"
maxPages="3"></it:dataScroller>
Modified: branches/4.0.X/examples/misc-demo/src/main/webapp/pages/componentControl.xhtml
===================================================================
--- branches/4.0.X/examples/misc-demo/src/main/webapp/pages/componentControl.xhtml 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/examples/misc-demo/src/main/webapp/pages/componentControl.xhtml 2011-03-12 14:09:15 UTC (rev 22183)
@@ -9,16 +9,7 @@
<h:head></h:head>
<h:body>
<h:form>
- <input:autocomplete id="myInput" value="aaaaaa"/>
- <h:commandButton value="getValue">
- <misc:componentControl target="myInput" operation="getValue" event="click"/>
- </h:commandButton>
- <h:commandButton value="setValue">
- <misc:componentControl target="myInput" operation="setValue"
- event="click" onbeforeoperation="alert(event.type+': cancel operation');return false;">
- <f:param value="bla-bla-bla" />
- </misc:componentControl>
- </h:commandButton>
+ <h:inputText value="${not true}"/>
</h:form>
</h:body>
</f:view>
Modified: branches/4.0.X/ui/input/api/src/main/java/org/richfaces/event/FileUploadEvent.java
===================================================================
--- branches/4.0.X/ui/input/api/src/main/java/org/richfaces/event/FileUploadEvent.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/input/api/src/main/java/org/richfaces/event/FileUploadEvent.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -46,7 +46,7 @@
}
public void processListener(FacesListener listener) {
- ((FileUploadListener) listener).processUpload(this);
+ ((FileUploadListener) listener).processFileUpload(this);
}
public UploadedFile getUploadedFile() {
Modified: branches/4.0.X/ui/input/api/src/main/java/org/richfaces/event/FileUploadListener.java
===================================================================
--- branches/4.0.X/ui/input/api/src/main/java/org/richfaces/event/FileUploadListener.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/input/api/src/main/java/org/richfaces/event/FileUploadListener.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -25,5 +25,5 @@
public interface FileUploadListener extends FacesListener {
- public void processUpload(FileUploadEvent event);
+ public void processFileUpload(FileUploadEvent event);
}
Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/view/facelets/FileUploadHandler.java
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/view/facelets/FileUploadHandler.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/view/facelets/FileUploadHandler.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -53,7 +53,7 @@
super(expression);
}
- public void processUpload(FileUploadEvent event) throws AbortProcessingException {
+ public void processFileUpload(FileUploadEvent event) throws AbortProcessingException {
processEvent(event);
}
}
Modified: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/component/Expandable.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/component/Expandable.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/component/Expandable.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -23,7 +23,7 @@
package org.richfaces.component;
-import org.richfaces.event.ToggleListener;
+import org.richfaces.event.CollapsibleSubTableToggleListener;
public interface Expandable {
@@ -31,9 +31,9 @@
public void setExpanded(boolean expand);
- public void addToggleListener(ToggleListener listener);
+ public void addCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener);
- public void removeToggleListener(ToggleListener listener);
+ public void removeCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener);
- public ToggleListener[] getToggleListeners();
+ public CollapsibleSubTableToggleListener[] getCollapsibleSubTableToggleListener();
}
Copied: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleEvent.java (from rev 22177, branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/ToggleEvent.java)
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleEvent.java (rev 0)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleEvent.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -0,0 +1,72 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright ${year}, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.event;
+
+import javax.faces.component.UIComponent;
+import javax.faces.event.FacesEvent;
+import javax.faces.event.FacesListener;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public class CollapsibleSubTableToggleEvent extends FacesEvent {
+
+ private static final long serialVersionUID = 2916560585918250885L;
+
+ private String togglerId;
+
+ private boolean expanded;
+
+
+
+ public CollapsibleSubTableToggleEvent(UIComponent source, boolean expanded) {
+ this(source, expanded, null);
+ }
+
+ public CollapsibleSubTableToggleEvent(UIComponent source, boolean expanded, String toggerId) {
+ super(source);
+ this.expanded = expanded;
+ this.togglerId = toggerId;
+ }
+
+ public String getTogglerId() {
+ return togglerId;
+ }
+
+ public void setTogglerId(String togglerId) {
+ this.togglerId = togglerId;
+ }
+
+ public boolean isExpanded() {
+ return this.expanded;
+ }
+
+ public boolean isAppropriateListener(FacesListener listener) {
+ return (listener instanceof CollapsibleSubTableToggleListener);
+ }
+
+ public void processListener(FacesListener listener) {
+ ((CollapsibleSubTableToggleListener) listener).processCollapsibleSubTableToggle(this);
+ }
+}
Copied: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleListener.java (from rev 22177, branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/ToggleListener.java)
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleListener.java (rev 0)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/CollapsibleSubTableToggleListener.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright ${year}, Red Hat, Inc. and individual contributors
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package org.richfaces.event;
+
+import javax.faces.event.FacesListener;
+
+/**
+ * @author Anton Belevich
+ *
+ */
+public interface CollapsibleSubTableToggleListener extends FacesListener {
+
+ public void processCollapsibleSubTableToggle(CollapsibleSubTableToggleEvent event);
+
+}
Copied: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollEvent.java (from rev 22177, branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerEvent.java)
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollEvent.java (rev 0)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollEvent.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -0,0 +1,94 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.event;
+
+import javax.faces.component.UIComponent;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.FacesListener;
+
+/**
+ * @author Wesley Hales
+ */
+public class DataScrollEvent extends ActionEvent {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 2657353903701932561L;
+ private String oldScrolVal;
+ private String newScrolVal;
+ private int page;
+
+ /**
+ * Creates a new ScrollerEvent.
+ *
+ * @param component
+ * the source of the event
+ * @param thisOldScrolVal
+ * the previously showing item identifier
+ * @param thisNewScrolVal
+ * the currently showing item identifier
+ */
+ public DataScrollEvent(UIComponent component, String thisOldScrolVal, String thisNewScrolVal, int page) {
+ super(component);
+ oldScrolVal = thisOldScrolVal;
+ newScrolVal = thisNewScrolVal;
+ this.page = page;
+ }
+
+ public String getOldScrolVal() {
+ return oldScrolVal;
+ }
+
+ public String getNewScrolVal() {
+ return newScrolVal;
+ }
+
+ /**
+ * @since 3.2
+ * @return new page or <code>-1</code> if not applicable
+ */
+ public int getPage() {
+ return page;
+ }
+
+ public boolean isAppropriateListener(FacesListener listener) {
+ return super.isAppropriateListener(listener) || (listener instanceof DataScrollListener);
+ }
+
+ /**
+ * Delivers this event to the SliderListener.
+ *
+ * @param listener
+ * the slider listener
+ */
+ public void processListener(FacesListener listener) {
+ if (listener instanceof DataScrollListener) {
+ DataScrollListener dataScrollerListener = (DataScrollListener) listener;
+ dataScrollerListener.processDataScroll(this);
+ }
+
+ if (super.isAppropriateListener(listener)) {
+ super.processListener(listener);
+ }
+ }
+}
Copied: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollListener.java (from rev 22177, branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerListener.java)
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollListener.java (rev 0)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollListener.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -0,0 +1,30 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.event;
+
+import javax.faces.event.FacesListener;
+
+public interface DataScrollListener extends FacesListener {
+
+ public void processDataScroll(org.richfaces.event.DataScrollEvent event);
+
+}
Copied: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollSource.java (from rev 22177, branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerSource.java)
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollSource.java (rev 0)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollSource.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -0,0 +1,48 @@
+/**
+ * License Agreement.
+ *
+ * JBoss RichFaces - Ajax4jsf Component Library
+ *
+ * Copyright (C) 2007 Exadel, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+package org.richfaces.event;
+
+public interface DataScrollSource {
+
+ /**
+ * Adds a DataScrollListener to this DataScrollSource.
+ *
+ * @param listener
+ * the Scroll listener to be added
+ */
+ public void addScrollListener(org.richfaces.event.DataScrollListener listener);
+
+ /**
+ * Removes a DataFilterSliderListener from this DataScrollSource.
+ *
+ * @param listener the Scroll listener to be removed
+ */
+ public void removeScrollListener(DataScrollListener listener);
+
+ /**
+ * Returns all ScrollListeners for this DataScrollSource.
+ *
+ * @return the Scroll listener array
+ */
+ public DataScrollListener[] getScrollListeners();
+
+}
Deleted: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerEvent.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerEvent.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerEvent.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -1,94 +0,0 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces - Ajax4jsf Component Library
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.event;
-
-import javax.faces.component.UIComponent;
-import javax.faces.event.ActionEvent;
-import javax.faces.event.FacesListener;
-
-/**
- * @author Wesley Hales
- */
-public class DataScrollerEvent extends ActionEvent {
-
- /**
- *
- */
- private static final long serialVersionUID = 2657353903701932561L;
- private String oldScrolVal;
- private String newScrolVal;
- private int page;
-
- /**
- * Creates a new ScrollerEvent.
- *
- * @param component
- * the source of the event
- * @param thisOldScrolVal
- * the previously showing item identifier
- * @param thisNewScrolVal
- * the currently showing item identifier
- */
- public DataScrollerEvent(UIComponent component, String thisOldScrolVal, String thisNewScrolVal, int page) {
- super(component);
- oldScrolVal = thisOldScrolVal;
- newScrolVal = thisNewScrolVal;
- this.page = page;
- }
-
- public String getOldScrolVal() {
- return oldScrolVal;
- }
-
- public String getNewScrolVal() {
- return newScrolVal;
- }
-
- /**
- * @since 3.2
- * @return new page or <code>-1</code> if not applicable
- */
- public int getPage() {
- return page;
- }
-
- public boolean isAppropriateListener(FacesListener listener) {
- return super.isAppropriateListener(listener) || (listener instanceof DataScrollerListener);
- }
-
- /**
- * Delivers this event to the SliderListener.
- *
- * @param listener
- * the slider listener
- */
- public void processListener(FacesListener listener) {
- if (listener instanceof DataScrollerListener) {
- DataScrollerListener dataScrollerListener = (DataScrollerListener) listener;
- dataScrollerListener.processScroller(this);
- }
-
- if (super.isAppropriateListener(listener)) {
- super.processListener(listener);
- }
- }
-}
Deleted: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerListener.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerListener.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerListener.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -1,30 +0,0 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces - Ajax4jsf Component Library
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.event;
-
-import javax.faces.event.FacesListener;
-
-public interface DataScrollerListener extends FacesListener {
-
- public void processScroller(org.richfaces.event.DataScrollerEvent event);
-
-}
Deleted: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerSource.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerSource.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/DataScrollerSource.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -1,48 +0,0 @@
-/**
- * License Agreement.
- *
- * JBoss RichFaces - Ajax4jsf Component Library
- *
- * Copyright (C) 2007 Exadel, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1 as published by the Free Software Foundation.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-package org.richfaces.event;
-
-public interface DataScrollerSource {
-
- /**
- * Adds a DataScrollerListener to this DataScrollerSource.
- *
- * @param listener
- * the Scroler listener to be added
- */
- public void addScrollerListener(org.richfaces.event.DataScrollerListener listener);
-
- /**
- * Removes a DataFilterSliderListener from this DataScrollerSourceSource.
- *
- * @param listener the Scroler listener to be removed
- */
- public void removeScrollerListener(DataScrollerListener listener);
-
- /**
- * Returns all ScrollerListeners for this DataScrollerSource.
- *
- * @return the Scroler listener array
- */
- public DataScrollerListener[] getScrollerListeners();
-
-}
Deleted: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/PagingEvent.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/PagingEvent.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/PagingEvent.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.event;
-
-import javax.faces.component.UIComponent;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.FacesListener;
-
-public class PagingEvent extends FacesEvent {
-
- private static final long serialVersionUID = -8176111805839316345L;
-
- public PagingEvent(UIComponent component) {
- super(component);
- }
-
- public boolean isAppropriateListener(FacesListener listener) {
- return listener instanceof PagingListener;
- }
-
- public void processListener(FacesListener listener) {
- ((PagingListener) listener).processPaging(this);
- }
-}
Deleted: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/PagingListener.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/PagingListener.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/PagingListener.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -1,31 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.event;
-
-import javax.faces.event.FacesListener;
-
-public interface PagingListener extends FacesListener {
-
- public void processPaging(PagingEvent event);
-
-}
Deleted: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/ToggleEvent.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/ToggleEvent.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/ToggleEvent.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.event;
-
-import javax.faces.component.UIComponent;
-import javax.faces.event.FacesEvent;
-import javax.faces.event.FacesListener;
-
-/**
- * @author Anton Belevich
- *
- */
-public class ToggleEvent extends FacesEvent {
-
- private static final long serialVersionUID = 2916560585918250885L;
-
- private String togglerId;
-
- private boolean expanded;
-
-
-
- public ToggleEvent(UIComponent source, boolean expanded) {
- this(source, expanded, null);
- }
-
- public ToggleEvent(UIComponent source, boolean expanded, String toggerId) {
- super(source);
- this.expanded = expanded;
- this.togglerId = toggerId;
- }
-
- public String getTogglerId() {
- return togglerId;
- }
-
- public void setTogglerId(String togglerId) {
- this.togglerId = togglerId;
- }
-
- public boolean isExpanded() {
- return this.expanded;
- }
-
- public boolean isAppropriateListener(FacesListener listener) {
- return (listener instanceof ToggleListener);
- }
-
- public void processListener(FacesListener listener) {
- ((ToggleListener) listener).processToggle(this);
- }
-}
Deleted: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/ToggleListener.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/ToggleListener.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/ToggleListener.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -1,35 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright ${year}, Red Hat, Inc. and individual contributors
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.richfaces.event;
-
-import javax.faces.event.FacesListener;
-
-/**
- * @author Anton Belevich
- *
- */
-public interface ToggleListener extends FacesListener {
-
- public void processToggle(ToggleEvent event);
-
-}
Modified: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeSelectionChangeEvent.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeSelectionChangeEvent.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeSelectionChangeEvent.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -53,7 +53,7 @@
@Override
public void processListener(FacesListener listener) {
- ((TreeSelectionChangeListener) listener).processSelectionChange(this);
+ ((TreeSelectionChangeListener) listener).processTreeSelectionChange(this);
}
public Collection<Object> getOldSelection() {
Modified: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeSelectionChangeListener.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeSelectionChangeListener.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeSelectionChangeListener.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -30,6 +30,6 @@
*/
public interface TreeSelectionChangeListener extends FacesListener {
- public void processSelectionChange(TreeSelectionChangeEvent event) throws AbortProcessingException;
+ public void processTreeSelectionChange(TreeSelectionChangeEvent event) throws AbortProcessingException;
}
Modified: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeToggleEvent.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeToggleEvent.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeToggleEvent.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -56,7 +56,7 @@
@Override
public void processListener(FacesListener listener) {
- ((TreeToggleListener) listener).processToggle(this);
+ ((TreeToggleListener) listener).processTreeToggle(this);
}
}
Modified: branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeToggleListener.java
===================================================================
--- branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeToggleListener.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/api/src/main/java/org/richfaces/event/TreeToggleListener.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -30,6 +30,6 @@
*/
public interface TreeToggleListener extends FacesListener {
- public void processToggle(TreeToggleEvent event) throws AbortProcessingException;
+ public void processTreeToggle(TreeToggleEvent event) throws AbortProcessingException;
}
Modified: branches/4.0.X/ui/iteration/ui/src/main/config/faces-config.xml
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/config/faces-config.xml 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/ui/src/main/config/faces-config.xml 2011-03-12 14:09:15 UTC (rev 22183)
@@ -26,7 +26,7 @@
<cdk:event-class>org.richfaces.event.TreeToggleEvent</cdk:event-class>
<cdk:listener-class>org.richfaces.event.TreeToggleListener</cdk:listener-class>
<cdk:source-class>org.richfaces.event.TreeToggleSource</cdk:source-class>
- <cdk:listener-method>processToggle</cdk:listener-method>
+ <cdk:listener-method>processTreeToggle</cdk:listener-method>
<cdk:tag>
<cdk:tag-name>treeToggleListener</cdk:tag-name>
<cdk:tag-type>Facelets</cdk:tag-type>
@@ -39,7 +39,7 @@
<cdk:event-class>org.richfaces.event.TreeSelectionChangeEvent</cdk:event-class>
<cdk:listener-class>org.richfaces.event.TreeSelectionChangeListener</cdk:listener-class>
<cdk:source-class>org.richfaces.event.TreeSelectionChangeSource</cdk:source-class>
- <cdk:listener-method>processSelectionChange</cdk:listener-method>
+ <cdk:listener-method>processTreeSelectionChange</cdk:listener-method>
<cdk:tag>
<cdk:tag-name>treeSelectionChangeListener</cdk:tag-name>
<cdk:tag-type>Facelets</cdk:tag-type>
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractCollapsibleSubTable.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -34,8 +34,8 @@
import org.richfaces.cdk.annotations.JsfRenderer;
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.annotations.TagType;
-import org.richfaces.event.ToggleEvent;
-import org.richfaces.event.ToggleListener;
+import org.richfaces.event.CollapsibleSubTableToggleEvent;
+import org.richfaces.event.CollapsibleSubTableToggleListener;
/**
@@ -84,8 +84,8 @@
public abstract String getExpandMode();
public void broadcast(FacesEvent event) throws AbortProcessingException {
- if (event instanceof ToggleEvent) {
- ToggleEvent toggleEvent = (ToggleEvent) event;
+ if (event instanceof CollapsibleSubTableToggleEvent) {
+ CollapsibleSubTableToggleEvent toggleEvent = (CollapsibleSubTableToggleEvent) event;
boolean newValue = toggleEvent.isExpanded();
getStateHelper().put(PropertyKeys.expanded, newValue);
@@ -129,16 +129,16 @@
throw new IllegalArgumentException("subtable is not sortable element");
}
- public void addToggleListener(ToggleListener listener) {
+ public void addCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener) {
addFacesListener(listener);
}
- public void removeToggleListener(ToggleListener listener) {
+ public void removeCollapsibleSubTableToggleListener(CollapsibleSubTableToggleListener listener) {
removeFacesListener(listener);
}
- public ToggleListener[] getToggleListeners() {
- return (ToggleListener[]) getFacesListeners(ToggleListener.class);
+ public CollapsibleSubTableToggleListener[] getCollapsibleSubTableToggleListener() {
+ return (CollapsibleSubTableToggleListener[]) getFacesListeners(CollapsibleSubTableToggleListener.class);
}
public void setIterationState(Object stateObject) {
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataScroller.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataScroller.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/component/AbstractDataScroller.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -47,9 +47,9 @@
import org.richfaces.cdk.annotations.Tag;
import org.richfaces.cdk.annotations.TagType;
import org.richfaces.component.util.MessageUtil;
-import org.richfaces.event.DataScrollerEvent;
-import org.richfaces.event.DataScrollerListener;
-import org.richfaces.event.DataScrollerSource;
+import org.richfaces.event.DataScrollEvent;
+import org.richfaces.event.DataScrollListener;
+import org.richfaces.event.DataScrollSource;
@JsfComponent(
@@ -59,7 +59,7 @@
renderer = @JsfRenderer(type = "org.richfaces.DataScrollerRenderer"),
tag = @Tag(name="dataScroller", handler="org.richfaces.taglib.DataScrollerHandler", type=TagType.Facelets)
)
-public abstract class AbstractDataScroller extends UIComponentBase implements DataScrollerSource, IterationStateHolder {
+public abstract class AbstractDataScroller extends UIComponentBase implements DataScrollSource, IterationStateHolder {
public static final String COMPONENT_TYPE = "org.richfaces.DataScroller";
@@ -139,21 +139,21 @@
getStateHelper().put("for", forId);
}
- public void addScrollerListener(DataScrollerListener listener) {
+ public void addScrollListener(DataScrollListener listener) {
addFacesListener(listener);
}
- public DataScrollerListener[] getScrollerListeners() {
- return (DataScrollerListener[]) getFacesListeners(DataScrollerListener.class);
+ public DataScrollListener[] getScrollListeners() {
+ return (DataScrollListener[]) getFacesListeners(DataScrollListener.class);
}
- public void removeScrollerListener(DataScrollerListener listener) {
+ public void removeScrollListener(DataScrollListener listener) {
removeFacesListener(listener);
}
public void broadcast(FacesEvent event) throws AbortProcessingException {
- if (event instanceof DataScrollerEvent) {
- DataScrollerEvent dataScrollerEvent = (DataScrollerEvent) event;
+ if (event instanceof DataScrollEvent) {
+ DataScrollEvent dataScrollerEvent = (DataScrollEvent) event;
updateModel(dataScrollerEvent.getPage());
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/event/MethodExpressionTreeSelectionChangeListener.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/event/MethodExpressionTreeSelectionChangeListener.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/event/MethodExpressionTreeSelectionChangeListener.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -43,7 +43,7 @@
super(methodExpressionOneArg);
}
- public void processSelectionChange(TreeSelectionChangeEvent event) throws AbortProcessingException {
+ public void processTreeSelectionChange(TreeSelectionChangeEvent event) throws AbortProcessingException {
processEvent(event);
}
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/event/MethodExpressionTreeToggleListener.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/event/MethodExpressionTreeToggleListener.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/event/MethodExpressionTreeToggleListener.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -42,7 +42,7 @@
super(methodExpressionOneArg);
}
- public void processToggle(TreeToggleEvent event) throws AbortProcessingException {
+ public void processTreeToggle(TreeToggleEvent event) throws AbortProcessingException {
processEvent(event);
}
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/CollapsibleSubTableRenderer.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -29,7 +29,7 @@
import org.richfaces.component.AbstractDataTable;
import org.richfaces.component.Row;
import org.richfaces.component.UIDataTableBase;
-import org.richfaces.event.ToggleEvent;
+import org.richfaces.event.CollapsibleSubTableToggleEvent;
import org.richfaces.renderkit.util.AjaxRendererUtils;
import javax.faces.application.ResourceDependencies;
@@ -111,7 +111,7 @@
}
if(subTable.isExpanded() != isExpanded) {
- new ToggleEvent(subTable, isExpanded, togglerId).queue();
+ new CollapsibleSubTableToggleEvent(subTable, isExpanded, togglerId).queue();
}
}
}
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/renderkit/DataScrollerBaseRenderer.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -42,7 +42,7 @@
import org.ajax4jsf.javascript.JSReference;
import org.richfaces.component.AbstractDataScroller;
import org.richfaces.component.DataScrollerControlsMode;
-import org.richfaces.event.DataScrollerEvent;
+import org.richfaces.event.DataScrollEvent;
import org.richfaces.renderkit.util.AjaxRendererUtils;
@ResourceDependencies( {
@@ -68,7 +68,7 @@
int page = scroller.getPage();
if (newPage != 0 && newPage != page) {
- new DataScrollerEvent(scroller, String.valueOf(page), param, newPage).queue();
+ new DataScrollEvent(scroller, String.valueOf(page), param, newPage).queue();
}
}
}
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-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/CollapsibleSubTableHandler.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -60,7 +60,7 @@
static class CollapsibleSubTableMapper extends Metadata {
- private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.ToggleEvent.class };
+ private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.CollapsibleSubTableToggleEvent.class };
private final TagAttribute attribute;
@@ -69,7 +69,7 @@
}
public void applyMetadata(FaceletContext ctx, Object instance) {
- ((AbstractCollapsibleSubTable) instance).addToggleListener((new MethodExpressionToggleListener(this.attribute.getMethodExpression(ctx, null, SIGNATURE))));
+ ((AbstractCollapsibleSubTable) instance).addCollapsibleSubTableToggleListener((new MethodExpressionToggleListener(this.attribute.getMethodExpression(ctx, null, SIGNATURE))));
}
}
}
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataScrollerHandler.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataScrollerHandler.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/DataScrollerHandler.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -70,7 +70,7 @@
private static final class ScrollListenerMapper extends Metadata {
- private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.DataScrollerEvent.class };
+ private static final Class[] SIGNATURE = new Class[] { org.richfaces.event.DataScrollEvent.class };
private final TagAttribute attribute;
@@ -81,7 +81,7 @@
@Override
public void applyMetadata(FaceletContext ctx, Object instance) {
- ((AbstractDataScroller) instance).addScrollerListener((new MethodExpressionScrollListener(this.attribute
+ ((AbstractDataScroller) instance).addScrollListener((new MethodExpressionScrollListener(this.attribute
.getMethodExpression(ctx, null, SIGNATURE))));
}
}
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/MethodExpressionScrollListener.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/MethodExpressionScrollListener.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/MethodExpressionScrollListener.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -3,14 +3,14 @@
import javax.el.MethodExpression;
import javax.faces.context.FacesContext;
-import org.richfaces.event.DataScrollerEvent;
-import org.richfaces.event.DataScrollerListener;
+import org.richfaces.event.DataScrollEvent;
+import org.richfaces.event.DataScrollListener;
/**
* @author Anton Belevich
*
*/
-public class MethodExpressionScrollListener implements DataScrollerListener {
+public class MethodExpressionScrollListener implements DataScrollListener {
private MethodExpression methodExpression;
@@ -23,7 +23,7 @@
this.methodExpression = methodExpression;
}
- public void processScroller(DataScrollerEvent dataScrollerEvent) {
+ public void processDataScroll(DataScrollEvent dataScrollerEvent) {
FacesContext facesContext = FacesContext.getCurrentInstance();
methodExpression.invoke(facesContext.getELContext(), new Object[] { dataScrollerEvent });
}
Modified: branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/MethodExpressionToggleListener.java
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/MethodExpressionToggleListener.java 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/ui/src/main/java/org/richfaces/taglib/MethodExpressionToggleListener.java 2011-03-12 14:09:15 UTC (rev 22183)
@@ -25,10 +25,10 @@
import javax.el.MethodExpression;
import javax.faces.context.FacesContext;
-import org.richfaces.event.ToggleEvent;
-import org.richfaces.event.ToggleListener;
+import org.richfaces.event.CollapsibleSubTableToggleEvent;
+import org.richfaces.event.CollapsibleSubTableToggleListener;
-public class MethodExpressionToggleListener implements ToggleListener {
+public class MethodExpressionToggleListener implements CollapsibleSubTableToggleListener {
private MethodExpression methodExpression;
@@ -41,7 +41,7 @@
this.methodExpression = methodExpression;
}
- public void processToggle(ToggleEvent toggleEvent) {
+ public void processCollapsibleSubTableToggle(CollapsibleSubTableToggleEvent toggleEvent) {
FacesContext facesContext = FacesContext.getCurrentInstance();
methodExpression.invoke(facesContext.getELContext(), new Object[]{toggleEvent});
}
Modified: branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/cdk/attributes/tree-serverEventListeners-props.xml
===================================================================
--- branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/cdk/attributes/tree-serverEventListeners-props.xml 2011-03-12 14:03:44 UTC (rev 22182)
+++ branches/4.0.X/ui/iteration/ui/src/main/resources/META-INF/cdk/attributes/tree-serverEventListeners-props.xml 2011-03-12 14:09:15 UTC (rev 22183)
@@ -17,14 +17,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee">
<property>
- <property-name>selectionChangeListener</property-name>
+ <property-name>treeSelectionChangeListener</property-name>
<property-class>javax.el.MethodExpression</property-class>
<property-extension>
<cdk:generate>false</cdk:generate>
</property-extension>
</property>
<property>
- <property-name>toggleListener</property-name>
+ <property-name>treeToggleListener</property-name>
<property-class>javax.el.MethodExpression</property-class>
<property-extension>
<cdk:generate>false</cdk:generate>
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22182 - in branches/4.0.X/ui/input/ui/src: main/java/org/richfaces/renderkit and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2011-03-12 09:03:44 -0500 (Sat, 12 Mar 2011)
New Revision: 22182
Modified:
branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java
branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
branches/4.0.X/ui/input/ui/src/main/templates/calendar.template.xml
branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarContent.xmlunit.xml
branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarTest.xhtml
Log:
https://jira.jboss.org/browse/RF-9655
Reviewed by Gleb Galkin
Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2011-03-12 13:17:17 UTC (rev 22181)
+++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/component/AbstractCalendar.java 2011-03-12 14:03:44 UTC (rev 22182)
@@ -171,8 +171,14 @@
@Attribute
public abstract String getStyleClass();
+
+ @Attribute
+ public abstract String getPopupStyle();
@Attribute
+ public abstract String getPopupClass();
+
+ @Attribute
public abstract Object getMonthLabels();
@Attribute
Modified: branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2011-03-12 13:17:17 UTC (rev 22181)
+++ branches/4.0.X/ui/input/ui/src/main/java/org/richfaces/renderkit/CalendarRendererBase.java 2011-03-12 14:03:44 UTC (rev 22182)
@@ -516,14 +516,14 @@
return true;
}
- public String getStyleWithZindex(FacesContext facesContext, UIComponent component) {
+ public String getPopupStyle(FacesContext facesContext, UIComponent component) {
AbstractCalendar calendar = (AbstractCalendar) component;
int zindex = calendar.getZindex();
if (zindex < 0) {
zindex = 3;
}
- return HtmlUtil.concatStyles("z-index: " + zindex, calendar.getStyle());
+ return HtmlUtil.concatStyles("z-index: " + zindex, calendar.getPopupStyle());
}
public Locale getAsLocale(FacesContext facesContext, UIComponent component) {
Modified: branches/4.0.X/ui/input/ui/src/main/templates/calendar.template.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/main/templates/calendar.template.xml 2011-03-12 13:17:17 UTC (rev 22181)
+++ branches/4.0.X/ui/input/ui/src/main/templates/calendar.template.xml 2011-03-12 14:03:44 UTC (rev 22182)
@@ -23,7 +23,7 @@
<cdk:import package="org.richfaces.component" names="Positioning" />
</cc:interface>
<cc:implementation>
- <span id="#{clientId}" class="#{component.attributes['styleClass']}">
+ <span id="#{clientId}" class="#{component.attributes['styleClass']}" style="#{component.attributes['style']}">
<span id="#{clientId}Popup"
style="#{component.attributes['popup'] ? 'white-space: nowrap;' : 'display: none;'}">
<c:choose>
@@ -70,7 +70,7 @@
<script type="text/javascript">
<cdk:scriptObject name="options">
- <cdk:scriptOption attributes="enableManualInput disabled readonly resetTimeOnDateSelect showApplyButton popup showInput showHeader showFooter showWeeksBar datePattern hidePopupOnScrol showWeekDaysBar styleClass defaultLabel" />
+ <cdk:scriptOption attributes="enableManualInput disabled readonly resetTimeOnDateSelect showApplyButton popup showInput showHeader showFooter showWeeksBar datePattern hidePopupOnScrol showWeekDaysBar defaultLabel" />
<cdk:scriptOption attributes="onchange ondateselect onbeforedateselect onbeforecurrentdateselect onhide onshow ondatemouseover ondatemouseout onclean ontimeselect onbeforetimeselect" wrapper="eventHandler" />
<cdk:scriptOption name="mode" value="#{getModeOrDefault(component)}" defaultValue="org.richfaces.component.AbstractCalendar.Mode.client"/>
<cdk:scriptOption name="todayControlMode" value="#{getTodayControlModeOrDefault(component)}" defaultValue='"select"'/>
@@ -86,7 +86,8 @@
<cdk:scriptOption name="isDayEnabled" value="#{getDayEnabled(facesContext, component)}" />
<cdk:scriptOption name="labels" value="#{getLabels(facesContext, component)}" />
<cdk:scriptOption name="defaultTime" value="#{getPreparedDefaultTime(facesContext, component)}" />
- <cdk:scriptOption name="style" value="#{getStyleWithZindex(facesContext, component)}" />
+ <cdk:scriptOption name="style" value="#{getPopupStyle(facesContext, component)}" />
+ <cdk:scriptOption name="styleClass" value="#{component.attributes['popupClass']}" />
</cdk:scriptObject>
RichFaces.ui.Calendar.addLocale("#{getAsLocale(facesContext, component).toString()}",
Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarContent.xmlunit.xml
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarContent.xmlunit.xml 2011-03-12 13:17:17 UTC (rev 22181)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarContent.xmlunit.xml 2011-03-12 14:03:44 UTC (rev 22182)
@@ -1,4 +1,4 @@
-<table id="form:calendarContent" border="0" cellpadding="0" cellspacing="0" class="rf-cal-extr rf-cal-popup undefined" style="display:none; position:absolute;z-index: 3;width:200px" onclick="RichFaces.$('form:calendar').skipEventOnCollapse=true;">
+<table id="form:calendarContent" border="0" cellpadding="0" cellspacing="0" class="rf-cal-extr rf-cal-popup undefined" style="display:none; position:absolute;z-index: 3" onclick="RichFaces.$('form:calendar').skipEventOnCollapse=true;">
<tbody>
<tr>
<td class="rf-cal-hdr" colspan="8" id="form:calendarHeader"/>
Modified: branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarTest.xhtml
===================================================================
--- branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarTest.xhtml 2011-03-12 13:17:17 UTC (rev 22181)
+++ branches/4.0.X/ui/input/ui/src/test/resources/org/richfaces/component/calendarTest.xhtml 2011-03-12 14:03:44 UTC (rev 22182)
@@ -20,7 +20,7 @@
showHeader="true"
currentDate="#{calendarBean.selectedDate}"
showApplyButton="#{calendarBean.showApply}" cellWidth="24px"
- cellHeight="22px" style="width:200px">
+ cellHeight="22px">
<f:convertDateTime pattern="#{calendarBean.pattern}"
onchange="alert('1')" />
</in:calendar>
13 years, 3 months
- 1
- 0
JBoss Rich Faces SVN: r22181 - branches/4.0.X/examples/irc-client.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2011-03-12 08:17:17 -0500 (Sat, 12 Mar 2011)
New Revision: 22181
Modified:
branches/4.0.X/examples/irc-client/readme.txt
Log:
updated irc-client readme.txt with build instructions.
Modified: branches/4.0.X/examples/irc-client/readme.txt
===================================================================
--- branches/4.0.X/examples/irc-client/readme.txt 2011-03-12 13:12:51 UTC (rev 22180)
+++ branches/4.0.X/examples/irc-client/readme.txt 2011-03-12 13:17:17 UTC (rev 22181)
@@ -1,3 +1,41 @@
+=======================================================================
+
+ RichFaces - Ajax enabled JSF 2.0 component library
+
+ RichFaces 4.0.Final irc-client sample
+ http://richfaces.org
+ March 2011
+ This software is distributed under the terms of the
+ FSF Lesser Gnu Public License (see lgpl.txt)
+
+========================================================================
+
IRC Client Application is a sample which shows RichFaces Push in action.
Targetted to JBoss AS 6
+ * Run mvn install
+
+ * Place war file into "JBoss AS 6/server/default/deploy" folder
+
+ * Run JBoss AS
+
+JMS Configuration should be done prior to running application.
+
+ * Start Admin console going to http://localhost:8080/admin-console
+
+ * Setup new Messages Topic with the folowing properties:
+ Name: chat
+ JNDI name: /topic/chat
+ All the others: by default.
+
+ * Add roles for that topic
+ Name: guest
+ Send: yes
+ Consume: yes
+ create subscriber: yes
+ delete subscriber: yes
+ create durable subscriber: yes
+ delete durable subscriber: yes
+
+Running application
+ * Enjoy playing with the client at http://localhost:8080/irc-samples
13 years, 3 months
- 1
- 0