JBoss Rich Faces SVN: r7118 - in trunk/test-applications/jsp/src/main/webapp: Tooltip and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-03-24 11:15:38 -0400 (Mon, 24 Mar 2008)
New Revision: 7118
Modified:
trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp
trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp
Log:
+ update
Modified: trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp 2008-03-24 15:13:04 UTC (rev 7117)
+++ trunk/test-applications/jsp/src/main/webapp/ListShuttle/ListShuttle.jsp 2008-03-24 15:15:38 UTC (rev 7118)
@@ -8,7 +8,7 @@
sourceValue="#{listShuttle.sourceValue}" targetValue="#{listShuttle.targetValue}"
bottomControlLabel="#{listShuttle.bottomControlLabel}" copyAllControlLabel="#{listShuttle.copyAllControlLabel}"
copyControlLabel="#{listShuttle.copyControlLabel}" downControlLabel="#{listShuttle.downControlLabel}"
- fastMoveControlsVisible="#{listShuttle.fastMoveControlsVisible}" converter="listShuttleConverter"
+ fastMoveControlsVisible="#{listShuttle.fastMoveControlsVisible}" converter="dataConverter"
fastOrderControlsVisible="#{listShuttle.fastOrderControlsVisible}" first="#{listShuttle.first}"
moveControlsVisible="#{listShuttle.moveControlsVisible}" orderControlsVisible="#{listShuttle.orderControlsVisible}"
removeAllControlLabel="#{listShuttle.removeAllControlLabel}" removeControlLabel="#{listShuttle.removeControlLabel}"
Modified: trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2008-03-24 15:13:04 UTC (rev 7117)
+++ trunk/test-applications/jsp/src/main/webapp/Tooltip/Tooltip.jsp 2008-03-24 15:15:38 UTC (rev 7118)
@@ -7,7 +7,7 @@
<h:messages></h:messages>
<h:inputText value="Text" id="inp1" size="50">
- <rich:toolTip id="toolTipID" value="toolTip for input text" >
+ <rich:toolTip id="toolTipID" value="toolTip for input text" layout="inline">
<f:facet name="defaultContent">
<f:verbatim>DEFAULT VALUE</f:verbatim>
</f:facet>
@@ -22,7 +22,7 @@
<a4j:commandLink onclick="$('formID:tooltipSubviewID:toolTipID').component.doDisable" value="doDisable"></a4j:commandLink>
</h:panelGrid>
<h:selectOneListbox value="1" id="ddl">
- <rich:toolTip value="1231231">
+ <rich:toolTip value="1231231" layout="block">
<f:facet name="defaultContent">
<f:verbatim>DEFAULT VALUE DropDown</f:verbatim>
</f:facet>
16 years, 9 months
JBoss Rich Faces SVN: r7117 - in trunk/test-applications/jsp/src/main/java: inplaceSelect and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-03-24 11:13:04 -0400 (Mon, 24 Mar 2008)
New Revision: 7117
Modified:
trunk/test-applications/jsp/src/main/java/inplaceInput/InplaceInput.java
trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java
trunk/test-applications/jsp/src/main/java/progressBar/ProgressBar.java
Log:
+ update
Modified: trunk/test-applications/jsp/src/main/java/inplaceInput/InplaceInput.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/inplaceInput/InplaceInput.java 2008-03-24 15:11:35 UTC (rev 7116)
+++ trunk/test-applications/jsp/src/main/java/inplaceInput/InplaceInput.java 2008-03-24 15:13:04 UTC (rev 7117)
@@ -29,7 +29,7 @@
required = false;
requiredMessage = "requiredMessage";
tabindex = 1;
- editEvent = "click";
+ editEvent = "onclick";
defaultLabel = "defaultLabel";
controlsVerticalPosition = "top";
controlsHorizontalPosition = "left";
Modified: trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java 2008-03-24 15:11:35 UTC (rev 7116)
+++ trunk/test-applications/jsp/src/main/java/inplaceSelect/InplaceSelect.java 2008-03-24 15:13:04 UTC (rev 7117)
@@ -25,7 +25,7 @@
public InplaceSelect() {
valueCL = "---";
- editEvent = "click";
+ editEvent = "onclick";
maxSelectWidth = "150";
minSelectWidth = "85";
selectWidth = "170";
Modified: trunk/test-applications/jsp/src/main/java/progressBar/ProgressBar.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/progressBar/ProgressBar.java 2008-03-24 15:11:35 UTC (rev 7116)
+++ trunk/test-applications/jsp/src/main/java/progressBar/ProgressBar.java 2008-03-24 15:13:04 UTC (rev 7117)
@@ -6,17 +6,19 @@
public class ProgressBar {
private boolean ajaxSingle;
- private Integer value;
+ private double value;
private boolean enabled;
private String mode;
private String interval;
private String maxValue;
private String minValue;
+ private String label;
private boolean dualColoredLabel;
private boolean rendered;
private String listnerInfo;
private boolean ignoreDupResponses;
private boolean permanent;
+ private boolean immediate;
public boolean isIgnoreDupResponses() {
return ignoreDupResponses;
@@ -35,12 +37,14 @@
}
public String getLoadInfo() {
- return Data.cityAfrica[value % 62];
+ return Data.cityAfrica[(int)value % 62];
}
public ProgressBar() {
+ immediate = false;
+ label = "label";
ajaxSingle = false;
- value = 0;
+ value = 0L;
enabled = false;
mode = "ajax";
interval = "500";
@@ -117,12 +121,12 @@
this.rendered = rendered;
}
- public Integer getValue() {
+ public double getValue() {
// without a vodka bottle you will not understand :)
return enabled ? (permanent ? new Integer(maxValue) : value++) : value;
}
- public void setValue(Integer value) {
+ public void setValue(double value) {
this.value = value;
}
@@ -141,4 +145,20 @@
public void setPermanent(boolean permanent) {
this.permanent = permanent;
}
+
+ public String getLabel() {
+ return label;
+ }
+
+ public void setLabel(String label) {
+ this.label = label;
+ }
+
+ public boolean isImmediate() {
+ return immediate;
+ }
+
+ public void setImmediate(boolean immediate) {
+ this.immediate = immediate;
+ }
}
16 years, 9 months
JBoss Rich Faces SVN: r7116 - in trunk/test-applications/jsp/src/main: webapp/Calendar and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-03-24 11:11:35 -0400 (Mon, 24 Mar 2008)
New Revision: 7116
Modified:
trunk/test-applications/jsp/src/main/java/util/data/Data.java
trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp
trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp
trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/java/util/data/Data.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/data/Data.java 2008-03-24 15:10:44 UTC (rev 7115)
+++ trunk/test-applications/jsp/src/main/java/util/data/Data.java 2008-03-24 15:11:35 UTC (rev 7116)
@@ -232,4 +232,9 @@
return true;
}
+ @Override
+ public String toString() {
+
+ return str0 + ":" + str1 + ":" + str2 + ":" + str3 + ":" + int0 + ":" + int1 + ":" + int2 + ":" + int3 + ":" + bool0 + ":" + bool1 + ":" + bool2 + ":" + bool3;
+ }
}
Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2008-03-24 15:10:44 UTC (rev 7115)
+++ trunk/test-applications/jsp/src/main/webapp/Calendar/Calendar.jsp 2008-03-24 15:11:35 UTC (rev 7116)
@@ -14,11 +14,14 @@
<h:outputText value="Ajax mode"
rendered="#{calendarBean.renderedAjax}" />
- <rich:calendar id="calendarClientID" horizontalOffset="#{calendarBean.horizontalOffset}"
- verticalOffset="#{calendarBean.verticalOffset}" ignoreDupResponses="#{calendarBean.ignoreDupResponses}"
- inputSize="#{calendarBean.inputSize}" eventsQueue="myEventsQueue" label="calendarLabel" limitToList="#{calendarBean.limitToList}"
- dataModel="#{calendarDataModel}"
- style="#{style.style}" styleClass="#{style.styleClass}" inputStyle="#{style.inputStyle}"
+ <rich:calendar id="calendarClientID"
+ horizontalOffset="#{calendarBean.horizontalOffset}"
+ verticalOffset="#{calendarBean.verticalOffset}"
+ ignoreDupResponses="#{calendarBean.ignoreDupResponses}"
+ inputSize="#{calendarBean.inputSize}" eventsQueue="myEventsQueue"
+ label="calendarLabel" limitToList="#{calendarBean.limitToList}"
+ dataModel="#{calendarDataModel}" style="#{style.style}"
+ styleClass="#{style.styleClass}" inputStyle="#{style.inputStyle}"
locale="#{calendarBean.locale}" popup="#{calendarBean.popup}"
preloadDateRangeBegin="#{calendarBean.prDateRangeBegin}"
preloadDateRangeEnd="#{calendarBean.prDateRangeEnd}"
@@ -57,7 +60,7 @@
immediate="#{calendarBean.immediate}"
onbeforedomupdate="#{event.onbeforedomupdate}"
onchanged="#{event.onchanged}" oncollapse="#{event.oncollapse}"
- oncomplete="#{event.oncomplete}"
+ oncomplete="#{event.oncomplete}"
oncurrentdateselect="#{event.oncurrentdateselect}"
ondatemouseout="#{event.ondatemouseout}"
ondatemouseover="#{event.ondatemouseover}"
@@ -102,9 +105,9 @@
</h:panelGrid>
</rich:calendar>
- <rich:calendar id="calendarAjaxID" dataModel="#{calendarDataModel}"
- locale="#{calendarBean.locale}" popup="#{calendarBean.popup}"
- datePattern="#{calendarBean.pattern}"
+ <rich:calendar id="calendarAjaxID"
+ dataModel="#{calendarDataModel}" locale="#{calendarBean.locale}"
+ popup="#{calendarBean.popup}" datePattern="#{calendarBean.pattern}"
weekDayLabels="#{calendarBean.weekDayLabels}"
weekDayLabelsShort="#{calendarBean.weekDayLabelsShort}"
monthLabels="#{calendarBean.monthLabels}"
@@ -150,7 +153,7 @@
oninputselect="#{event.oninputselect}"
ontimeselect="#{event.ontimeselect}"
ontimeselected="#{event.ontimeselected}">
-
+
<f:facet name="weekDay">
<f:verbatim>
<span style="padding: 2px; font-size: 4">{weekDayLabel +
@@ -181,5 +184,6 @@
</h:panelGrid>
</rich:calendar>
</h:panelGrid>
- <h:outputLink value="http://www.jboss.com/index.html?module=bb&op=viewforum&f=261"></h:outputLink>
+ <h:outputLink
+ value="http://www.jboss.com/index.html?module=bb&op=viewforum&f=261"></h:outputLink>
</f:subview>
Modified: trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2008-03-24 15:10:44 UTC (rev 7115)
+++ trunk/test-applications/jsp/src/main/webapp/Calendar/CalendarProperty.jsp 2008-03-24 15:11:35 UTC (rev 7116)
@@ -47,7 +47,7 @@
<h:outputText value="cellWidth: "></h:outputText>
<h:inputText value="#{calendarBean.cellWidth}" onchange="submit();"></h:inputText>
- <h:outputText value="Custom day labels" />
+ <h:outputText value="todayControlMode" />
<h:selectOneRadio value="#{calendarBean.todayControlMode}" onchange="submit();">
<f:selectItem itemLabel="scroll" itemValue="scroll" />
<f:selectItem itemLabel="select" itemValue="select" />
Modified: trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-03-24 15:10:44 UTC (rev 7115)
+++ trunk/test-applications/jsp/src/main/webapp/ModalPanel/ModalPanel.jsp 2008-03-24 15:11:35 UTC (rev 7116)
@@ -42,13 +42,27 @@
<br />
<br />
</f:verbatim>
-
+
+ <a4j:commandLink onclick="Richfaces.showModalPanel('modalPanel2ID');return false;" value="show ModalPanel 2">
+ </a4j:commandLink>
+ <f:verbatim>
+ <br />
+ <br />
+ </f:verbatim>
<h:outputLink onclick="Richfaces.hideModalPanel('modalPanelID');return false;" value="Close">
<f:verbatim>Close</f:verbatim>
</h:outputLink>
-
<jsp:include flush="true" page="${richBean.pathComponentContainer}" />
</rich:modalPanel>
+
+ <rich:modalPanel id="modalPanel2ID" minHeight="100" minWidth="200" >
+ <h:outputText value="text"></h:outputText>
+ <h:inputText value="input"></h:inputText>
+ <h:outputLink onclick="Richfaces.hideModalPanel('modalPanel2ID');return false;" value="Close">
+ <f:verbatim>Close</f:verbatim>
+ </h:outputLink>
+ </rich:modalPanel>
+
<a onclick="Richfaces.showModalPanel('modalPanelID');" href="#">Show MP</a>
Modified: trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp 2008-03-24 15:10:44 UTC (rev 7115)
+++ trunk/test-applications/jsp/src/main/webapp/ProgressBar/ProgressBar.jsp 2008-03-24 15:11:35 UTC (rev 7116)
@@ -4,7 +4,8 @@
<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
<f:subview id="progressBarSubviewID">
- <rich:progressBar id="progressBarID" value="#{progressBar.value}"
+ <rich:progressBar id="progressBarID" ajaxSingle="#{progressBar.ajaxSingle}" label="#{progressBar.label}" immediate="#{progressBar.immediate}"
+ value="#{progressBar.value}"
style="width: 450px; height: 19px;#{style.style};" completeClass="#{style.completeClass}" finishClass="#{style.finishClass}" initialClass="#{style.initialClass}" remainClass="#{style.remainClass}" styleClass="#{style.styleClass}"
mode="#{progressBar.mode}" enabled="#{progressBar.enabled}"
actionListener="#{progressBar.actionListener}"
@@ -46,6 +47,8 @@
onclick="alert($('formID:progressBarSubviewID:progressBarID').component.getValue())"></a4j:commandButton>
<a4j:commandLink value="setLabel"
onclick="$('formID:progressBarSubviewID:progressBarID').component.setLabel('setLabel work')"></a4j:commandLink>
+ <a4j:commandLink value="setValue(0)"
+ onclick="$('formID:progressBarSubviewID:progressBarID').component.setValue('0')"></a4j:commandLink>
<a4j:commandLink value="disable"
onclick="$('formID:progressBarSubviewID:progressBarID').component.disable();"></a4j:commandLink>
<a4j:commandLink value="enable"
@@ -64,6 +67,10 @@
<h:inputText id="valuePBID" value="#{progressBar.value}">
<a4j:support event="onchange" reRender="progressBarID"></a4j:support>
</h:inputText>
+ <h:outputText value="label:" />
+ <h:inputText value="#{progressBar.label}">
+ <a4j:support event="onchange" reRender="progressBarID"></a4j:support>
+ </h:inputText>
<h:outputText value="interval:" />
<h:inputText value="#{progressBar.interval}">
@@ -82,6 +89,11 @@
<a4j:support event="onchange" reRender="progressBarID"></a4j:support>
</h:selectBooleanCheckbox>
+ <h:outputText value="ajaxSingle" />
+ <h:selectBooleanCheckbox value="#{progressBar.ajaxSingle}">
+ <a4j:support event="onchange" reRender="progressBarID"></a4j:support>
+ </h:selectBooleanCheckbox>
+
<h:outputText value="permanent:" />
<h:selectBooleanCheckbox value="#{progressBar.permanent}"
onchange="submit();" />
@@ -92,10 +104,6 @@
<h:outputText value="maxValue:" />
<h:inputText value="#{progressBar.maxValue}" onchange="submit();" />
- <h:outputText value="dualColoredLabel:" />
- <h:selectBooleanCheckbox value="#{progressBar.dualColoredLabel}"
- onchange="submit();" />
-
<h:outputText value="ignoreDupResponses" />
<h:selectBooleanCheckbox value="#{progressBar.ignoreDupResponses}"
onchange="submit();" />
@@ -103,5 +111,11 @@
<h:outputText value="rendered:" />
<h:selectBooleanCheckbox value="#{progressBar.rendered}"
onchange="submit();" />
+
+ <h:outputText value="immediate" />
+ <h:selectBooleanCheckbox value="#{progressBar.immediate}">
+ <a4j:support event="onchange" reRender="progressBarID"></a4j:support>
+ </h:selectBooleanCheckbox>
+
</h:panelGrid>
</f:subview>
\ No newline at end of file
16 years, 9 months
JBoss Rich Faces SVN: r7115 - in trunk/test-applications/jsp/src/main/webapp: Skinning and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-03-24 11:10:44 -0400 (Mon, 24 Mar 2008)
New Revision: 7115
Modified:
trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp
trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp
trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp
trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp
Log:
Modified: trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2008-03-24 15:10:09 UTC (rev 7114)
+++ trunk/test-applications/jsp/src/main/webapp/ScrollableDataTable/ScrollableDataTable.jsp 2008-03-24 15:10:44 UTC (rev 7115)
@@ -34,7 +34,7 @@
</h:panelGrid>
</h:panelGrid>
<rich:scrollableDataTable id="sdt" var="sdt" rowKeyVar="key" onRowDblClick="alert('row:#{key}')"
- ajaxSingle="#{scrollableDT.ajaxSingle}"
+ ajaxSingle="#{scrollableDT.ajaxSingle}" rowKeyConverter="#{dataConverter}"
value="#{scrollableDT.data}" rows="#{scrollableDT.rows}"
width="#{scrollableDT.width}" height="#{scrollableDT.height}"
hideWhenScrolling="#{scrollableDT.hideWhenScrolling}"
Modified: trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp 2008-03-24 15:10:09 UTC (rev 7114)
+++ trunk/test-applications/jsp/src/main/webapp/Skinning/Skinning.jsp 2008-03-24 15:10:44 UTC (rev 7115)
@@ -23,17 +23,6 @@
styleClass="#{skinning.commandLink}"></h:commandLink>
<h:panelGroup>
- <h:outputText value="dataTable "></h:outputText>
- <h:inputText value="#{skinning.dataTable}" onchange="submit();"></h:inputText>
- </h:panelGroup>
- <h:dataTable value="#{dataOrderedList.defaultArr}" var="def"
- styleClass="#{skinning.dataTable}">
- <h:column>
- <h:outputText value="#{def}"></h:outputText>
- </h:column>
- </h:dataTable>
-
- <h:panelGroup>
<h:outputText value="inputSecret "></h:outputText>
<h:inputText value="#{skinning.inputSecret}" onchange="submit();"></h:inputText>
</h:panelGroup>
Modified: trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp 2008-03-24 15:10:09 UTC (rev 7114)
+++ trunk/test-applications/jsp/src/main/webapp/SortingAndFiltering/SortingAndFiltering.jsp 2008-03-24 15:10:44 UTC (rev 7115)
@@ -34,6 +34,7 @@
</h:panelGrid>
<h:panelGrid columns="1" title="4">
<h:outputText value="selfSorted='#{sortingAndFiltering.selfSorted}'"></h:outputText>
+ <h:outputText value="filterBy"></h:outputText>
</h:panelGrid>
<h:panelGrid columns="1" title="5">
<h:outputText value="sortOrder='#{sortingAndFiltering.sortOrder}'"></h:outputText>
Modified: trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2008-03-24 15:10:09 UTC (rev 7114)
+++ trunk/test-applications/jsp/src/main/webapp/SuggestionBox/SuggestionBox.jsp 2008-03-24 15:10:44 UTC (rev 7115)
@@ -9,7 +9,7 @@
<br />
</f:verbatim>
<h:inputText value="#{sb.property}" id="text" />
- <rich:suggestionbox id="suggestionBoxId" eventsQueue="myEventsQueue" ajaxSingle="#{sb.ajaxSingle}" dir="#{sb.dir}"
+ <rich:suggestionbox id="suggestionBoxId" frame="below" param="param:#{result.text}" eventsQueue="myEventsQueue" ajaxSingle="#{sb.ajaxSingle}" dir="#{sb.dir}"
rendered="#{sb.rendered}" requestDelay="#{sb.requestDelay}" selfRendered="#{sb.selfRendered}" value="#{sb.value}" for="text"
var="result" fetchValue="#{result.text}" suggestionAction="#{sb.autocomplete}" width="#{sb.width}" height="#{sb.height}"
border="#{sb.border}" zindex="#{sb.zindex}" rules="#{sb.rules}" cellpadding="#{sb.cellpadding}"
@@ -18,6 +18,7 @@
shadowDepth="#{sb.shadowDepth}" selectValueClass="mousemove" frequency="#{sb.frequency}" nothingLabel="nothingLabel work! "
entryClass="#{style.entryClass}" popupClass="#{style.popupClass}" popupStyle="#{style.popupStyle}" style="#{style.style}" styleClass="#{style.styleClass}" selectedClass="#{style.selectedClass}" rowClasses="#{style.rowClasses}"
oncomplete="#{event.oncomplete}" onselect="#{event.onselect}" onbeforedomupdate="#{event.onbeforedomupdate}" onsubmit="#{event.onsubmit}">
+
<h:column>
<h:outputText value="#{result.city}" />
</h:column>
16 years, 9 months
JBoss Rich Faces SVN: r7114 - trunk/test-applications/jsp/src/main/webapp/WEB-INF.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-03-24 11:10:09 -0400 (Mon, 24 Mar 2008)
New Revision: 7114
Modified:
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml
trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Tree.xml
trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
Log:
+ update
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml 2008-03-24 15:07:02 UTC (rev 7113)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Converter.xml 2008-03-24 15:10:09 UTC (rev 7114)
@@ -14,5 +14,8 @@
<converter-id>pickListConverter</converter-id>
<converter-class>pickList.PickListConverter</converter-class>
</converter>
-
+ <converter>
+ <converter-id>dataConverter</converter-id>
+ <converter-class>util.converter.DataConverter</converter-class>
+ </converter>
</faces-config>
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Tree.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Tree.xml 2008-03-24 15:07:02 UTC (rev 7113)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/faces-config-Tree.xml 2008-03-24 15:10:09 UTC (rev 7114)
@@ -12,4 +12,9 @@
<managed-bean-class>tree.TreeBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
</managed-bean>
+ <managed-bean>
+ <managed-bean-name>tree</managed-bean-name>
+ <managed-bean-class>tree.Tree</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
</faces-config>
Modified: trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-03-24 15:07:02 UTC (rev 7113)
+++ trunk/test-applications/jsp/src/main/webapp/WEB-INF/web.xml 2008-03-24 15:10:09 UTC (rev 7114)
@@ -6,7 +6,15 @@
<param-name>org.ajax4jsf.SKIN</param-name>
<param-value>#{skinBean.skin}</param-value>
</context-param>
+ <context-param>
+ <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name>
+ <param-value>#{skinning.skinningClass}</param-value>
+ </context-param>
<context-param>
+ <param-name>org.richfaces.CONTROL_SKINNING</param-name>
+ <param-value>#{skinning.skinning}</param-value>
+ </context-param>
+ <context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
<param-value>server</param-value>
</context-param>
@@ -19,14 +27,6 @@
<param-value>false</param-value>
</context-param>
<context-param>
- <param-name>org.richfaces.CONTROL_SKINNING_CLASSES</param-name>
- <param-value>#{skinning.skinningClass}</param-value>
- </context-param>
- <context-param>
- <param-name>org.richfaces.CONTROL_SKINNING</param-name>
- <param-value>#{skinning.skinning}</param-value>
- </context-param>
- <context-param>
<param-name>org.ajax4jsf.xmlparser.ORDER</param-name>
<param-value>NONE</param-value>
</context-param>
16 years, 9 months
JBoss Rich Faces SVN: r7113 - trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-03-24 11:07:02 -0400 (Mon, 24 Mar 2008)
New Revision: 7113
Modified:
trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarAnimatedBg.java
trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarBg.java
Log:
[RF-2689] fileUpload:java.lang.NullPointerException appears in case createTempFiles init parametr is set to "false"
Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarAnimatedBg.java
===================================================================
--- trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarAnimatedBg.java 2008-03-24 15:01:40 UTC (rev 7112)
+++ trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarAnimatedBg.java 2008-03-24 15:07:02 UTC (rev 7113)
@@ -148,9 +148,14 @@
private Color getColorValueParameter(FacesContext context, String name) {
Color retVal = null;
String color = (String) SkinFactory.getInstance().getSkin(context).getParameter(context, name);
- if (color != null && !color.trim().equals("")) {
+ if (null == color || "".equals(color.trim())) {
+ color = (String) SkinFactory.getInstance().getDefaultSkin(context).getParameter(context, name);
+ }
+
+ if (null != color && !"".equals(color.trim())) {
retVal = HtmlColor.decode(color);
}
+
return retVal;
}
Modified: trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarBg.java
===================================================================
--- trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarBg.java 2008-03-24 15:01:40 UTC (rev 7112)
+++ trunk/ui/progressBAR/src/main/java/org/richfaces/renderkit/html/images/ProgressBarBg.java 2008-03-24 15:07:02 UTC (rev 7113)
@@ -131,9 +131,14 @@
private Color getColorValueParameter(FacesContext context, String name) {
Color retVal = null;
String color = (String) SkinFactory.getInstance().getSkin(context).getParameter(context, name);
- if (color != null && !color.trim().equals("")) {
+ if (null == color || "".equals(color.trim())) {
+ color = (String) SkinFactory.getInstance().getDefaultSkin(context).getParameter(context, name);
+ }
+
+ if (null != color && !"".equals(color.trim())) {
retVal = HtmlColor.decode(color);
}
+
return retVal;
}
16 years, 9 months
JBoss Rich Faces SVN: r7112 - trunk/test-applications/jsp/src/main/java/util/converter.
by richfaces-svn-commits＠lists.jboss.org
Author: ayanul
Date: 2008-03-24 11:01:40 -0400 (Mon, 24 Mar 2008)
New Revision: 7112
Added:
trunk/test-applications/jsp/src/main/java/util/converter/DataConverter.java
Log:
Added: trunk/test-applications/jsp/src/main/java/util/converter/DataConverter.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/util/converter/DataConverter.java (rev 0)
+++ trunk/test-applications/jsp/src/main/java/util/converter/DataConverter.java 2008-03-24 15:01:40 UTC (rev 7112)
@@ -0,0 +1,32 @@
+package util.converter;
+
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.convert.Converter;
+import javax.faces.convert.ConverterException;
+import javax.swing.tree.TreeNode;
+
+import util.data.Data;
+
+public class DataConverter implements Converter {
+
+ public Object getAsObject(FacesContext context, UIComponent component,
+ String value) {
+ String [] str = value.split(":");
+ return new Data(str[0], str[1], str[2], str[3],
+ Integer.parseInt(str[4]), Integer.parseInt(str[5]), Integer.parseInt(str[6]), Integer.parseInt(str[7]),
+ Boolean.parseBoolean(str[8]), Boolean.parseBoolean(str[9]), Boolean.parseBoolean(str[10]), Boolean.parseBoolean(str[11]));
+ }
+
+ public String getAsString(FacesContext context, UIComponent component,
+ Object value) {
+ if (value instanceof Data) {
+ Data data = (Data) value;
+ return data.toString();
+ } if (value instanceof TreeNode) {
+ TreeNode treeNode = (TreeNode) value;
+ return treeNode.toString();
+ } else throw new ConverterException("is not a class util.data.Data");
+ }
+
+}
16 years, 9 months
JBoss Rich Faces SVN: r7111 - trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-03-24 10:34:55 -0400 (Mon, 24 Mar 2008)
New Revision: 7111
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js
Log:
http://jira.jboss.com/jira/browse/RF-2653
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js 2008-03-24 14:07:48 UTC (rev 7110)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js 2008-03-24 14:34:55 UTC (rev 7111)
@@ -203,6 +203,7 @@
self.spinCfg._repeat = window.setInterval(adjust, self.spinCfg.interval);
}, self.spinCfg.delay);
self.spinCfg._repeater = true;
+ return false;
})
.mouseup(function(e){
@@ -243,6 +244,7 @@
self.spinCfg._repeat = window.setInterval(adjust, self.spinCfg.interval);
}, self.spinCfg.delay);
self.spinCfg._repeater = true;
+ return false;
})
.mouseup(function(e){
16 years, 9 months
JBoss Rich Faces SVN: r7110 - Reports/3.2.0 and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: tkuprevich
Date: 2008-03-24 10:07:48 -0400 (Mon, 24 Mar 2008)
New Revision: 7110
Added:
trunk/test-applications/qa/Test Reports/3.2.0/DailyReport320CR421032008vvolkov.xls
trunk/test-applications/qa/Test Reports/3.2.0/DailyReport320CR522032008vvolkov.xls
Log:
Added: trunk/test-applications/qa/Test Reports/3.2.0/DailyReport320CR421032008vvolkov.xls
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/qa/Test Reports/3.2.0/DailyReport320CR421032008vvolkov.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/test-applications/qa/Test Reports/3.2.0/DailyReport320CR522032008vvolkov.xls
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/qa/Test Reports/3.2.0/DailyReport320CR522032008vvolkov.xls
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 9 months
JBoss Rich Faces SVN: r7109 - in trunk/samples/richfaces-demo/src/main/webapp/richfaces: sortingFeature and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: ilya_shaikovsky
Date: 2008-03-24 09:21:20 -0400 (Mon, 24 Mar 2008)
New Revision: 7109
Modified:
trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/externalSortingUsage.xhtml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/sortingUsage.xhtml
Log:
sorting feature descriptions added
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml 2008-03-24 13:12:40 UTC (rev 7108)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/filteringFeature.xhtml 2008-03-24 13:21:20 UTC (rev 7109)
@@ -5,7 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:rich="http://richfaces.org/rich">
<ui:composition template="/templates/main.xhtml">
- <ui:define name="title">RichFaces - Open Source Rich JSF Components - Filtering Feature</ui:define>
+ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Table Filtering Feature</ui:define>
<ui:define name="body">
<rich:tabPanel switchType="server" value="#{componentNavigator.activeTab}" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Built-In Filtering Usage">
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml 2008-03-24 13:12:40 UTC (rev 7108)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml 2008-03-24 13:21:20 UTC (rev 7109)
@@ -10,28 +10,32 @@
}
</style>
<h:form>
- <rich:dataTable value="#{capitalsBean.capitals}" var="cap" width="300px" columnClasses="center">
+ <rich:dataTable value="#{capitalsBean.capitals}" var="cap" width="300px" columnClasses="center"
+ rows="15">
<f:facet name="header">
<h:outputText value="Sorting Example"/>
</f:facet>
- <rich:column>
- <f:facet name="header">
- <h:outputText value="State Flag"></h:outputText>
- </f:facet>
- <h:graphicImage value="#{cap.stateFlag}"/>
- </rich:column>
<rich:column sortBy="#{cap.state}">
<f:facet name="header">
- <h:outputText value="State Name"></h:outputText>
+ <h:outputText value="State Name"/>
</f:facet>
- <h:outputText value="#{cap.state}"></h:outputText>
+ <h:outputText value="#{cap.state}"/>
</rich:column>
<rich:column sortBy="#{cap.name}">
<f:facet name="header">
- <h:outputText value="State Capital"></h:outputText>
+ <h:outputText value="State Capital"/>
</f:facet>
<h:outputText value="#{cap.name}"/>
</rich:column>
+ <rich:column>
+ <f:facet name="header">
+ <h:outputText value="Time Zone"/>
+ </f:facet>
+ <h:outputText value="#{cap.timeZone}"/>
+ </rich:column>
+ <f:facet name="footer">
+ <rich:datascroller/>
+ </f:facet>
</rich:dataTable>
</h:form>
</ui:composition>
\ No newline at end of file
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/externalSortingUsage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/externalSortingUsage.xhtml 2008-03-24 13:12:40 UTC (rev 7108)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/externalSortingUsage.xhtml 2008-03-24 13:21:20 UTC (rev 7109)
@@ -8,21 +8,35 @@
<ui:define name="sample">
<p>
- SHORT DESCRIPTION
+ In order to customize built-in sorting you just need:
</p>
-
+ <ul>
+ <li>
+ Turn <b>selfSorted</b> on the columns to "false"
+ </li>
+ <li>
+ Bind <b>sortOrder</b> attributes on the columns to the bean properties.
+ </li>
+ <li>
+ Manage the bindings with values from <i>org.richfaces.model.Ordering</i> enum.
+ </li>
+ <li>
+ If the sorting is multiple - fill the <b>sortPriorities</b> list with column ids
+ in the order the columns should be sorted.
+ </li>
+ </ul>
+ <p>
+ Try next example. Just change sorting order on the table through
+ attributes and it automatically resort its content. In order to perform sorting
+ just choose the sorting properties, sorting direction and press sort button:
+ </p>
<div class="sample-container" >
- <ui:include src="/richfaces/sortingFeatures/examples/externalMultipleSorting.xhtml"/>
+ <ui:include src="/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml"/>
<ui:include src="/templates/include/sourceview.xhtml">
<ui:param name="sourcepath" value="/richfaces/sortingFeature/examples/externalMultipleSorting.xhtml"/>
</ui:include>
</div>
-
- <p>
- DESCRIPTION
- </p>
-
</ui:define>
</ui:composition>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/sortingUsage.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/sortingUsage.xhtml 2008-03-24 13:12:40 UTC (rev 7108)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature/sortingUsage.xhtml 2008-03-24 13:21:20 UTC (rev 7109)
@@ -7,21 +7,51 @@
<ui:composition template="/templates/component-sample.xhtml">
<ui:define name="sample">
+ <p><b>
+ Rich Data Table</b> has columns <b>sorting feature</b> built-in. Simplest way to add sorting
+ capability is to define <b>sortBy </b>attribute at column you need to be sorted.
+ </p>
<p>
- SHORT DESCRIPTION
+ In this attribute you should define iterable object property which should be
+ used when sorting performed.
</p>
-
- <div class="sample-container" >
-
- <ui:include src="/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml"/>
- <ui:include src="/templates/include/sourceview.xhtml">
- <ui:param name="sourcepath" value="/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml"/>
- </ui:include>
- </div>
-
<p>
- DESCRIPTION
+ In this example you could see that two first columns sorted after corresponding
+ header click.
</p>
+ <h:panelGrid columns="2">
+ <div class="sample-container" jsfc="h:panelGroup" layout="block">
+ <ui:include src="/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml"/>
+ <ui:include src="/templates/include/sourceview.xhtml">
+ <ui:param name="sourcepath" value="/richfaces/sortingFeature/examples/simpleSingleSorting.xhtml"/>
+ </ui:include>
+ </div>
+ <div jsfc="h:panelGroup" layout="block">
+ <p>
+ Next attributes could be defined to manage simple built-in sorting:
+ </p>
+ <ul>
+ <li>
+ <b>sortMode</b> - attribute of <b>rich:dataTable</b> which could be defined as
+ "single"(Default) and "multiple". If multiple sorting defined -
+ previous sorting will not be reseted. Column will be sorted
+ </li>
+ <li><b>sortOrder</b> - attribute of <b>rich:column</b>
+ allows to set initial sorting on the column.
+ (Additional ways of usage to customize sorting described at "External
+ Sorting" tab). Possible values are "ASCENDING", "DESCENDING" and
+ "UNSORTED"(default)
+ </li>
+ <li>
+ <b>selfSorted</b> attribute of <b>brich:column</b> which defines
+ if the table will make header clickable and if click on the
+ header will call sorting request.
+ Default value is "true". In order to use custom sorting mechanism
+ use value "false" for this attribute.
+ </li>
+ </ul>
+ </div>
+ </h:panelGrid>
</ui:define>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.xhtml 2008-03-24 13:12:40 UTC (rev 7108)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/sortingFeature.xhtml 2008-03-24 13:21:20 UTC (rev 7109)
@@ -5,7 +5,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:rich="http://richfaces.org/rich">
<ui:composition template="/templates/main.xhtml">
- <ui:define name="title">RichFaces - Open Source Rich JSF Components - Sorting and Filtering Features</ui:define>
+ <ui:define name="title">RichFaces - Open Source Rich JSF Components - Table Sorting Feature</ui:define>
<ui:define name="body">
<rich:tabPanel switchType="server" styleClass="top_tab" contentClass="content_tab" headerClass="header_tabs_class" inactiveTabClass="inactive_tab" activeTabClass="active_tab">
<rich:tab label="Built-in Sorting Feature">
16 years, 9 months