JBoss Rich Faces SVN: r17368 - in root/examples/richfaces-showcase/trunk/src/main: java/org/richfaces/demo/tables and 2 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: ilya_shaikovsky
Date: 2010-05-28 11:05:10 -0400 (Fri, 28 May 2010)
New Revision: 17368
Added:
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/alabama.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/alaska.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/arizona.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/arkansas.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/california.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/colorado.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/connecticut.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/delaware.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/florida.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/georgia.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/hawaii.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/idaho.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/illinois.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/indiana.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/iowa.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/kansas.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/kentucky.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/louisiana.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/maine.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/maryland.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/massachusetts.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/michigan.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/minnesota.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/mississippi.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/missouri.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/montana.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/nebraska.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/nevada.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/newhampshire.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/newjersey.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/newmexico.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/newyork.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/northcarolina.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/northdakota.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/ohio.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/oklahoma.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/oregon.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/pennsylvania.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/rhodeisland.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/southcarolina.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/southdakota.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/tennessee.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/texas.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/utah.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/vermont.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/virginia.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/washington.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/westvirginia.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/wisconsin.gif
root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/wyoming.gif
Modified:
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java
root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/CarsFilteringBean.java
Log:
table demos fixes
+ images for capital object
Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java 2010-05-28 14:44:59 UTC (rev 17367)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/common/navigation/DemoNavigator.java 2010-05-28 15:05:10 UTC (rev 17368)
@@ -35,9 +35,11 @@
if (currentDemo == null || !currentDemo.getId().equals(id)) {
if (id != null) {
currentDemo = findDemoById(id);
+ currentSample=null;
}
if (currentDemo == null) {
currentDemo = groups.get(0).getDemos().get(0);
+ currentSample=null;
}
}
return currentDemo;
@@ -49,10 +51,9 @@
if (id != null) {
currentSample = getCurrentDemo().getSampleById(id);
}
- if (currentSample == null || id==null) {
+ if (currentSample == null) {
currentSample = getCurrentDemo().getSamples().get(0);
- }
- }
+ } }
return currentSample;
}
@@ -90,7 +91,7 @@
if (handler instanceof ConfigurableNavigationHandler) {
ConfigurableNavigationHandler navigationHandler = (ConfigurableNavigationHandler) handler;
- NavigationCase navCase = navigationHandler.getNavigationCase(context, null, currentDemo.getId()
+ NavigationCase navCase = navigationHandler.getNavigationCase(context, null, getCurrentDemo().getId()
+ SEPARATOR
+ getCurrentSample().getId());
Modified: root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/CarsFilteringBean.java
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/CarsFilteringBean.java 2010-05-28 14:44:59 UTC (rev 17367)
+++ root/examples/richfaces-showcase/trunk/src/main/java/org/richfaces/demo/tables/CarsFilteringBean.java 2010-05-28 15:05:10 UTC (rev 17368)
@@ -23,20 +23,23 @@
return new Filter<InventoryItem>() {
public boolean accept(InventoryItem item) {
Long mileage = getMileageFilter();
- if (mileage == null || mileage.compareTo(item.getMileage().longValue()) >= 0) {
+ if (mileage == null || mileage==0 || mileage.compareTo(item.getMileage().longValue()) >= 0) {
return true;
}
return false;
}
};
}
-
- public boolean acceptVendor(InventoryItem item) {
- String vendor = getVendorFilter();
- if (vendor == null || vendor.length() == 0 || vendor.equals(item.getVendor())) {
- return true;
- }
- return false;
+ public Filter<?> getFilterVendor(){
+ return new Filter<InventoryItem>() {
+ public boolean accept(InventoryItem t) {
+ String vendor = getVendorFilter();
+ if (vendor == null || vendor.length() == 0 || vendor.equals(t.getVendor())) {
+ return true;
+ }
+ return false;
+ }
+ };
}
public Long getMileageFilter() {
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/alabama.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/alabama.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/alaska.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/alaska.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/arizona.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/arizona.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/arkansas.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/arkansas.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/california.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/california.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/colorado.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/colorado.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/connecticut.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/connecticut.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/delaware.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/delaware.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/florida.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/florida.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/georgia.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/georgia.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/hawaii.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/hawaii.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/idaho.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/idaho.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/illinois.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/illinois.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/indiana.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/indiana.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/iowa.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/iowa.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/kansas.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/kansas.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/kentucky.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/kentucky.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/louisiana.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/louisiana.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/maine.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/maine.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/maryland.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/maryland.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/massachusetts.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/massachusetts.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/michigan.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/michigan.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/minnesota.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/minnesota.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/mississippi.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/mississippi.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/missouri.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/missouri.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/montana.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/montana.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/nebraska.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/nebraska.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/nevada.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/nevada.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/newhampshire.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/newhampshire.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/newjersey.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/newjersey.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/newmexico.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/newmexico.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/newyork.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/newyork.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/northcarolina.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/northcarolina.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/northdakota.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/northdakota.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/ohio.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/ohio.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/oklahoma.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/oklahoma.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/oregon.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/oregon.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/pennsylvania.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/pennsylvania.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/rhodeisland.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/rhodeisland.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/southcarolina.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/southcarolina.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/southdakota.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/southdakota.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/tennessee.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/tennessee.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/texas.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/texas.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/utah.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/utah.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/vermont.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/vermont.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/virginia.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/virginia.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/washington.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/washington.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/westvirginia.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/westvirginia.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/wisconsin.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/wisconsin.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/wyoming.gif
===================================================================
(Binary files differ)
Property changes on: root/examples/richfaces-showcase/trunk/src/main/webapp/images/capitals/wyoming.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
14 years, 7 months
JBoss Rich Faces SVN: r17367 - in root: build/resources/trunk/checkstyle and 31 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-28 10:44:59 -0400 (Fri, 28 May 2010)
New Revision: 17367
Modified:
root/build/bom/trunk/pom.xml
root/build/resources/trunk/checkstyle/pom.xml
root/build/resources/trunk/faces-shade-transformers/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/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/iteration/trunk/bom/pom.xml
root/ui/iteration/trunk/datascroller/pom.xml
root/ui/iteration/trunk/dist/pom.xml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
root/ui/iteration/trunk/parent/pom.xml
root/ui/iteration/trunk/pom.xml
root/ui/iteration/trunk/tables/pom.xml
root/ui/misc/trunk/bom/pom.xml
root/ui/misc/trunk/dist/pom.xml
root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
root/ui/misc/trunk/parent/pom.xml
root/ui/misc/trunk/pom.xml
Log:
Updated to latest richfaces-parent 7
Modified: root/build/bom/trunk/pom.xml
===================================================================
--- root/build/bom/trunk/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/build/bom/trunk/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<description>
Modified: root/build/resources/trunk/checkstyle/pom.xml
===================================================================
--- root/build/resources/trunk/checkstyle/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/build/resources/trunk/checkstyle/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces</groupId>
Modified: root/build/resources/trunk/faces-shade-transformers/pom.xml
===================================================================
--- root/build/resources/trunk/faces-shade-transformers/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/build/resources/trunk/faces-shade-transformers/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.build.resources</groupId>
Modified: root/cdk/trunk/bom/pom.xml
===================================================================
--- root/cdk/trunk/bom/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/cdk/trunk/bom/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: root/commons/trunk/bom/pom.xml
===================================================================
--- root/commons/trunk/bom/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/commons/trunk/bom/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<description>
Modified: root/commons/trunk/parent/pom.xml
===================================================================
--- root/commons/trunk/parent/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/commons/trunk/parent/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<description>
Modified: root/commons/trunk/pom.xml
===================================================================
--- root/commons/trunk/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/commons/trunk/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.commons</groupId>
Modified: root/core/trunk/bom/pom.xml
===================================================================
--- root/core/trunk/bom/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/core/trunk/bom/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -29,7 +29,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<description>
Modified: root/core/trunk/parent/pom.xml
===================================================================
--- root/core/trunk/parent/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/core/trunk/parent/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -30,7 +30,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<description>
Modified: root/core/trunk/pom.xml
===================================================================
--- root/core/trunk/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/core/trunk/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.core</groupId>
Modified: root/dist/trunk/pom.xml
===================================================================
--- root/dist/trunk/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/dist/trunk/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces</groupId>
Modified: root/examples-sandbox/trunk/pom.xml
===================================================================
--- root/examples-sandbox/trunk/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/examples-sandbox/trunk/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces</groupId>
Modified: root/ui/core/trunk/bom/pom.xml
===================================================================
--- root/ui/core/trunk/bom/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/core/trunk/bom/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/core/trunk/parent/pom.xml
===================================================================
--- root/ui/core/trunk/parent/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/core/trunk/parent/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/core/trunk/pom.xml
===================================================================
--- root/ui/core/trunk/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/core/trunk/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/dist/trunk/pom.xml
===================================================================
--- root/ui/dist/trunk/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/dist/trunk/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</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-28 14:37:50 UTC (rev 17366)
+++ root/ui/dist/trunk/richfaces-components-api/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</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-28 14:37:50 UTC (rev 17366)
+++ root/ui/dist/trunk/richfaces-components-impl/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</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-28 14:37:50 UTC (rev 17366)
+++ root/ui/dist/trunk/richfaces-components-ui/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/iteration/trunk/bom/pom.xml
===================================================================
--- root/ui/iteration/trunk/bom/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/iteration/trunk/bom/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/iteration/trunk/datascroller/pom.xml
===================================================================
--- root/ui/iteration/trunk/datascroller/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/iteration/trunk/datascroller/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui.iteration</groupId>
Modified: root/ui/iteration/trunk/dist/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/iteration/trunk/dist/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/iteration/trunk/parent/pom.xml
===================================================================
--- root/ui/iteration/trunk/parent/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/iteration/trunk/parent/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/iteration/trunk/pom.xml
===================================================================
--- root/ui/iteration/trunk/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/iteration/trunk/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/iteration/trunk/tables/pom.xml
===================================================================
--- root/ui/iteration/trunk/tables/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/iteration/trunk/tables/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui.iteration</groupId>
Modified: root/ui/misc/trunk/bom/pom.xml
===================================================================
--- root/ui/misc/trunk/bom/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/misc/trunk/bom/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/misc/trunk/dist/pom.xml
===================================================================
--- root/ui/misc/trunk/dist/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/misc/trunk/dist/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
===================================================================
--- root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/misc/trunk/parent/pom.xml
===================================================================
--- root/ui/misc/trunk/parent/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/misc/trunk/parent/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
Modified: root/ui/misc/trunk/pom.xml
===================================================================
--- root/ui/misc/trunk/pom.xml 2010-05-28 14:37:50 UTC (rev 17366)
+++ root/ui/misc/trunk/pom.xml 2010-05-28 14:44:59 UTC (rev 17367)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
- <version>6</version>
+ <version>7</version>
</parent>
<groupId>org.richfaces.ui</groupId>
14 years, 7 months
JBoss Rich Faces SVN: r17365 - root/build/parent/tags.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-28 10:37:45 -0400 (Fri, 28 May 2010)
New Revision: 17365
Added:
root/build/parent/tags/richfaces-parent-7/
Log:
[maven-scm] copy for tag richfaces-parent-7
Copied: root/build/parent/tags/richfaces-parent-7 (from rev 17364, root/build/parent/trunk)
14 years, 7 months
JBoss Rich Faces SVN: r17363 - root/build/resources/trunk.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-28 10:36:05 -0400 (Fri, 28 May 2010)
New Revision: 17363
Modified:
root/build/resources/trunk/change_version.sh
Log:
Updated script to only work on paths with trunk in them
Modified: root/build/resources/trunk/change_version.sh
===================================================================
--- root/build/resources/trunk/change_version.sh 2010-05-28 14:32:45 UTC (rev 17362)
+++ root/build/resources/trunk/change_version.sh 2010-05-28 14:36:05 UTC (rev 17363)
@@ -33,7 +33,7 @@
echo =================================
echo "Changing <version>$ORIG_VERSION</version> into <version>$NEW_VERSION</version>"
- find $DESTINATION -name "pom.xml" | xargs perl -pi -e "s/<version>$ORIG_VERSION<\/version>/<version>$NEW_VERSION<\/version>/"
+ find $DESTINATION -name "pom.xml" -path *trunk/* | xargs perl -pi -e "s/<version>$ORIG_VERSION<\/version>/<version>$NEW_VERSION<\/version>/"
echo =================================
14 years, 7 months
JBoss Rich Faces SVN: r17362 - root/build/parent/trunk.
by richfaces-svn-commits@lists.jboss.org
Author: jbalunas(a)redhat.com
Date: 2010-05-28 10:32:45 -0400 (Fri, 28 May 2010)
New Revision: 17362
Modified:
root/build/parent/trunk/pom.xml
Log:
Needed to revert to maven-release-plugin 2.0 beta 9 because of http://jira.codehaus.org/browse/MRELEASE-526
Modified: root/build/parent/trunk/pom.xml
===================================================================
--- root/build/parent/trunk/pom.xml 2010-05-28 13:53:19 UTC (rev 17361)
+++ root/build/parent/trunk/pom.xml 2010-05-28 14:32:45 UTC (rev 17362)
@@ -152,7 +152,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0</version>
<configuration>
<!-- All sub-modules will have same version -->
<autoVersionSubmodules>true</autoVersionSubmodules>
14 years, 7 months
JBoss Rich Faces SVN: r17361 - root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-28 09:53:19 -0400 (Fri, 28 May 2010)
New Revision: 17361
Modified:
root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/SubTableToggleControlRendererBase.java
Log:
fix checkstyle
Modified: root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/SubTableToggleControlRendererBase.java
===================================================================
--- root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/SubTableToggleControlRendererBase.java 2010-05-28 13:44:31 UTC (rev 17360)
+++ root/ui/iteration/trunk/tables/ui/src/main/java/org/richfaces/renderkit/SubTableToggleControlRendererBase.java 2010-05-28 13:53:19 UTC (rev 17361)
@@ -26,7 +26,6 @@
import java.util.HashMap;
import java.util.Map;
-import javax.faces.application.Resource;
import javax.faces.application.ResourceDependencies;
import javax.faces.application.ResourceDependency;
import javax.faces.component.UIComponent;
@@ -41,11 +40,10 @@
/**
* @author Anton Belevich
- *
*/
-@ResourceDependencies( {@ResourceDependency(library = "javax.faces", name = "jsf.js"),
+@ResourceDependencies({@ResourceDependency(library = "javax.faces", name = "jsf.js"),
@ResourceDependency(name = "richfaces.js"), @ResourceDependency(name = "subtable-toggler.js")})
-
+
public class SubTableToggleControlRendererBase extends RendererBase {
private static final String DISPLAY_NONE = "display: none;";
@@ -53,28 +51,28 @@
private static final String EXPAND_STATE = "expand";
private static final String COLLAPSE_STATE = "collapse";
-
+
private static final String UP_ICON_URL = "up_icon.gif";
-
+
private static final String DOWN_ICON_URL = "down_icon.gif";
-
+
@Override
protected void doDecode(FacesContext context, UIComponent component) {
context.getPartialViewContext().getRenderIds().add(component.getClientId(context));
}
-
+
protected void encodeControl(FacesContext context, UIComponent component) throws IOException {
-
+
UISubTableToggleControl toggleControl = (UISubTableToggleControl) component;
-
+
UISubTable subTable = findComponent(context, toggleControl);
if (subTable != null) {
ResponseWriter writer = context.getResponseWriter();
-
+
String toggleId = toggleControl.getClientId(context);
Map<String, Object> options = encodeOptions(context, toggleControl, subTable);
String switchType = subTable.getExpandMode();
-
+
boolean expanded = subTable.isExpanded();
encodeControl(context, writer, toggleControl, switchType, expanded, false);
@@ -83,24 +81,24 @@
JSFunction jsFunction = new JSFunction("new RichFaces.ui.SubTableToggler");
jsFunction.addParameter(toggleId);
jsFunction.addParameter(options);
-
+
writer.startElement(HTML.SCRIPT_ELEM, subTable);
writer.writeText(jsFunction.toScript(), null);
writer.endElement(HTML.SCRIPT_ELEM);
-
+
subTable.addToggleListener(toggleControl);
}
-
+
}
protected void encodeControl(FacesContext context, ResponseWriter writer, UISubTableToggleControl control,
- String switchType, boolean expanded, boolean visible) throws IOException {
+ String switchType, boolean expanded, boolean visible) throws IOException {
String state = getState(expanded);
String styleClass = getStyleClass(context, control);
String style = getStyle(context, control);
writer.startElement(HTML.SPAN_ELEM, control);
-
+
if (!visible) {
writer.writeAttribute(HTML.STYLE_ATTRIBUTE, DISPLAY_NONE, null);
}
@@ -108,26 +106,26 @@
writer.writeAttribute(HTML.ID_ATTRIBUTE, control.getClientId() + ":" + state, null);
writer.writeAttribute(HTML.CLASS_ATTRIBUTE, styleClass, null);
writer.writeAttribute(HTML.STYLE_ATTRIBUTE, style, null);
-
+
boolean encodeDefault = true;
UIComponent controlFacet = control.getFacet(state);
- if(controlFacet != null && controlFacet.isRendered()) {
-
- if(!visible) {
- String facetStyle = (String)controlFacet.getAttributes().get("style");
+ if (controlFacet != null && controlFacet.isRendered()) {
+
+ if (!visible) {
+ String facetStyle = (String) controlFacet.getAttributes().get("style");
facetStyle = facetStyle != null ? facetStyle + "; display: none" : "; display: none";
controlFacet.getAttributes().put("style", facetStyle);
}
controlFacet.encodeAll(context);
encodeDefault = false;
- }
-
+ }
+
String expandIcon = control.getExpandIcon();
String collapseIcon = control.getCollapseIcon();
-
- if((expandIcon != null && collapseIcon != null)
- && (expandIcon.trim().length() > 0 && collapseIcon.trim().length() > 0)) {
-
+
+ if ((expandIcon != null && collapseIcon != null)
+ && (expandIcon.trim().length() > 0 && collapseIcon.trim().length() > 0)) {
+
String image = expanded ? expandIcon : collapseIcon;
if (image != null && image.trim().length() > 0) {
writer.startElement(HTML.IMG_ELEMENT, control);
@@ -136,21 +134,21 @@
writer.endElement(HTML.IMG_ELEMENT);
}
encodeDefault = false;
- }
-
+ }
+
String label = expanded ? control.getExpandLabel() : control.getCollapseLabel();
- if(label != null && label.trim().length() > 0) {
+ if (label != null && label.trim().length() > 0) {
writer.startElement(HTML.A_ELEMENT, control);
writer.writeAttribute(HTML.HREF_ATTR, "javascript:void(0);", null);
writer.writeText(label, null);
writer.endElement(HTML.A_ELEMENT);
encodeDefault = false;
}
-
- if(encodeDefault) {
+
+ if (encodeDefault) {
expandIcon = context.getApplication().getResourceHandler().createResource(UP_ICON_URL).getRequestPath();
collapseIcon = context.getApplication().getResourceHandler().createResource(DOWN_ICON_URL).getRequestPath();
-
+
String image = expanded ? expandIcon : collapseIcon;
if (image != null && image.trim().length() > 0) {
writer.startElement(HTML.IMG_ELEMENT, control);
@@ -158,25 +156,23 @@
writer.writeAttribute(HTML.ALT_ATTRIBUTE, "", null);
writer.endElement(HTML.IMG_ELEMENT);
}
-
+
}
-
+
writer.endElement(HTML.SPAN_ELEM);
}
-
-
public HashMap<String, Object> encodeOptions(FacesContext context, UISubTableToggleControl toggleControl, UISubTable subTable) {
String forId = subTable.getClientId(context);
String toggleControlId = toggleControl.getClientId(context);
-
+
HashMap<String, Object> options = new HashMap<String, Object>();
options.put("forId", forId);
options.put("expandControl", toggleControlId + ":expand");
options.put("collapseControl", toggleControlId + ":collapse");
-
+
String eventName = toggleControl.getEvent();
- eventName = eventName.trim().startsWith("on") ? eventName.substring(2) : eventName;
+ eventName = eventName.trim().startsWith("on") ? eventName.substring(2) : eventName;
options.put("eventName", eventName);
return options;
}
@@ -192,12 +188,12 @@
protected UISubTable findComponent(FacesContext context, UISubTableToggleControl toggleControl) {
String forId = toggleControl.getFor();
if (forId != null && forId.length() > 0) {
-
+
UIComponent subTable = getUtils().findComponentFor(context, toggleControl, forId);
if (subTable instanceof UISubTable) {
return (UISubTable) subTable;
}
-
+
}
return null;
}
@@ -205,5 +201,5 @@
protected String getState(boolean expand) {
return expand ? EXPAND_STATE : COLLAPSE_STATE;
}
-
+
}
14 years, 7 months
JBoss Rich Faces SVN: r17360 - in root: examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller and 4 other directories.
by richfaces-svn-commits@lists.jboss.org
Author: Alex.Kolonitsky
Date: 2010-05-28 09:44:31 -0400 (Fri, 28 May 2010)
New Revision: 17360
Modified:
root/examples/iteration-demo/trunk/src/main/webapp/dataTable.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFilteringAPI.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml
root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/tableToggleControl/tableToggleControl.xhtml
root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
Log:
fix taglib namespaces
Modified: root/examples/iteration-demo/trunk/src/main/webapp/dataTable.xhtml
===================================================================
--- root/examples/iteration-demo/trunk/src/main/webapp/dataTable.xhtml 2010-05-28 12:53:44 UTC (rev 17359)
+++ root/examples/iteration-demo/trunk/src/main/webapp/dataTable.xhtml 2010-05-28 13:44:31 UTC (rev 17360)
@@ -3,8 +3,7 @@
xmlns:h="http://java.sun.com/jsf/html"
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
- xmlns:rich="http://richfaces.org/rich"
- xmlns:ds="http://richfaces.org/datascroller"
+ xmlns:it="http://richfaces.org/iteration"
xmlns:cc="http://richfaces.org/componentControl">
<f:view contentType="text/html" />
@@ -14,10 +13,10 @@
<h:body>
<h:form id="form1">
- <ds:dataScroller id="scroller1" for="richTable"
- page="#{dataBean.page}" maxPages="7"></ds:dataScroller>
+ <it:dataScroller id="scroller1" for="richTable"
+ page="#{dataBean.page}" maxPages="7"></it:dataScroller>
- <rich:dataTable keepSaved="true" id="richTable" var="record"
+ <it:dataTable keepSaved="true" id="richTable" var="record"
rowKeyVar="rowKey" value="#{dataBean.employeeList}" rows="20"
sortMode="single">
<f:facet name="caption">
@@ -26,7 +25,7 @@
<f:facet name="header">
<h:outputText value="header facet" />
</f:facet>
- <rich:column id="column_name" sortBy="#{record.name}"
+ <it:column id="column_name" sortBy="#{record.name}"
sortIconAsc="resources/images/asc.gif"
sortIconDesc="resources/images/desc.gif"
sortIconUnsort="resources/images/unsort.gif">
@@ -34,19 +33,19 @@
<h:outputText id="columnHeader1" value="Column Header Facet" />
</f:facet>
- <rich:toggleControl for="expandedSubTable"
+ <it:toggleControl for="expandedSubTable"
expandControl="resources/images/+.gif"
collapseControl="resources/images/-.gif">
- </rich:toggleControl>
+ </it:toggleControl>
<h:outputText value="#{record.name}" />
<f:facet name="footer">
<h:outputText id="columnFooter1" value="Column Footer Facet 1" />
</f:facet>
- </rich:column>
+ </it:column>
- <rich:column id="column_title" sortBy="#{record.title}"
+ <it:column id="column_title" sortBy="#{record.title}"
sortIconAsc="resources/images/asc.gif"
sortIconDesc="resources/images/desc.gif"
sortIconUnsort="resources/images/unsort.gif">
@@ -54,43 +53,43 @@
<h:outputText id="columnHeader2" value="Column Header Facet 2" />
</f:facet>
<h:outputText value="#{record.title}" />
- </rich:column>
+ </it:column>
- <rich:column id="column_email">
+ <it:column id="column_email">
<h:outputText value="#{record.EMail}" />
- </rich:column>
+ </it:column>
- <rich:subTable id="expandedSubTable" var="company"
+ <it:subTable id="expandedSubTable" var="company"
value="#{record.companies}" rows="1" switchType="ajax"
expanded="true">
<f:facet name="header">
- <ds:dataScroller id="subscroller" for="expandedSubTable"
- maxPages="3"></ds:dataScroller>
+ <it:dataScroller id="subscroller" for="expandedSubTable"
+ maxPages="3"></it:dataScroller>
</f:facet>
<f:facet name="footer">
<h:outputText value="footer" />
</f:facet>
- <rich:column id="column_company_name">
+ <it:column id="column_company_name">
<h:outputText value="#{company.name}" />
- </rich:column>
+ </it:column>
- <rich:column id="column_company_state">
+ <it:column id="column_company_state">
<h:outputText value="#{company.state}" />
- </rich:column>
+ </it:column>
- <rich:column id="column_company_phone">
+ <it:column id="column_company_phone">
<h:outputText value="#{company.phone}" />
- </rich:column>
- </rich:subTable>
+ </it:column>
+ </it:subTable>
<f:facet name="footer">
- <ds:dataScroller id="scroller3" for="richTable"
- page="#{dataBean.page}" maxPages="7"></ds:dataScroller>
+ <it:dataScroller id="scroller3" for="richTable"
+ page="#{dataBean.page}" maxPages="7"></it:dataScroller>
</f:facet>
- </rich:dataTable>
+ </it:dataTable>
<br />
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml 2010-05-28 12:53:44 UTC (rev 17359)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/dataScrollerAPI.xhtml 2010-05-28 13:44:31 UTC (rev 17360)
@@ -4,8 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:tbl="http://richfaces.org/rich"
- xmlns:ds="http://richfaces.org/datascroller">
+ xmlns:it="http://richfaces.org/iteration">
<ui:composition>
<style>
@@ -34,7 +33,7 @@
<h:graphicImage value="/images/icons/scroller/arr_right.png"
onclick="document.getElementById('form:ds').richfaces.component.next()" />
</h:panelGrid>
- <ds:dataScroller for="pics" id="ds" render="repeat" stepControls="false" boundaryControls="false" fastControls="false" maxPages="10"/>
+ <it:dataScroller for="pics" id="ds" render="repeat" stepControls="false" boundaryControls="false" fastControls="false" maxPages="10"/>
</h:panelGrid>
</h:form>
</ui:composition>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2010-05-28 12:53:44 UTC (rev 17359)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataScroller/simpleScrolling.xhtml 2010-05-28 13:44:31 UTC (rev 17360)
@@ -4,47 +4,46 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:tbl="http://richfaces.org/rich"
- xmlns:ds="http://richfaces.org/datascroller"
+ xmlns:it="http://richfaces.org/iteration"
>
<ui:composition>
<h:form id="form">
- <ds:dataScroller for="table"/>
- <tbl:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ <it:dataScroller for="table"/>
+ <it:dataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" rows="10">
- <tbl:column accept="#{carsFiteringBean.acceptVendor}">
+ <it:column accept="#{carsFiteringBean.acceptVendor}">
<f:facet name="header">
<h:outputText value="Vendor " />
</f:facet>
<h:outputText value="#{car.vendor}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Mileage" />
</f:facet>
<h:outputText value="#{car.mileage}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="VIN " />
</f:facet>
<h:outputText value="#{car.vin}" />
- </tbl:column>
- </tbl:dataTable>
- <ds:dataScroller for="table"/>
+ </it:column>
+ </it:dataTable>
+ <it:dataScroller for="table"/>
</h:form>
</ui:composition>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-05-28 12:53:44 UTC (rev 17359)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/simpleTable.xhtml 2010-05-28 13:44:31 UTC (rev 17360)
@@ -4,48 +4,47 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:tbl="http://richfaces.org/rich"
- xmlns:ds="http://richfaces.org/datascroller">
+ xmlns:it="http://richfaces.org/iteration">
<ui:composition>
<p>This sample shows simple master-detail table implemented using<b>
tbl:dataTable</b> and<b> tbl:subtable</b> components</p>
- <tbl:dataTable width="700" var="record"
+ <it:dataTable width="700" var="record"
value="#{reportBean.expReport.records}">
<f:facet name="header">
- <tbl:columnGroup>
- <tbl:column rowspan="2">
- </tbl:column>
- <tbl:column colspan="3">
+ <it:columnGroup>
+ <it:column rowspan="2">
+ </it:column>
+ <it:column colspan="3">
<h:outputText value="Expenses" />
- </tbl:column>
- <tbl:column rowspan="2">
+ </it:column>
+ <it:column rowspan="2">
<h:outputText value="subtotals" />
- </tbl:column>
- <tbl:column breakBefore="true">
+ </it:column>
+ <it:column breakBefore="true">
<h:outputText value="Meals" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="Hotels" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="Transport" />
- </tbl:column>
- </tbl:columnGroup>
+ </it:column>
+ </it:columnGroup>
</f:facet>
- <tbl:column colspan="5">
+ <it:column colspan="5">
<h:outputText value="#{record.city}" />
- </tbl:column>
+ </it:column>
- <tbl:subTable var="expense" value="#{record.items}">
- <tbl:column>
+ <it:subTable var="expense" value="#{record.items}">
+ <it:column>
<h:outputText value="#{expense.day}"></h:outputText>
<f:facet name="footer">
<div></div>
</f:facet>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{expense.meals}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
@@ -54,8 +53,8 @@
<f:convertNumber pattern="$####.00" />
</h:outputText>
</f:facet>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{expense.hotels}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
@@ -64,9 +63,9 @@
<f:convertNumber pattern="$####.00" />
</h:outputText>
</f:facet>
- </tbl:column>
+ </it:column>
- <tbl:column>
+ <it:column>
<h:outputText value="#{expense.transport}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
@@ -75,46 +74,46 @@
<f:convertNumber pattern="$####.00" />
</h:outputText>
</f:facet>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="footer">
<h:outputText value="#{record.total}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
</f:facet>
- </tbl:column>
+ </it:column>
- </tbl:subTable>
+ </it:subTable>
<f:facet name="footer">
- <tbl:columnGroup>
- <tbl:column>Totals</tbl:column>
- <tbl:column>
+ <it:columnGroup>
+ <it:column>Totals</it:column>
+ <it:column>
<h:outputText value="#{reportBean.expReport.totalMeals}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{reportBean.expReport.totalHotels}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{reportBean.expReport.totalTransport}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{reportBean.expReport.grandTotal}">
<f:convertNumber pattern="$####.00" />
</h:outputText>
- </tbl:column>
- </tbl:columnGroup>
+ </it:column>
+ </it:columnGroup>
</f:facet>
- </tbl:dataTable>
+ </it:dataTable>
</ui:composition>
</html>
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-05-28 12:53:44 UTC (rev 17359)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFiltering.xhtml 2010-05-28 13:44:31 UTC (rev 17360)
@@ -4,14 +4,14 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:tbl="http://richfaces.org/rich"
+ xmlns:it="http://richfaces.org/iteration"
xmlns:fn="http://java.sun.com/jsp/jstl/functions">
<ui:composition>
<h:form id="form">
- <tbl:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ <it:dataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" rows="20">
- <tbl:column accept="#{carsFiteringBean.acceptVendor}">
+ <it:column accept="#{carsFiteringBean.acceptVendor}">
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Vendor " />
@@ -22,20 +22,20 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vendor}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </tbl:column>
- <tbl:column filter="#{carsFilteringBean.mileageFilterImpl}">
+ </it:column>
+ <it:column filter="#{carsFilteringBean.mileageFilterImpl}">
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Mileage < " />
@@ -47,8 +47,8 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.mileage}" />
- </tbl:column>
- <tbl:column
+ </it:column>
+ <it:column
filterExpression="#{fn:containsIgnoreCase(car.vin,carFilteringBean.vinFilter)}">
<f:facet name="header">
<h:panelGroup>
@@ -59,8 +59,8 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vin}" />
- </tbl:column>
- </tbl:dataTable>
+ </it:column>
+ </it:dataTable>
</h:form>
</ui:composition>
</html>
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFilteringAPI.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFilteringAPI.xhtml 2010-05-28 12:53:44 UTC (rev 17359)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableFilteringAPI.xhtml 2010-05-28 13:44:31 UTC (rev 17360)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:tbl="http://richfaces.org/rich"
+ xmlns:it="http://richfaces.org/iteration"
xmlns:fn="http://java.sun.com/jsp/jstl/functions"
xmlns:rich="http://java.sun.com/jsf/composite/rich">
@@ -25,9 +25,9 @@
</ul>
</fieldset>
</rich:panel>
- <tbl:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ <it:dataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" rows="20">
- <tbl:column id="vendor"
+ <it:column id="vendor"
filterExpression="#{carsFilteringBean.vendorFilter == '' or carsFilteringBean.vendorFilter == null or carsFilteringBean.vendorFilter == car.vendor}">
<f:facet name="header">
<h:panelGroup>
@@ -35,44 +35,44 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vendor}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Mileage" />
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.mileage}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Days Live" />
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.daysLive}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:panelGroup>
<h:outputText value="VIN " />
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vin}" />
- </tbl:column>
- </tbl:dataTable>
+ </it:column>
+ </it:dataTable>
</h:panelGrid>
</h:form>
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-05-28 12:53:44 UTC (rev 17359)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableSorting.xhtml 2010-05-28 13:44:31 UTC (rev 17360)
@@ -4,38 +4,38 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:tbl="http://richfaces.org/rich">
+ xmlns:it="http://richfaces.org/iteration">
<ui:composition>
<h:form>
- <tbl:dataTable value="#{carsBean.allCars}" var="car" id="table">
- <tbl:column>
+ <it:dataTable value="#{carsBean.allCars}" var="car" id="table">
+ <it:column>
<f:facet name="header">
<h:outputText value="Make" />
</f:facet>
<h:outputText value="#{car.make}"/>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}"/>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}"/>
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Actions" />
</f:facet>
<a4j:commandLink value="Edit" action="#{carsBean.edit}" render="table"/>
<h:outputText value=" " />
<a4j:commandLink value="Remove" action="#{carsBean.remove}" render="table"/>
- </tbl:column>
- </tbl:dataTable>
+ </it:column>
+ </it:dataTable>
</h:form>
</ui:composition>
</html>
\ No newline at end of file
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2010-05-28 12:53:44 UTC (rev 17359)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/dataTable/tableStyling.xhtml 2010-05-28 13:44:31 UTC (rev 17360)
@@ -4,7 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:tbl="http://richfaces.org/rich"
+ xmlns:it="http://richfaces.org/iteration"
xmlns:fn="http://java.sun.com/jsp/jstl/functions">
<ui:composition>
@@ -23,9 +23,9 @@
<p>This sample shows simple table styling. The table appears in zebra-style and has
highlighting of hovered row.</p>
<h:form id="form">
- <tbl:dataTable value="#{carsBean.allInventoryItems}" var="car"
+ <it:dataTable value="#{carsBean.allInventoryItems}" var="car"
id="table" rows="20" rowClasses = "odd-row, even-row" styleClass="stable">
- <tbl:column accept="#{carsFiteringBean.acceptVendor}">
+ <it:column accept="#{carsFiteringBean.acceptVendor}">
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Vendor " />
@@ -36,20 +36,20 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vendor}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Model" />
</f:facet>
<h:outputText value="#{car.model}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<f:facet name="header">
<h:outputText value="Price" />
</f:facet>
<h:outputText value="#{car.price}" />
- </tbl:column>
- <tbl:column filter="#{carsFilteringBean.mileageFilterImpl}">
+ </it:column>
+ <it:column filter="#{carsFilteringBean.mileageFilterImpl}">
<f:facet name="header">
<h:panelGroup>
<h:outputText value="Mileage < " />
@@ -61,8 +61,8 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.mileage}" />
- </tbl:column>
- <tbl:column
+ </it:column>
+ <it:column
filterExpression="#{fn:containsIgnoreCase(car.vin,carFilteringBean.vinFilter)}">
<f:facet name="header">
<h:panelGroup>
@@ -73,8 +73,8 @@
</h:panelGroup>
</f:facet>
<h:outputText value="#{car.vin}" />
- </tbl:column>
- </tbl:dataTable>
+ </it:column>
+ </it:dataTable>
</h:form>
<script>
$('.stable tr').mouseover(function(){$(this).addClass('active-row')});
Modified: root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/tableToggleControl/tableToggleControl.xhtml
===================================================================
--- root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/tableToggleControl/tableToggleControl.xhtml 2010-05-28 12:53:44 UTC (rev 17359)
+++ root/examples/richfaces-showcase/trunk/src/main/webapp/richfaces/tableToggleControl/tableToggleControl.xhtml 2010-05-28 13:44:31 UTC (rev 17360)
@@ -4,8 +4,7 @@
xmlns:f="http://java.sun.com/jsf/core"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:a4j="http://richfaces.org/a4j"
- xmlns:tbl="http://richfaces.org/rich"
- xmlns:ds="http://richfaces.org/datascroller">
+ xmlns:it="http://richfaces.org/iteration">
<ui:composition>
<p>This sample shows simple master-detail table implemented using<b> rich:dataTable</b> and<b> rich:subtable</b> components</p>
@@ -18,67 +17,67 @@
<li>The developer could get control on current states of subTables using its <b>expanded</b> attribute.</li>
</ul>
<h:form>
- <tbl:dataTable value="#{carsBean.inventoryVendorLists}" var="list">
+ <it:dataTable value="#{carsBean.inventoryVendorLists}" var="list">
<f:facet name="header">
- <tbl:columnGroup>
- <tbl:column colspan="6">
+ <it:columnGroup>
+ <it:column colspan="6">
<h:outputText value="Cars marketplace" />
- </tbl:column>
- <tbl:column breakBefore="true">
+ </it:column>
+ <it:column breakBefore="true">
<h:outputText value="Model" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="Price" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="Mileage" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="VIN Code" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="Items stock" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="Days Live" />
- </tbl:column>
- </tbl:columnGroup>
+ </it:column>
+ </it:columnGroup>
</f:facet>
- <tbl:column colspan="6">
+ <it:column colspan="6">
<h:outputText value="#{list.vendor}" />
- <tbl:toggleControl for="sbtbl">
+ <it:toggleControl for="sbtbl">
<f:facet name="expand">
<a href="#">(show details)</a>
</f:facet>
<f:facet name="collapse">
<a href="#">(hide details)</a>
</f:facet>
- </tbl:toggleControl>
- </tbl:column>
- <tbl:subTable value="#{list.vendorItems}" var="item" id="sbtbl" expandMode="client">
- <tbl:column>
+ </it:toggleControl>
+ </it:column>
+ <it:subTable value="#{list.vendorItems}" var="item" id="sbtbl" expandMode="client">
+ <it:column>
<h:outputText value="#{item.model}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{item.price}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{item.mileage}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{item.vin}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{item.stock}" />
- </tbl:column>
- <tbl:column>
+ </it:column>
+ <it:column>
<h:outputText value="#{item.daysLive}" />
- </tbl:column>
+ </it:column>
<f:facet name="footer">
<h:outputText value="Total of #{list.vendor} Cars: #{list.count}" />
</f:facet>
- </tbl:subTable>
- </tbl:dataTable>
+ </it:subTable>
+ </it:dataTable>
</h:form>
</ui:composition>
</html>
\ No newline at end of file
Modified: root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml
===================================================================
--- root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-05-28 12:53:44 UTC (rev 17359)
+++ root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/pom.xml 2010-05-28 13:44:31 UTC (rev 17360)
@@ -99,10 +99,7 @@
<transformer implementation="org.richfaces.build.shade.resource.TaglibXmlResourceTransformer">
<taglibs>
<taglib>
- <targetNamespace>http://richfaces.org/a4j</targetNamespace>
- </taglib>
- <taglib>
- <targetNamespace>http://richfaces.org/rich</targetNamespace>
+ <targetNamespace>http://richfaces.org/iteration</targetNamespace>
<sourceNamespacesPattern>.*</sourceNamespacesPattern>
</taglib>
</taglibs>
Modified: root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml
===================================================================
--- root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-05-28 12:53:44 UTC (rev 17359)
+++ root/ui/misc/trunk/dist/richfaces-ui-misc-ui/pom.xml 2010-05-28 13:44:31 UTC (rev 17360)
@@ -100,10 +100,7 @@
<transformer implementation="org.richfaces.build.shade.resource.TaglibXmlResourceTransformer">
<taglibs>
<taglib>
- <targetNamespace>http://richfaces.org/a4j</targetNamespace>
- </taglib>
- <taglib>
- <targetNamespace>http://richfaces.org/rich</targetNamespace>
+ <targetNamespace>http://richfaces.org/misc</targetNamespace>
<sourceNamespacesPattern>.*</sourceNamespacesPattern>
</taglib>
</taglibs>
14 years, 7 months
JBoss Rich Faces SVN: r17359 - root/examples-sandbox/trunk/components.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2010-05-28 08:53:44 -0400 (Fri, 28 May 2010)
New Revision: 17359
Removed:
root/examples-sandbox/trunk/components/tables/
Modified:
root/examples-sandbox/trunk/components/pom.xml
Log:
https://jira.jboss.org/browse/RF-8668
Modified: root/examples-sandbox/trunk/components/pom.xml
===================================================================
--- root/examples-sandbox/trunk/components/pom.xml 2010-05-28 12:52:58 UTC (rev 17358)
+++ root/examples-sandbox/trunk/components/pom.xml 2010-05-28 12:53:44 UTC (rev 17359)
@@ -16,7 +16,6 @@
<name>Richfaces Examples Sandbox: Component Demos Aggregator</name>
<modules>
- <module>tables</module>
</modules>
<dependencies>
14 years, 7 months