JBoss Rich Faces SVN: r8648 - in trunk/docs/userguide/en/src/main: resources/images and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: atsebro
Date: 2008-05-20 05:09:37 -0400 (Tue, 20 May 2008)
New Revision: 8648
Added:
trunk/docs/userguide/en/src/main/resources/images/separator_pc.png
Modified:
trunk/docs/userguide/en/src/main/docbook/included/separator.xml
Log:
RF-2905--Screenshots names
Modified: trunk/docs/userguide/en/src/main/docbook/included/separator.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/separator.xml 2008-05-20 09:07:38 UTC (rev 8647)
+++ trunk/docs/userguide/en/src/main/docbook/included/separator.xml 2008-05-20 09:09:37 UTC (rev 8648)
@@ -168,7 +168,7 @@
<title>Redefinition styles with predefined classes</title>
<mediaobject>
<imageobject>
- <imagedata fileref="images/separatorClass.png"/>
+ <imagedata fileref="images/separator_pc.png"/>
</imageobject>
</mediaobject>
</figure>
Added: trunk/docs/userguide/en/src/main/resources/images/separator_pc.png
===================================================================
(Binary files differ)
Property changes on: trunk/docs/userguide/en/src/main/resources/images/separator_pc.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
16 years, 7 months
JBoss Rich Faces SVN: r8647 - in trunk/test-applications/seleniumTest/src/main: java/org/ajax4jsf/model and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-05-20 05:07:38 -0400 (Tue, 20 May 2008)
New Revision: 8647
Added:
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/DataTableBean.java
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/model/
trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/model/Column.java
trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/
trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml
Modified:
trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
Log:
dataTable test
Added: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/DataTableBean.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/DataTableBean.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/DataTableBean.java 2008-05-20 09:07:38 UTC (rev 8647)
@@ -0,0 +1,127 @@
+package org.ajax4jsf;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.faces.event.ActionEvent;
+
+import org.ajax4jsf.model.Column;
+import org.richfaces.model.Ordering;
+
+@SuppressWarnings("unchecked")
+public class DataTableBean {
+
+ private int rows = 20;
+
+ private int column = 1;
+
+ private List model;
+
+ private List columns;
+
+ private Ordering ordering;
+
+ public DataTableBean() {
+ init();
+ }
+
+ public void init(ActionEvent event) {
+ init();
+ }
+
+ public String getDate() {
+ return new Date().toLocaleString();
+ }
+
+ private void init() {
+ model = new ArrayList();
+ for (int i = 0; i < rows; i++) {
+ String [] m = new String[column];
+ for (int j = 0; j < column; j++) {
+ m[j] = String.valueOf(i + j);
+ }
+ model.add(m);
+ }
+
+ columns = new ArrayList();
+ for (int i = 0; i < column; i++) {
+ columns.add(new Column("Header_" + i,"Footer_" + i));
+ }
+ }
+
+ /**
+ * @return the columns
+ */
+ public int getColumn() {
+ return column;
+ }
+
+ /**
+ * @param columns
+ * the columns to set
+ */
+ public void setColumn(int column) {
+ this.column = column;
+ }
+
+ /**
+ * @return the rows
+ */
+ public int getRows() {
+ return rows;
+ }
+
+ /**
+ * @param rows
+ * the rows to set
+ */
+ public void setRows(int rows) {
+ this.rows = rows;
+ }
+
+ /**
+ * @return the model
+ */
+ public List getModel() {
+ return model;
+ }
+
+ /**
+ * @param model
+ * the model to set
+ */
+ public void setModel(List model) {
+ this.model = model;
+ }
+
+ /**
+ * @return the columns
+ */
+ public List getColumns() {
+ return columns;
+ }
+
+ /**
+ * @param columns
+ * the columns to set
+ */
+ public void setColumns(List columns) {
+ this.columns = columns;
+ }
+
+ /**
+ * @return the ordering
+ */
+ public Ordering getOrdering() {
+ return ordering;
+ }
+
+ /**
+ * @param ordering the ordering to set
+ */
+ public void setOrdering(Ordering ordering) {
+ this.ordering = ordering;
+ }
+
+}
Added: trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/model/Column.java
===================================================================
--- trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/model/Column.java (rev 0)
+++ trunk/test-applications/seleniumTest/src/main/java/org/ajax4jsf/model/Column.java 2008-05-20 09:07:38 UTC (rev 8647)
@@ -0,0 +1,68 @@
+package org.ajax4jsf.model;
+
+import org.richfaces.model.Ordering;
+
+public class Column {
+
+ private String header;
+
+ private String footer;
+
+ private Ordering ordering;
+
+
+ /**
+ * @param header
+ * @param footer
+ */
+ public Column(String header, String footer) {
+ super();
+ this.header = header;
+ this.footer = footer;
+ }
+
+ /**
+ * @return the header
+ */
+ public String getHeader() {
+ return header;
+ }
+
+ /**
+ * @param header the header to set
+ */
+ public void setHeader(String header) {
+ this.header = header;
+ }
+
+ /**
+ * @return the footer
+ */
+ public String getFooter() {
+ return footer;
+ }
+
+ /**
+ * @param footer the footer to set
+ */
+ public void setFooter(String footer) {
+ this.footer = footer;
+ }
+
+ /**
+ * @return the ordering
+ */
+ public Ordering getOrdering() {
+ return ordering;
+ }
+
+ /**
+ * @param ordering the ordering to set
+ */
+ public void setOrdering(Ordering ordering) {
+ this.ordering = ordering;
+ }
+
+
+
+}
Modified: trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-05-20 08:16:28 UTC (rev 8646)
+++ trunk/test-applications/seleniumTest/src/main/webapp/WEB-INF/faces-config.xml 2008-05-20 09:07:38 UTC (rev 8647)
@@ -101,5 +101,10 @@
<managed-bean-name>orderingListBean</managed-bean-name>
<managed-bean-class>org.ajax4jsf.OrderingListTestBean</managed-bean-class>
<managed-bean-scope>session</managed-bean-scope>
+ </managed-bean>
+ <managed-bean>
+ <managed-bean-name>dataTableBean</managed-bean-name>
+ <managed-bean-class>org.ajax4jsf.DataTableBean</managed-bean-class>
+ <managed-bean-scope>session</managed-bean-scope>
</managed-bean>
</faces-config>
\ No newline at end of file
Added: trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml (rev 0)
+++ trunk/test-applications/seleniumTest/src/main/webapp/pages/dataTable/dataTableTest.xhtml 2008-05-20 09:07:38 UTC (rev 8647)
@@ -0,0 +1,35 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<ui:composition template="#{templateBean.template}">
+ <ui:define name="component">
+ <h:form id="_controls">
+ <a4j:commandLink value="Rerender" id="apply2" reRender="table1, date"></a4j:commandLink>
+ </h:form>
+ <h:form id="_form">
+ <h:outputText id="date" value="#{dataTableBean.date}"></h:outputText>
+
+ <rich:dataTable value="#{dataTableBean.model}" id="table1" var="var">
+ <rich:column sortBy="#{var[0]}" sortOrder="#{dataTableBean.ordering}">
+ <f:facet name="header">
+ <h:outputText value="header"></h:outputText>
+ </f:facet>
+ <f:facet name="footer">
+ <h:outputText value="footer"></h:outputText>
+ </f:facet>
+ <h:inputText value="#{var[0]}"></h:inputText>
+ <h:outputText value="#{var[0]}"></h:outputText>
+ </rich:column>
+ </rich:dataTable>
+ <br/>
+
+ </h:form>
+
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
16 years, 7 months
JBoss Rich Faces SVN: r8646 - trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-05-20 04:16:28 -0400 (Tue, 20 May 2008)
New Revision: 8646
Modified:
trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js
Log:
RF-3467
Modified: trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js
===================================================================
--- trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js 2008-05-20 08:07:14 UTC (rev 8645)
+++ trunk/ui/progressBAR/src/main/resources/org/richfaces/renderkit/html/js/progressBar.js 2008-05-20 08:16:28 UTC (rev 8646)
@@ -193,7 +193,7 @@
if (!this.isAjaxMode()) {
this.switchState("progressState");
this.setValue(this.getMinValue() + 1);
- }else {
+ }else if (!(this.value > this.getMaxValue())) {
this.disable();
this.poll();
}
16 years, 7 months
JBoss Rich Faces SVN: r8645 - trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2008-05-20 04:07:14 -0400 (Tue, 20 May 2008)
New Revision: 8645
Modified:
trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
Log:
RF-3438
Modified: trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js
===================================================================
--- trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-05-19 20:45:33 UTC (rev 8644)
+++ trunk/ui/fileUpload/src/main/resources/org/richfaces/renderkit/html/js/FileUpload.js 2008-05-20 08:07:14 UTC (rev 8645)
@@ -275,7 +275,7 @@
LoadWatcher = Class.create();
Object.extend(LoadWatcher.prototype, {
initialize: function(iframe, callback, viewStateUpdater) {
- this.iframe = $(iframe.id);
+ this.iframe = iframe;
this.callback = callback;
this.viewStateUpdater = viewStateUpdater;
@@ -495,14 +495,13 @@
},
createFrame: function () {
+ if (this.iframe) return;
var div = document.createElement("div");
div.style.display = 'none';
var child = "<iframe name='"+this.id+"_iframe' id='"+this.id+"_iframe'></iframe>";
div.innerHTML = child;
document.body.appendChild(div);
- var iframe = $(this.id + "_iframe");
- this.iframe = iframe;
- return iframe;
+ this.iframe = $(this.id + "_iframe");
},
checkFrame: function () {
@@ -513,13 +512,19 @@
},
deleteFrame: function() {
- if (this.iframe) {
- this.iframe.src = "about:blank";
- document.body.removeChild(this.iframe.parentNode);
- }
+ this.resetFrame();
+ if (this.iframe) {
+ document.body.removeChild(this.iframe.parentNode);
+ }
this.iframe = null;
},
+ resetFrame: function () {
+ if (this.iframe) {
+ this.iframe.src = "about:blank";
+ }
+ },
+
initEvents : function() {
for (var e in this.events) {
if (e && this.events[e]) {
@@ -564,7 +569,6 @@
this.watcher.stop();
this.watcher.onerror();
this.watcher = null;
- //alert('error: ' + e);
}
},
@@ -609,6 +613,7 @@
}
return;
}
+ this.createFrame();
var newEntry = new FileUploadEntry(elt, this);
this.entries.push(newEntry);
@@ -856,7 +861,7 @@
this.clear(this.activeEntry);
}
this.activeEntry = null;
- this.deleteFrame();
+ this.resetFrame();
},
updateViewState: function (state) {
@@ -1006,8 +1011,7 @@
}
if (!parentForm.onsubmit || parentForm.onsubmit()) {
- var iframe = this.createFrame();
- this.watcher = new LoadWatcher(iframe, function(newState) {
+ this.watcher = new LoadWatcher(this.iframe, function(newState) {
this.finishProgressBar();
this.setState(newState);
}.bind(entry),
16 years, 7 months
JBoss Rich Faces SVN: r8644 - in trunk: framework/impl/src/main/java/org/ajax4jsf/context and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2008-05-19 16:45:33 -0400 (Mon, 19 May 2008)
New Revision: 8644
Added:
trunk/cdk/maven-archetype-skin-addon/
Modified:
trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
trunk/ui/combobox/src/main/templates/combobox.jspx
Log:
Start progress on http://jira.jboss.com/jira/browse/RF-3273
Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java
===================================================================
--- trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-05-19 19:21:06 UTC (rev 8643)
+++ trunk/framework/impl/src/main/java/org/ajax4jsf/context/AjaxContextImpl.java 2008-05-19 20:45:33 UTC (rev 8644)
@@ -314,24 +314,30 @@
} else if (InternetResourceBuilder.LOAD_ALL
.equals(scriptStrategy)) {
viewResources.setProcessScripts(false);
- try {
- viewResources
- .addScript(internetResourceBuilder
- .createResource(
- this,
- InternetResourceBuilder.COMMON_FRAMEWORK_SCRIPT)
- .getUri(context, null));
- viewResources
- .addScript(internetResourceBuilder
- .createResource(
- this,
- InternetResourceBuilder.COMMON_UI_SCRIPT)
- .getUri(context, null));
+ // For an "ALL" strategy, it is not necessary to load scripts in the ajax request
+ if (!this.isAjaxRequest(context)) {
+ try {
+ viewResources
+ .addScript(internetResourceBuilder
+ .createResource(
+ this,
+ InternetResourceBuilder.COMMON_FRAMEWORK_SCRIPT)
+ .getUri(context, null));
+ viewResources
+ .addScript(internetResourceBuilder
+ .createResource(
+ this,
+ InternetResourceBuilder.COMMON_UI_SCRIPT)
+ .getUri(context, null));
- } catch (ResourceNotFoundException e) {
- if(log.isWarnEnabled()){
- log.warn("No aggregated javaScript library found "+e.getMessage());
+ } catch (ResourceNotFoundException e) {
+ if (log.isWarnEnabled()) {
+ log
+ .warn("No aggregated javaScript library found "
+ + e.getMessage());
+ }
}
+
}
}
}
@@ -360,39 +366,43 @@
} else if (InternetResourceBuilder.LOAD_ALL
.equals(styleStrategy)) {
viewResources.setProcessStyles(false);
-
- String commonStyle = InternetResourceBuilder.COMMON_STYLE_PREFIX;
-
- if (useStdControlsSkinning || useStdControlsSkinningClasses) {
- if (useExtendedSkinning) {
- commonStyle += "-ext";
- } else {
- commonStyle += "-bas";
+ // For an "ALL" strategy, it is not necessary to load styles
+ // in the ajax request
+ if (!this.isAjaxRequest(context)) {
+ String commonStyle = InternetResourceBuilder.COMMON_STYLE_PREFIX;
+
+ if (useStdControlsSkinning
+ || useStdControlsSkinningClasses) {
+ if (useExtendedSkinning) {
+ commonStyle += "-ext";
+ } else {
+ commonStyle += "-bas";
+ }
+
+ if (useStdControlsSkinning
+ && useStdControlsSkinningClasses) {
+ commonStyle += "-both";
+ } else if (useStdControlsSkinning) {
+ commonStyle += "-styles";
+ } else if (useStdControlsSkinningClasses) {
+ commonStyle += "-classes";
+ }
}
- if (useStdControlsSkinning && useStdControlsSkinningClasses) {
- commonStyle += "-both";
- } else if (useStdControlsSkinning) {
- commonStyle += "-styles";
- } else if (useStdControlsSkinningClasses) {
- commonStyle += "-classes";
+ commonStyle += InternetResourceBuilder.COMMON_STYLE_EXTENSION;
+
+ try {
+ viewResources.addStyle(internetResourceBuilder
+ .createResource(this, commonStyle).getUri(
+ context, null));
+
+ } catch (ResourceNotFoundException e) {
+ if (log.isWarnEnabled()) {
+ log.warn("No aggregated stylesheet found "
+ + e.getMessage());
+ }
}
- }
-
- commonStyle += InternetResourceBuilder.COMMON_STYLE_EXTENSION;
-
- try {
- viewResources
- .addStyle(internetResourceBuilder
- .createResource(
- this,
- commonStyle)
- .getUri(context, null));
- } catch (ResourceNotFoundException e) {
- if(log.isWarnEnabled()){
- log.warn("No aggregated stylesheet found "+e.getMessage());
- }
}
} else {
if (useStdControlsSkinning) {
Modified: trunk/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/ui/combobox/src/main/templates/combobox.jspx 2008-05-19 19:21:06 UTC (rev 8643)
+++ trunk/ui/combobox/src/main/templates/combobox.jspx 2008-05-19 20:45:33 UTC (rev 8644)
@@ -213,7 +213,7 @@
class="#{valueStyle} rich-combobox-input-inactive #{inputInactiveClass}" type="text"
readonly="#{enableManualInput}"
value="#{value}"
- onblur="#{component.attributes['onblur']}"
+ x:onblur="#{component.attributes['onblur']}"
style="width:#{correction}; #{inputInactiveStyle}"
autocomplete="off"
tabindex="#{component.attributes['tabindex']}"
16 years, 7 months
JBoss Rich Faces SVN: r8643 - trunk/test-applications/jsp/src/main/webapp/Combobox.
by richfaces-svn-commits＠lists.jboss.org
Author: gmaksimenko
Date: 2008-05-19 15:21:06 -0400 (Mon, 19 May 2008)
New Revision: 8643
Modified:
trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp
Log:
Add Test for reRender
Modified: trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp 2008-05-19 19:21:01 UTC (rev 8642)
+++ trunk/test-applications/jsp/src/main/webapp/Combobox/Combobox.jsp 2008-05-19 19:21:06 UTC (rev 8643)
@@ -48,6 +48,8 @@
binding="#{combobox.myComboBox}"
align="#{combobox.align}">
<f:selectItem itemValue="GoshaGoshaGoshaGoshaGosha"/>
- </rich:comboBox>
+ </rich:comboBox>
+ <a4j:commandButton value="reRender" reRender="comboboxID"></a4j:commandButton>
+
</f:subview>
\ No newline at end of file
16 years, 7 months
JBoss Rich Faces SVN: r8642 - trunk/test-applications/facelets/src/main/webapp/Combobox.
by richfaces-svn-commits＠lists.jboss.org
Author: gmaksimenko
Date: 2008-05-19 15:21:01 -0400 (Mon, 19 May 2008)
New Revision: 8642
Modified:
trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml
Log:
Add Test for reRender
Modified: trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml
===================================================================
--- trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml 2008-05-19 18:29:43 UTC (rev 8641)
+++ trunk/test-applications/facelets/src/main/webapp/Combobox/Combobox.xhtml 2008-05-19 19:21:01 UTC (rev 8642)
@@ -43,8 +43,11 @@
onmouseup="#{event.onmouseup}"
onselect="#{event.onselect}"
binding="#{combobox.myComboBox}"
- align="#{combobox.align}">
+ align="#{combobox.align}"
+ buttonIconDisabled="/pics/ajax_process.gif">
<f:selectItem itemValue="GoshaGoshaGoshaGoshaGosha"/>
</rich:comboBox>
+ <a4j:commandButton value="reRender" reRender="comboboxID"></a4j:commandButton>
+
</f:subview>
16 years, 7 months
JBoss Rich Faces SVN: r8641 - trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2008-05-19 14:29:43 -0400 (Mon, 19 May 2008)
New Revision: 8641
Modified:
trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib/SimpleTogglePanelTagBase.java
Log:
http://jira.jboss.com/jira/browse/RF-3436
Modified: trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib/SimpleTogglePanelTagBase.java
===================================================================
--- trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib/SimpleTogglePanelTagBase.java 2008-05-19 17:52:56 UTC (rev 8640)
+++ trunk/ui/simpleTogglePanel/src/main/java/org/richfaces/taglib/SimpleTogglePanelTagBase.java 2008-05-19 18:29:43 UTC (rev 8641)
@@ -70,7 +70,7 @@
throw new FacesException(e);
}
} else {
- component.setValueExpression("opened", _value);
+ component.setValueExpression("value", _value);
}
}
}
16 years, 7 months
JBoss Rich Faces SVN: r8640 - in trunk/test-applications/jsp/src/main: webapp/InplaceInput and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: gmaksimenko
Date: 2008-05-19 13:52:56 -0400 (Mon, 19 May 2008)
New Revision: 8640
Modified:
trunk/test-applications/jsp/src/main/java/custom/Custom.java
trunk/test-applications/jsp/src/main/java/custom/CustomList.java
trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp
Log:
Add test for using InplaceInput in dataTable.
Modified: trunk/test-applications/jsp/src/main/java/custom/Custom.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/custom/Custom.java 2008-05-19 17:31:51 UTC (rev 8639)
+++ trunk/test-applications/jsp/src/main/java/custom/Custom.java 2008-05-19 17:52:56 UTC (rev 8640)
@@ -39,6 +39,19 @@
this.i2 = 2;
}
+ public Custom(String s0, int i0) {
+ this.s0 = s0;
+ this.i0 = i0;
+ this.index = index;
+ this.b0 = true;
+ this.b1 = true;
+ this.b2 = true;
+ this.s1 = "s1";
+ this.s2 = "s2";
+ this.i1 = 1;
+ this.i2 = 2;
+ }
+
public Custom(int index, boolean b0, boolean b1, boolean b2, String s0, String s1,
String s2, int i0, int i1, int i2) {
this.index = index;
Modified: trunk/test-applications/jsp/src/main/java/custom/CustomList.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/custom/CustomList.java 2008-05-19 17:31:51 UTC (rev 8639)
+++ trunk/test-applications/jsp/src/main/java/custom/CustomList.java 2008-05-19 17:52:56 UTC (rev 8640)
@@ -2,9 +2,13 @@
import java.util.ArrayList;
+import javax.faces.event.ActionEvent;
+
public class CustomList {
private ArrayList<Custom> customList;
+ private ArrayList<Custom> carsList;
private int listSize;
+ private int carsSize;
public CustomList() {
listSize = 12;
@@ -15,6 +19,18 @@
}
}
+ public void cars(ActionEvent e) {
+ carsList = new ArrayList<Custom>();
+ carsSize = 5;
+
+ carsList.add(new Custom("Ford Fiesta",0));
+ carsList.add(new Custom("Ford Mustang",0));
+ carsList.add(new Custom("Ford Ka",0));
+ carsList.add(new Custom("Ford Mondeo",0));
+ carsList.add(new Custom("Ford Focus",0));
+
+ }
+
public void resizeList(int elements){
customList.clear();
for(int i = 0; i < elements; i++){
@@ -37,5 +53,21 @@
public void setCustomList(ArrayList<Custom> testList) {
this.customList = testList;
}
+
+ public ArrayList<Custom> getCarsList() {
+ return carsList;
+ }
+
+ public void setCarsList(ArrayList<Custom> carsList) {
+ this.carsList = carsList;
+ }
+
+ public int getCarsSize() {
+ return carsSize;
+ }
+
+ public void setCarsSize(int carsSize) {
+ this.carsSize = carsSize;
+ }
}
Modified: trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-05-19 17:31:51 UTC (rev 8639)
+++ trunk/test-applications/jsp/src/main/webapp/InplaceInput/InplaceInput.jsp 2008-05-19 17:52:56 UTC (rev 8640)
@@ -3,6 +3,41 @@
<%@ taglib uri="http://richfaces.org/a4j" prefix="a4j"%>
<%@ taglib uri="http://richfaces.org/rich" prefix="rich"%>
+<f:subview id="inplaceInputSubviewTableID">
+
+ <a4j:commandButton actionListener="#{customList.cars}" value = "Click" reRender="dataTableID"></a4j:commandButton>
+
+ <rich:dataTable id = "dataTableID" cellpadding="0" cellspacing="0" value="#{customList.carsList}"
+ width="300" border="0" var="record">
+
+ <f:facet name="header">
+ <rich:columnGroup>
+ <rich:column>
+ <h:outputText value="Cars" />
+ </rich:column>
+ <rich:column>
+ <h:outputText value="Price" />
+ </rich:column>
+ </rich:columnGroup>
+ </f:facet>
+
+ <rich:subTable
+ var="expense" value="">
+ <rich:column>
+ <h:outputText value="#{record.s0}"></h:outputText>
+ <f:facet name="footer">
+ <rich:spacer />
+ </f:facet>
+ </rich:column>
+ <rich:column>
+ <rich:inplaceInput defaultLabel="#{record.i0}">$
+ </rich:inplaceInput>
+ </rich:column>
+ </rich:subTable>
+
+ </rich:dataTable>
+</f:subview>
+<br />
<f:subview id="inplaceInputSubviewID">
<h:inputText value="For verify tabbing tabindex=3" size="25" tabindex="3"></h:inputText> <br/>
16 years, 7 months
JBoss Rich Faces SVN: r8639 - in trunk/test-applications/jsp/src/main: webapp/Columns and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: mvitenkov
Date: 2008-05-19 13:31:51 -0400 (Mon, 19 May 2008)
New Revision: 8639
Modified:
trunk/test-applications/jsp/src/main/java/columns/Columns.java
trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp
Log:
Filtering feature was added.
Modified: trunk/test-applications/jsp/src/main/java/columns/Columns.java
===================================================================
--- trunk/test-applications/jsp/src/main/java/columns/Columns.java 2008-05-19 16:56:44 UTC (rev 8638)
+++ trunk/test-applications/jsp/src/main/java/columns/Columns.java 2008-05-19 17:31:51 UTC (rev 8639)
@@ -28,6 +28,24 @@
private boolean breakBefore;
private boolean sortable;
private boolean dataTableRendered;
+ private boolean selfSorted;
+ private String[] filterValue;
+ public String[] getFilterValue() {
+ return filterValue;
+ }
+
+ public void setFilterValue(String[] filterValue) {
+ this.filterValue = filterValue;
+ }
+
+ public boolean isSelfSorted() {
+ return selfSorted;
+ }
+
+ public void setSelfSorted(boolean selfSorted) {
+ this.selfSorted = selfSorted;
+ }
+
public Columns() {
this.columns = "3";
this.begin = "0";
@@ -39,10 +57,12 @@
this.breakBefore = false;
this.sortable = true;
this.dataTableRendered = true;
+ this.selfSorted = true;
this.length1 = 5;
this.length2 = 5;
this.data1 = new ArrayList<Data>();
this.data2 = new ArrayList<Data>();
+ this.filterValue = new String[length2];
for (int i = 0; i < length1; i++) {
data1.add(new Data(i, "data 1 [" + i + "]", "Button " + i, "Link " + i, "select" + (i % 5)));
data2.add(new Data(i, "data 2 [" + i + "]", "Button " + i, "Link " + i, statusIcon[i % 5]));
Modified: trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp
===================================================================
--- trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-05-19 16:56:44 UTC (rev 8638)
+++ trunk/test-applications/jsp/src/main/webapp/Columns/Columns.jsp 2008-05-19 17:31:51 UTC (rev 8639)
@@ -35,7 +35,8 @@
<rich:columns value="#{columns.data2}" var="d2" footerClass="#{style.footerClass}" headerClass="#{style.headerClass}" breakBefore="#{columns.breakBefore}" colspan="#{columns.colspan}"
columns="#{columns.columns}" index="index" rowspan="#{columns.rowspan}"
begin="#{columns.begin}" end="#{columns.end}" width="#{columns.width}" style="#{style.style}" styleClass="#{style.styleClass}"
- comparator="#{columns}" sortBy="#{d2.str0}" selfSorted="true" sortOrder="#{columns.orderings[index]}"dir="LTR">
+ comparator="#{columns}" sortBy="#{d2.str0}" selfSorted="true" sortOrder="#{columns.orderings[index]}" dir="LTR" filterBy="#{d1.str0}"
+ filterValue="#{columns.filterValue[index]}">
<f:facet name="header">
<h:outputText value="header #{d2.int0}"></h:outputText>
</f:facet>
16 years, 7 months