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