Author: lfryc(a)redhat.com Date: 2011-02-16 10:52:15 -0500 (Wed, 16 Feb 2011) New Revision: 21700 Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/ColumnSortingMap.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java Log: made beans serialized to allow them work in MyFaces (RFPL-1134) Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/ColumnSortingMap.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/ColumnSortingMap.java 2011-02-16 15:51:36 UTC (rev 21699) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/ColumnSortingMap.java 2011-02-16 15:52:15 UTC (rev 21700) @@ -1,5 +1,6 @@ package org.richfaces.tests.metamer; +import java.io.Serializable; import java.util.Collection; import java.util.TreeMap; @@ -23,7 +24,9 @@ protected abstract Attributes getAttributes(); - public class ColumnSorting { + public class ColumnSorting implements Serializable { + private static final long serialVersionUID = 1L; + private String columnName; private SortOrder order = SortOrder.unsorted; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2011-02-16 15:51:36 UTC (rev 21699) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichCollapsibleSubTableBean.java 2011-02-16 15:52:15 UTC (rev 21700) @@ -56,7 +56,7 @@ // FIXME: @ManagedProperty(value = "#{model.employees}") private List<Employee> employees = Model.unmarshallEmployees(); private List<List<Employee>> lists; - private UICollapsibleSubTable binding; + private transient UICollapsibleSubTable binding; // true = model, false = empty table private boolean state; Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java 2011-02-16 15:51:36 UTC (rev 21699) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichColumnBean.java 2011-02-16 15:52:15 UTC (rev 21700) @@ -60,14 +60,8 @@ private String stateNameToFilter; private SortOrder sortOrder = SortOrder.ascending; - private final Filter<Capital> stateFilter = new Filter<Capital>() { + private Filter<Capital> stateFilter = new StateFilter(); - @Override - public boolean accept(Capital c) { - return c.getState().toLowerCase().contains(stateNameToFilter == null ? "" : stateNameToFilter.toLowerCase()); - } - }; - /** * Initializes the managed bean. */ @@ -106,24 +100,33 @@ public Filter<Capital> getStateNameFilter() { return stateFilter; } - + public String getStateNameToFilter() { return stateNameToFilter; } - + public void setStateNameToFilter(String stateNameToFilter) { this.stateNameToFilter = stateNameToFilter; } - + public SortOrder[] getSortOrders() { return SortOrder.values(); } - + public void setSortOrder(SortOrder sortOrder) { this.sortOrder = sortOrder; } - + public SortOrder getSortOrder() { return sortOrder; } + + private class StateFilter implements Filter<Capital>, Serializable { + private static final long serialVersionUID = 1L; + + public boolean accept(Capital c) { + return c.getState().toLowerCase() + .contains(stateNameToFilter == null ? "" : stateNameToFilter.toLowerCase()); + } + } } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2011-02-16 15:51:36 UTC (rev 21699) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2011-02-16 15:52:15 UTC (rev 21700) @@ -50,29 +50,21 @@ @ViewScoped public class RichDataTableBean implements Serializable { - private static final long serialVersionUID = 4814439475400649809L; + private static final long serialVersionUID = -1L; private static Logger logger; private Attributes attributes; - private UIDataTable binding; + + private transient UIDataTable binding; private DataComponentState dataTableState; private Map<Object, Integer> stateMap = new HashMap<Object, Integer>(); + private int page = 1; // true = model, false = empty table private boolean state = true; // sorting - private ColumnSortingMap sorting = new ColumnSortingMap() { - private static final long serialVersionUID = 1L; + private ColumnSortingMap sorting = new CustomColumnSortingMap(); - protected UIDataTableBase getBinding() { - return binding; - } - - protected Attributes getAttributes() { - return attributes; - } - }; - // filtering private Map<String, Object> filtering = new HashMap<String, Object>(); @@ -189,5 +181,16 @@ } }; } + + private class CustomColumnSortingMap extends ColumnSortingMap { + private static final long serialVersionUID = 1L; + protected UIDataTableBase getBinding() { + return binding; + } + + protected Attributes getAttributes() { + return attributes; + } + } } Modified: modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java =================================================================== --- modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2011-02-16 15:51:36 UTC (rev 21699) +++ modules/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2011-02-16 15:52:15 UTC (rev 21700) @@ -49,11 +49,11 @@ @ManagedBean(name = "richExtendedDataTableBean") @ViewScoped public class RichExtendedDataTableBean implements Serializable { - - private static final long serialVersionUID = 481478880649809L; + + private static final long serialVersionUID = 1L; private static Logger logger; private Attributes attributes; - private DataComponentState dataTableState; + private transient DataComponentState dataTableState; private Map<Object, Integer> stateMap = new HashMap<Object, Integer>(); private int page = 1; // true = model, false = empty table @@ -75,7 +75,7 @@ private Map<String, Object> filtering = new HashMap<String, Object>(); // facets private Map<String, String> facets = new HashMap<String, String>(); - private UIExtendedDataTable binding; + private transient UIExtendedDataTable binding; /** * Initializes the managed bean.