JBoss Rich Faces SVN: r17277 - in root/ui-sandbox/tables/trunk/ui/src/main: resources/META-INF/resources and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2010-05-26 12:24:37 -0400 (Wed, 26 May 2010)
New Revision: 17277
Modified:
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java
root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java
root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/datatable.ecss
Log:
fix subTable column facets encoding, fix dataTable caption encoding
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-05-26 16:24:12 UTC (rev 17276)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/AbstractTableRenderer.java 2010-05-26 16:24:37 UTC (rev 17277)
@@ -46,6 +46,20 @@
protected void doDecode(FacesContext context, UIComponent component) {
decodeSortingFiltering(context, component);
}
+
+ protected class SimpleHeaderEncodeStrategy implements HeaderEncodeStrategy {
+
+ public void encodeBegin(FacesContext context, ResponseWriter writer, UIComponent column, String facetName)
+ throws IOException {
+
+ }
+
+ public void encodeEnd(FacesContext context, ResponseWriter writer, UIComponent column, String facetName)
+ throws IOException {
+ }
+ }
+
+
/**
* Returns true if specified attribute (when present on the column) should generate header even if it is not
* specified on the table
@@ -81,13 +95,19 @@
: getColumnsCount(table.columns());
return count;
}
-
+
+ public void encodeTableStructure(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) throws IOException {
+ //DataTableRenderer override this method
+ }
+
public void encodeTableFacets(ResponseWriter writer, FacesContext context, UIDataTableBase dataTable) throws IOException {
Object key = dataTable.getRowKey();
dataTable.captureOrigValue(context);
dataTable.setRowKey(context, null);
+ encodeTableStructure(writer, context, dataTable);
+
String id = dataTable.getClientId(context);
setupTableStartElement(context, dataTable);
encodeHeaderFacet(writer, context, dataTable, false);
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-05-26 16:24:12 UTC (rev 17276)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/DataTableRenderer.java 2010-05-26 16:24:37 UTC (rev 17277)
@@ -228,19 +228,7 @@
}
}
-
- protected class SimpleHeaderEncodeStrategy implements HeaderEncodeStrategy {
- public void encodeBegin(FacesContext context, ResponseWriter writer, UIComponent column, String facetName)
- throws IOException {
-
- }
-
- public void encodeEnd(FacesContext context, ResponseWriter writer, UIComponent column, String facetName)
- throws IOException {
- }
- }
-
public boolean containsThead() {
return true;
}
Modified: root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-05-26 16:24:12 UTC (rev 17276)
+++ root/ui-sandbox/tables/trunk/ui/src/main/java/org/richfaces/renderkit/SubTableRenderer.java 2010-05-26 16:24:37 UTC (rev 17277)
@@ -159,8 +159,8 @@
}
public HeaderEncodeStrategy getHeaderEncodeStrategy(UIComponent column, String tableFacetName) {
- // TODO: implement column header facet
- return null;
+ //TODO: anton -> use RichHeaderEncodeStrategy for our columns ???
+ return new SimpleHeaderEncodeStrategy();
}
Modified: root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/datatable.ecss
===================================================================
--- root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/datatable.ecss 2010-05-26 16:24:12 UTC (rev 17276)
+++ root/ui-sandbox/tables/trunk/ui/src/main/resources/META-INF/resources/datatable.ecss 2010-05-26 16:24:37 UTC (rev 17277)
@@ -181,6 +181,17 @@
}
.rf-st-sh-c{
+ border-bottom-width:'#{richSkin.tableBorderWidth}';
+ border-bottom-style:solid;
+ border-bottom-color:'#{richSkin.tableBorderColor}';
+ border-right-width:'#{richSkin.tableBorderWidth}';
+ border-right-style:solid;
+ border-right-color:'#{richSkin.tableBorderColor}';
+ background-color:'#{richSkin.tableSubHeaderBackgroundColor}';
+ color:'#{richSkin.generalTextColor}';
+ font-family:'#{richSkin.generalFamilyFont}';
+ font-size:'#{richSkin.generalSizeFont}';
+ padding:4px;
}
.rf-st-sh{
@@ -206,6 +217,17 @@
}
.rf-st-sf-c{
+ border-bottom-width:'#{richSkin.tableBorderWidth}';
+ border-bottom-style:solid;
+ border-bottom-color:'#{richSkin.tableBorderColor}';
+ border-right-width:'#{richSkin.tableBorderWidth}';
+ border-right-style:solid;
+ border-right-color:'#{richSkin.tableBorderColor}';
+ background-color:'#{richSkin.tableSubHeaderBackgroundColor}';
+ color:'#{richSkin.generalTextColor}';
+ font-family:'#{richSkin.generalFamilyFont}';
+ font-size:'#{richSkin.generalSizeFont}';
+ padding:4px;
}
.rf-st-sf{
14 years, 1 month
JBoss Rich Faces SVN: r17276 - in root: build/resources/trunk/checkstyle and 30 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-26 12:24:12 -0400 (Wed, 26 May 2010)
New Revision: 17276
Modified:
root/build/bom/trunk/pom.xml
root/build/resources/trunk/checkstyle/pom.xml
root/cdk/trunk/bom/pom.xml
root/commons/trunk/bom/pom.xml
root/commons/trunk/parent/pom.xml
root/commons/trunk/pom.xml
root/core/trunk/bom/pom.xml
root/core/trunk/parent/pom.xml
root/core/trunk/pom.xml
root/dist/trunk/pom.xml
root/examples-sandbox/trunk/pom.xml
root/examples/pom.xml
root/ui-sandbox/componentcontrol/trunk/bom/pom.xml
root/ui-sandbox/componentcontrol/trunk/parent/pom.xml
root/ui-sandbox/componentcontrol/trunk/pom.xml
root/ui-sandbox/datascroller/trunk/bom/pom.xml
root/ui-sandbox/datascroller/trunk/parent/pom.xml
root/ui-sandbox/datascroller/trunk/pom.xml
root/ui-sandbox/pom.xml
root/ui-sandbox/tables/trunk/bom/pom.xml
root/ui-sandbox/tables/trunk/parent/pom.xml
root/ui-sandbox/tables/trunk/pom.xml
root/ui/core/trunk/bom/pom.xml
root/ui/core/trunk/parent/pom.xml
root/ui/core/trunk/pom.xml
root/ui/dist/trunk/pom.xml
root/ui/dist/trunk/richfaces-components-api/pom.xml
root/ui/dist/trunk/richfaces-components-impl/pom.xml
root/ui/dist/trunk/richfaces-components-ui/pom.xml
root/ui/misc/trunk/bom/pom.xml
root/ui/misc/trunk/parent/pom.xml
root/ui/misc/trunk/pom.xml
Log:
Updated to richfaces-parent version 5
Modified: root/build/bom/trunk/pom.xml
===================================================================
--- root/build/bom/trunk/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/build/bom/trunk/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<description>
Modified: root/build/resources/trunk/checkstyle/pom.xml
===================================================================
--- root/build/resources/trunk/checkstyle/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/build/resources/trunk/checkstyle/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces</groupId>
Modified: root/cdk/trunk/bom/pom.xml
===================================================================
--- root/cdk/trunk/bom/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/cdk/trunk/bom/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/commons/trunk/bom/pom.xml
===================================================================
--- root/commons/trunk/bom/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/commons/trunk/bom/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<description>
Modified: root/commons/trunk/parent/pom.xml
===================================================================
--- root/commons/trunk/parent/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/commons/trunk/parent/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<description>
Modified: root/commons/trunk/pom.xml
===================================================================
--- root/commons/trunk/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/commons/trunk/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.commons</groupId>
Modified: root/core/trunk/bom/pom.xml
===================================================================
--- root/core/trunk/bom/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/core/trunk/bom/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<description>
Modified: root/core/trunk/parent/pom.xml
===================================================================
--- root/core/trunk/parent/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/core/trunk/parent/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<description>
Modified: root/core/trunk/pom.xml
===================================================================
--- root/core/trunk/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/core/trunk/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.core</groupId>
Modified: root/dist/trunk/pom.xml
===================================================================
--- root/dist/trunk/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/dist/trunk/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces</groupId>
Modified: root/examples/pom.xml
===================================================================
--- root/examples/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/examples/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.examples</groupId>
Modified: root/examples-sandbox/trunk/pom.xml
===================================================================
--- root/examples-sandbox/trunk/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/examples-sandbox/trunk/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces</groupId>
Modified: root/ui/core/trunk/bom/pom.xml
===================================================================
--- root/ui/core/trunk/bom/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui/core/trunk/bom/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/core/trunk/parent/pom.xml
===================================================================
--- root/ui/core/trunk/parent/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui/core/trunk/parent/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/core/trunk/pom.xml
===================================================================
--- root/ui/core/trunk/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui/core/trunk/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/dist/trunk/pom.xml
===================================================================
--- root/ui/dist/trunk/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui/dist/trunk/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/dist/trunk/richfaces-components-api/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/dist/trunk/richfaces-components-impl/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/dist/trunk/richfaces-components-ui/pom.xml
===================================================================
--- root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/misc/trunk/bom/pom.xml
===================================================================
--- root/ui/misc/trunk/bom/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui/misc/trunk/bom/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/misc/trunk/parent/pom.xml
===================================================================
--- root/ui/misc/trunk/parent/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui/misc/trunk/parent/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/misc/trunk/pom.xml
===================================================================
--- root/ui/misc/trunk/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui/misc/trunk/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui-sandbox/componentcontrol/trunk/bom/pom.xml
===================================================================
--- root/ui-sandbox/componentcontrol/trunk/bom/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui-sandbox/componentcontrol/trunk/bom/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
Modified: root/ui-sandbox/componentcontrol/trunk/parent/pom.xml
===================================================================
--- root/ui-sandbox/componentcontrol/trunk/parent/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui-sandbox/componentcontrol/trunk/parent/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
Modified: root/ui-sandbox/componentcontrol/trunk/pom.xml
===================================================================
--- root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
Modified: root/ui-sandbox/datascroller/trunk/bom/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/bom/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui-sandbox/datascroller/trunk/bom/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
Modified: root/ui-sandbox/datascroller/trunk/parent/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/parent/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui-sandbox/datascroller/trunk/parent/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
Modified: root/ui-sandbox/datascroller/trunk/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
Modified: root/ui-sandbox/pom.xml
===================================================================
--- root/ui-sandbox/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui-sandbox/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
Modified: root/ui-sandbox/tables/trunk/bom/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/bom/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui-sandbox/tables/trunk/bom/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
Modified: root/ui-sandbox/tables/trunk/parent/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/parent/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui-sandbox/tables/trunk/parent/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
Modified: root/ui-sandbox/tables/trunk/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/pom.xml 2010-05-26 16:17:00 UTC (rev 17275)
+++ root/ui-sandbox/tables/trunk/pom.xml 2010-05-26 16:24:12 UTC (rev 17276)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.richfaces.ui-sandbox</groupId>
14 years, 1 month
JBoss Rich Faces SVN: r17274 - root/build/parent/tags.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-26 12:16:54 -0400 (Wed, 26 May 2010)
New Revision: 17274
Added:
root/build/parent/tags/richfaces-parent-5/
Log:
[maven-scm] copy for tag richfaces-parent-5
Copied: root/build/parent/tags/richfaces-parent-5 (from rev 17273, root/build/parent/trunk)
14 years, 1 month
JBoss Rich Faces SVN: r17272 - root/build/parent/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-26 12:14:19 -0400 (Wed, 26 May 2010)
New Revision: 17272
Modified:
root/build/parent/trunk/pom.xml
Log:
Updated jsf profiles and moved default back to com.sun. jsf impl
Modified: root/build/parent/trunk/pom.xml
===================================================================
--- root/build/parent/trunk/pom.xml 2010-05-26 16:10:05 UTC (rev 17271)
+++ root/build/parent/trunk/pom.xml 2010-05-26 16:14:19 UTC (rev 17272)
@@ -347,32 +347,32 @@
<!--
The following profiles determine the JSF api/impl combinations that
will beused. The detfault profile is "jsf-ri", this can be
- overwritten by setting -Djsf=[myfaces|mix] on the mvn command line
+ overwritten by setting -Djsf_profile=<profile-name> on the mvn command line
-->
<profile>
- <id>jsf-ri</id>
+ <id>jsf_ri</id>
<activation>
<property>
- <name>jsf_profile</name>
- <value>ri_snapshot</value>
+ <name>!jsf_profile</name>
</property>
</activation>
<properties>
<!-- Define jsf 2 api dependency -->
<jsf2.api.groupid>com.sun.faces</jsf2.api.groupid>
<jsf2.api.artifactid>jsf-api</jsf2.api.artifactid>
- <jsf2.api.version>2.0.3-SNAPSHOT</jsf2.api.version>
+ <jsf2.api.version>2.0.2</jsf2.api.version>
<!-- Define jsf 2 impl dependency -->
<jsf2.impl.groupid>com.sun.faces</jsf2.impl.groupid>
<jsf2.impl.artifactid>jsf-impl</jsf2.impl.artifactid>
- <jsf2.impl.version>2.0.3-SNAPSHOT</jsf2.impl.version>
+ <jsf2.impl.version>2.0.2</jsf2.impl.version>
</properties>
</profile>
<profile>
- <id>ri_202</id>
+ <id>jsf_ri_javax</id>
<activation>
<property>
- <name>!jsf_profile</name>
+ <name>jsf_profile</name>
+ <value>jsf_ri_javax</value>
</property>
</activation>
<properties>
@@ -387,6 +387,25 @@
</properties>
</profile>
<profile>
+ <id>jsf_ri_snapshot</id>
+ <activation>
+ <property>
+ <name>jsf_profile</name>
+ <value>jsf_ri_snapshot</value>
+ </property>
+ </activation>
+ <properties>
+ <!-- Define jsf 2 api dependency -->
+ <jsf2.api.groupid>com.sun.faces</jsf2.api.groupid>
+ <jsf2.api.artifactid>jsf-api</jsf2.api.artifactid>
+ <jsf2.api.version>2.0.3-SNAPSHOT</jsf2.api.version>
+ <!-- Define jsf 2 impl dependency -->
+ <jsf2.impl.groupid>com.sun.faces</jsf2.impl.groupid>
+ <jsf2.impl.artifactid>jsf-impl</jsf2.impl.artifactid>
+ <jsf2.impl.version>2.0.3-SNAPSHOT</jsf2.impl.version>
+ </properties>
+ </profile>
+ <profile>
<id>myfaces</id>
<activation>
<property>
@@ -406,22 +425,22 @@
</properties>
</profile>
<profile>
- <id>myfaces-api-ri-impl</id>
+ <id>myfaces_snapshot</id>
<activation>
<property>
<name>jsf_profile</name>
- <value>mix</value>
+ <value>myfaces_snapshot</value>
</property>
</activation>
<properties>
<!-- Define jsf 2 api dependency -->
<jsf2.api.groupid>org.apache.myfaces.core</jsf2.api.groupid>
<jsf2.api.artifactid>myfaces-api</jsf2.api.artifactid>
- <jsf2.api.version>2.0.0</jsf2.api.version>
+ <jsf2.api.version>2.0.1-SNAPSHOT</jsf2.api.version>
<!-- Define jsf 2 impl dependency -->
- <jsf2.impl.groupid>com.sun.faces</jsf2.impl.groupid>
- <jsf2.impl.artifactid>jsf-impl</jsf2.impl.artifactid>
- <jsf2.impl.version>2.0.3-SNAPSHOT</jsf2.impl.version>
+ <jsf2.impl.groupid>org.apache.myfaces.core</jsf2.impl.groupid>
+ <jsf2.impl.artifactid>myfaces-impl</jsf2.impl.artifactid>
+ <jsf2.impl.version>2.0.1-SNAPSHOT</jsf2.impl.version>
</properties>
</profile>
14 years, 1 month
JBoss Rich Faces SVN: r17271 - root/build/resources/trunk.
by richfaces-svn-commits＠lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-26 12:10:05 -0400 (Wed, 26 May 2010)
New Revision: 17271
Modified:
root/build/resources/trunk/clean_install.sh
Log:
Fixed example build
Modified: root/build/resources/trunk/clean_install.sh
===================================================================
--- root/build/resources/trunk/clean_install.sh 2010-05-26 16:06:19 UTC (rev 17270)
+++ root/build/resources/trunk/clean_install.sh 2010-05-26 16:10:05 UTC (rev 17271)
@@ -129,10 +129,13 @@
EXAMPLE_ARCHETYPE_MODULE_ARRAY=(
# For each example
# "examples/<example-name>"
- "examples/core-demo"
- "examples/repeater-demo"
- "examples/richfaces-showcase"
- "examples/dist"
+ "examples"
+
+ # TODO for now these can not be build alone
+ # "examples/core-demo"
+ # "examples/repeater-demo"
+ # "examples/richfaces-showcase"
+ # "examples/dist"
# For each archetype
# "archetype/archetype-name"
14 years, 1 month
JBoss Rich Faces SVN: r17270 - in root: examples/misc-demo/trunk and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-26 12:06:19 -0400 (Wed, 26 May 2010)
New Revision: 17270
Modified:
root/examples-sandbox/trunk/components/tables/pom.xml
root/examples/core-demo/trunk/pom.xml
root/examples/misc-demo/trunk/pom.xml
root/examples/richfaces-showcase/trunk/pom.xml
Log:
JBoss cache replaced with EhCache for demos
Modified: root/examples/core-demo/trunk/pom.xml
===================================================================
--- root/examples/core-demo/trunk/pom.xml 2010-05-26 15:54:58 UTC (rev 17269)
+++ root/examples/core-demo/trunk/pom.xml 2010-05-26 16:06:19 UTC (rev 17270)
@@ -41,8 +41,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: root/examples/misc-demo/trunk/pom.xml
===================================================================
--- root/examples/misc-demo/trunk/pom.xml 2010-05-26 15:54:58 UTC (rev 17269)
+++ root/examples/misc-demo/trunk/pom.xml 2010-05-26 16:06:19 UTC (rev 17270)
@@ -41,8 +41,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: root/examples/richfaces-showcase/trunk/pom.xml
===================================================================
--- root/examples/richfaces-showcase/trunk/pom.xml 2010-05-26 15:54:58 UTC (rev 17269)
+++ root/examples/richfaces-showcase/trunk/pom.xml 2010-05-26 16:06:19 UTC (rev 17270)
@@ -30,8 +30,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Modified: root/examples-sandbox/trunk/components/tables/pom.xml
===================================================================
--- root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-26 15:54:58 UTC (rev 17269)
+++ root/examples-sandbox/trunk/components/tables/pom.xml 2010-05-26 16:06:19 UTC (rev 17270)
@@ -68,8 +68,8 @@
<artifactId>richfaces-core-impl</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.cache</groupId>
- <artifactId>jbosscache-core</artifactId>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
14 years, 1 month
JBoss Rich Faces SVN: r17269 - in root/ui/core/trunk/api/src/main/java/org/ajax4jsf: renderkit and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-26 11:54:58 -0400 (Wed, 26 May 2010)
New Revision: 17269
Modified:
root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java
root/ui/core/trunk/api/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java
Log:
https://jira.jboss.org/browse/RF-7825
Modified: root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2010-05-26 15:52:25 UTC (rev 17268)
+++ root/ui/core/trunk/api/src/main/java/org/ajax4jsf/component/behavior/AjaxBehavior.java 2010-05-26 15:54:58 UTC (rev 17269)
@@ -29,7 +29,10 @@
import javax.faces.FacesException;
import javax.faces.component.behavior.ClientBehaviorHint;
+import javax.faces.context.FacesContext;
+import javax.faces.event.AbortProcessingException;
import javax.faces.event.AjaxBehaviorListener;
+import javax.faces.event.BehaviorEvent;
import org.ajax4jsf.component.AjaxClientBehavior;
import org.ajax4jsf.renderkit.AjaxRendererUtils;
@@ -51,7 +54,8 @@
.of(ClientBehaviorHint.SUBMITTING));
enum PropertyKeys {
- data, execute, onbeforedomupdate, onbegin, oncomplete, onerror, onevent, queueId, render, similarityGroupingId, status, disabled, limitRender, immediate
+ data, execute, onbeforedomupdate, onbegin, oncomplete, onerror, onevent, queueId, render, similarityGroupingId,
+ status, disabled, limitRender, immediate, bypassUpdates
}
private static final Set<String> ALL_SINGLETON_SET = Collections.singleton(AjaxRendererUtils.ALL);
@@ -104,6 +108,8 @@
setLimitRender((Boolean) value);
} else if (compare(PropertyKeys.immediate, name)) {
setImmediate((Boolean) value);
+ } else if (compare(PropertyKeys.bypassUpdates, name)) {
+ setBypassUpdates((Boolean) value);
}
}
@@ -265,6 +271,14 @@
getStateHelper().put(PropertyKeys.limitRender, immediate);
}
+ public boolean isBypassUpdates() {
+ return (Boolean) getStateHelper().eval(PropertyKeys.bypassUpdates, false);
+ }
+
+ public void setBypassUpdates(boolean bypassUpdates) {
+ getStateHelper().put(PropertyKeys.bypassUpdates, bypassUpdates);
+ }
+
@Override
public String getRendererType() {
return BEHAVIOR_ID;
@@ -283,4 +297,12 @@
removeBehaviorListener(listener);
}
+ @Override
+ public void broadcast(BehaviorEvent event) throws AbortProcessingException {
+ if (this.equals(event.getBehavior()) && isBypassUpdates()) {
+ FacesContext.getCurrentInstance().renderResponse();
+ }
+
+ super.broadcast(event);
+ }
}
Modified: root/ui/core/trunk/api/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java
===================================================================
--- root/ui/core/trunk/api/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java 2010-05-26 15:52:25 UTC (rev 17268)
+++ root/ui/core/trunk/api/src/main/java/org/ajax4jsf/renderkit/AjaxBehaviorRenderer.java 2010-05-26 15:54:58 UTC (rev 17269)
@@ -55,6 +55,9 @@
)
public class AjaxBehaviorRenderer extends ClientBehaviorRenderer {
+
+ private final RendererUtils utils = RendererUtils.getInstance();
+
@Override
public void decode(FacesContext context, UIComponent component, ClientBehavior behavior) {
if (null == context || null == component || null == behavior) {
@@ -74,19 +77,27 @@
component.queueEvent(createEvent(component, ajaxBehavior));
}
- private static AjaxBehaviorEvent createEvent(UIComponent component, AjaxBehavior ajaxBehavior) {
+ private AjaxBehaviorEvent createEvent(UIComponent component, AjaxBehavior ajaxBehavior) {
AjaxBehaviorEvent event = new AjaxBehaviorEvent(component, ajaxBehavior);
- PhaseId phaseId = isImmediate(component, ajaxBehavior)
- ? PhaseId.APPLY_REQUEST_VALUES : PhaseId.INVOKE_APPLICATION;
+ PhaseId phaseId;
+
+ if (isImmediate(component, ajaxBehavior)) {
+ phaseId = PhaseId.APPLY_REQUEST_VALUES;
+ } else if (isBypassUpdates(component, ajaxBehavior)) {
+ //TODO nick - what if behavior is immediate & bypassUpdates in the same time?
+ phaseId = PhaseId.PROCESS_VALIDATIONS;
+ } else {
+ phaseId = PhaseId.INVOKE_APPLICATION;
+ }
event.setPhaseId(phaseId);
return event;
}
- private static boolean isImmediate(UIComponent component, AjaxBehavior ajaxBehavior) {
+ private boolean isImmediate(UIComponent component, AjaxBehavior ajaxBehavior) {
boolean immediate = ajaxBehavior.isImmediate();
- if(!immediate) {
+ if (!immediate) {
if (component instanceof EditableValueHolder) {
immediate = ((EditableValueHolder) component).isImmediate();
} else if (component instanceof ActionSource) {
@@ -97,6 +108,15 @@
return immediate;
}
+ private boolean isBypassUpdates(UIComponent component, AjaxBehavior ajaxBehavior) {
+ boolean bypassUpdates = ajaxBehavior.isBypassUpdates();
+ if (!bypassUpdates) {
+ bypassUpdates = utils.isBooleanAttribute(component, "bypassUpdates");
+ }
+
+ return bypassUpdates;
+ }
+
@Override
public String getScript(ClientBehaviorContext behaviorContext, ClientBehavior behavior) {
String script = null;
14 years, 1 month
JBoss Rich Faces SVN: r17268 - in root/examples/core-demo/trunk/src/main: resources and 2 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2010-05-26 11:52:25 -0400 (Wed, 26 May 2010)
New Revision: 17268
Added:
root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/PhaseTracker.java
Modified:
root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/CommandBean.java
root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/DynamicExecuteBean.java
root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/PushBean.java
root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RegionBean.java
root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RepeatBean.java
root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/SkinBean.java
root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/SupportBean.java
root/examples/core-demo/trunk/src/main/resources/log4j.xml
root/examples/core-demo/trunk/src/main/webapp/WEB-INF/faces-config.xml
root/examples/core-demo/trunk/src/main/webapp/ajax.xhtml
Log:
Beans in core-demo made Serializable
Added bypassUpdates demos for a4j:ajax
Modified: root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/CommandBean.java
===================================================================
--- root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/CommandBean.java 2010-05-26 15:30:26 UTC (rev 17267)
+++ root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/CommandBean.java 2010-05-26 15:52:25 UTC (rev 17268)
@@ -1,5 +1,6 @@
package org.richfaces.demo;
+import java.io.Serializable;
import java.util.Date;
import javax.faces.bean.ManagedBean;
@@ -8,7 +9,10 @@
@ManagedBean(name = "commandBean")
@SessionScoped
-public class CommandBean {
+public class CommandBean implements Serializable {
+
+ private static final long serialVersionUID = 3485896940723796437L;
+
private String name;
public void setName(String name) {
Modified: root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/DynamicExecuteBean.java
===================================================================
--- root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/DynamicExecuteBean.java 2010-05-26 15:30:26 UTC (rev 17267)
+++ root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/DynamicExecuteBean.java 2010-05-26 15:52:25 UTC (rev 17268)
@@ -23,6 +23,8 @@
package org.richfaces.demo;
+import java.io.Serializable;
+
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
import javax.faces.model.SelectItem;
@@ -33,7 +35,10 @@
*/
@ManagedBean(name = "dynamicExecuteBean")
@SessionScoped
-public class DynamicExecuteBean {
+public class DynamicExecuteBean implements Serializable {
+
+ private static final long serialVersionUID = -486936947341873167L;
+
private static final SelectItem[] POSSIBLE_EXECUTE_OPTIONS = new SelectItem[] {
new SelectItem(null, "default"), new SelectItem("@none"), new SelectItem("@this"), new SelectItem("@form"),
new SelectItem("formId"), new SelectItem("anotherFormId"), new SelectItem("@all")
Added: root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/PhaseTracker.java
===================================================================
--- root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/PhaseTracker.java (rev 0)
+++ root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/PhaseTracker.java 2010-05-26 15:52:25 UTC (rev 17268)
@@ -0,0 +1,66 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2010, 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.demo;
+
+import java.text.MessageFormat;
+
+import javax.faces.event.PhaseEvent;
+import javax.faces.event.PhaseId;
+import javax.faces.event.PhaseListener;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @author Nick Belaevski
+ *
+ */
+public class PhaseTracker implements PhaseListener {
+
+ private static final long serialVersionUID = 6358081870120864332L;
+
+ private Logger logger = LoggerFactory.getLogger(PhaseTracker.class);
+
+ private ThreadLocal<Long> phaseTimer = new ThreadLocal<Long>();
+
+ public void afterPhase(PhaseEvent event) {
+ Long phaseStartTime = phaseTimer.get();
+
+ long measuredTime = 0;
+ if (phaseStartTime != null) {
+ measuredTime = System.currentTimeMillis() - phaseStartTime.longValue();
+ }
+
+ logger.debug(MessageFormat.format("Phase {0} completed by {1}ms", event.getPhaseId(), measuredTime));
+ phaseTimer.set(null);
+ }
+
+ public void beforePhase(PhaseEvent event) {
+ logger.debug(MessageFormat.format("Phase {0} started", event.getPhaseId()));
+ phaseTimer.set(System.currentTimeMillis());
+ }
+
+ public PhaseId getPhaseId() {
+ return PhaseId.ANY_PHASE;
+ }
+
+}
Modified: root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/PushBean.java
===================================================================
--- root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/PushBean.java 2010-05-26 15:30:26 UTC (rev 17267)
+++ root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/PushBean.java 2010-05-26 15:52:25 UTC (rev 17268)
@@ -23,6 +23,7 @@
package org.richfaces.demo;
+import java.io.Serializable;
import java.util.EventListener;
import java.util.EventObject;
@@ -37,10 +38,14 @@
*/
@ManagedBean(name = "pushBean")
@SessionScoped
-public class PushBean {
+public class PushBean implements Serializable {
+
+ private static final long serialVersionUID = 4810889475400649809L;
+
private int counter = 0;
- private volatile PushEventListener listener;
+ private volatile transient PushEventListener listener;
+
public void setListener(EventListener listener) {
this.listener = (PushEventListener) listener;
}
Modified: root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RegionBean.java
===================================================================
--- root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RegionBean.java 2010-05-26 15:30:26 UTC (rev 17267)
+++ root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RegionBean.java 2010-05-26 15:52:25 UTC (rev 17268)
@@ -21,6 +21,8 @@
*/
package org.richfaces.demo;
+import java.io.Serializable;
+
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
import javax.faces.event.AjaxBehaviorEvent;
@@ -33,8 +35,10 @@
*/
@ManagedBean
@SessionScoped
-public class RegionBean {
+public class RegionBean implements Serializable {
+ private static final long serialVersionUID = -6371272297263012554L;
+
private static final SelectItem[] AVAILABLE_EXECUTE_OPTIONS = new SelectItem[] {
new SelectItem(null, "default"), new SelectItem("@region"), new SelectItem("@all"), new SelectItem("@this")
};
Modified: root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RepeatBean.java
===================================================================
--- root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RepeatBean.java 2010-05-26 15:30:26 UTC (rev 17267)
+++ root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/RepeatBean.java 2010-05-26 15:52:25 UTC (rev 17268)
@@ -21,6 +21,7 @@
*/
package org.richfaces.demo;
+import java.io.Serializable;
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.List;
@@ -34,10 +35,14 @@
*/
@ManagedBean
@SessionScoped
-public class RepeatBean {
+public class RepeatBean implements Serializable {
- public static final class MatrixCell {
+ private static final long serialVersionUID = -4468004449310935853L;
+
+ public static final class MatrixCell implements Serializable {
+ private static final long serialVersionUID = -5911659561854593681L;
+
private int value = 0;
public int getValue() {
@@ -61,8 +66,10 @@
}
}
- public static final class MatrixRow {
+ public static final class MatrixRow implements Serializable {
+ private static final long serialVersionUID = -5051037819565283283L;
+
private List<MatrixCell> cells = new ArrayList<MatrixCell>();
public List<MatrixCell> getCells() {
@@ -74,8 +81,10 @@
}
}
- public static final class Data {
+ public static final class Data implements Serializable {
+ private static final long serialVersionUID = -1461777632529492912L;
+
private String text;
/**
Modified: root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/SkinBean.java
===================================================================
--- root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/SkinBean.java 2010-05-26 15:30:26 UTC (rev 17267)
+++ root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/SkinBean.java 2010-05-26 15:52:25 UTC (rev 17268)
@@ -1,13 +1,17 @@
package org.richfaces.demo;
+import java.io.Serializable;
+
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
import javax.faces.model.SelectItem;
@ManagedBean(name = "skinBean")
@SessionScoped
-public class SkinBean {
+public class SkinBean implements Serializable {
+ private static final long serialVersionUID = 2744605279708632184L;
+
private SelectItem[] skinSetItems = {
new SelectItem("blueSky"),
new SelectItem("classic"),
Modified: root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/SupportBean.java
===================================================================
--- root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/SupportBean.java 2010-05-26 15:30:26 UTC (rev 17267)
+++ root/examples/core-demo/trunk/src/main/java/org/richfaces/demo/SupportBean.java 2010-05-26 15:52:25 UTC (rev 17268)
@@ -1,12 +1,17 @@
package org.richfaces.demo;
+import java.io.Serializable;
+
import javax.faces.bean.ManagedBean;
import javax.faces.bean.SessionScoped;
import javax.faces.event.AjaxBehaviorEvent;
@SessionScoped
@ManagedBean(name = "supportBean")
-public class SupportBean {
+public class SupportBean implements Serializable {
+
+ private static final long serialVersionUID = -110973149750159911L;
+
private String text1;
private String text2;
Modified: root/examples/core-demo/trunk/src/main/resources/log4j.xml
===================================================================
--- root/examples/core-demo/trunk/src/main/resources/log4j.xml 2010-05-26 15:30:26 UTC (rev 17267)
+++ root/examples/core-demo/trunk/src/main/resources/log4j.xml 2010-05-26 15:52:25 UTC (rev 17268)
@@ -9,6 +9,9 @@
</layout>
</appender>
<logger name="org.richfaces">
+ <level value="info" />
+ </logger>
+ <logger name="org.richfaces.demo.PhaseTracker">
<level value="debug" />
</logger>
<root>
Modified: root/examples/core-demo/trunk/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- root/examples/core-demo/trunk/src/main/webapp/WEB-INF/faces-config.xml 2010-05-26 15:30:26 UTC (rev 17267)
+++ root/examples/core-demo/trunk/src/main/webapp/WEB-INF/faces-config.xml 2010-05-26 15:52:25 UTC (rev 17268)
@@ -16,5 +16,8 @@
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
+ <lifecycle>
+ <phase-listener>org.richfaces.demo.PhaseTracker</phase-listener>
+ </lifecycle>
</faces-config>
\ No newline at end of file
Modified: root/examples/core-demo/trunk/src/main/webapp/ajax.xhtml
===================================================================
--- root/examples/core-demo/trunk/src/main/webapp/ajax.xhtml 2010-05-26 15:30:26 UTC (rev 17267)
+++ root/examples/core-demo/trunk/src/main/webapp/ajax.xhtml 2010-05-26 15:52:25 UTC (rev 17268)
@@ -20,13 +20,13 @@
<h:panelGrid columns="2">
<h:outputText value="a:ajax attached fires ajax submit on 'keyup' event"/>
<h:inputText value="#{supportBean.text1}">
- <a:ajax event="keyup" render="text1" statusId="ilStatus" listener="#{supportBean.behaviorListener}"/>
+ <a:ajax event="keyup" render="text1" status="ilStatus" listener="#{supportBean.behaviorListener}"/>
</h:inputText>
</h:panelGrid>
<h:panelGrid columns="1">
<h:outputText value="a:ajax for 'keyup' event wrapping several elements" />
- <a:ajax event="keyup" execute="@this" render="text1" statusId="ilStatus" listener="#{supportBean.behaviorListener}">
+ <a:ajax event="keyup" execute="@this" render="text1" status="ilStatus" listener="#{supportBean.behaviorListener}">
<h:inputText value="#{supportBean.text1}" />
<h:inputText value="#{supportBean.text1}" />
<h:inputText value="#{supportBean.text1}" />
@@ -50,7 +50,7 @@
<h:panelGrid columns="2">
<h:outputText value="a:ajax attached fires ajax submit on default event"/>
<h:inputText value="#{supportBean.text2}">
- <a:ajax render="text2" statusId="ilStatus" limitRender="true"/>
+ <a:ajax render="text2" status="ilStatus" limitRender="true"/>
</h:inputText>
</h:panelGrid>
@@ -69,5 +69,33 @@
</h:form>
+
+ <h:form>
+ <h:panelGrid columns="3">
+ bypassUpdates undefined
+ <h:inputText>
+ <a:ajax event="keyup" />
+ </h:inputText>
+ <h:commandLink value="Link">
+ <a:ajax />
+ </h:commandLink>
+
+ bypassUpdates="true"
+ <h:inputText>
+ <a:ajax bypassUpdates="true" event="keyup" />
+ </h:inputText>
+ <h:commandLink value="Link">
+ <a:ajax bypassUpdates="true" />
+ </h:commandLink>
+
+ bypassUpdates="#{true}"
+ <h:inputText>
+ <a:ajax bypassUpdates="#{true}" event="keyup" />
+ </h:inputText>
+ <h:commandLink value="Link">
+ <a:ajax bypassUpdates="#{true}" />
+ </h:commandLink>
+ </h:panelGrid>
+ </h:form>
</h:body>
</html>
\ No newline at end of file
14 years, 1 month