Author: ppitonak(a)redhat.com Date: 2010-07-20 07:40:39 -0400 (Tue, 20 Jul 2010) New Revision: 18155 Modified: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java Log: * refactoring needed because of changes in class SortOrder Modified: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java =================================================================== --- root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2010-07-20 05:30:54 UTC (rev 18154) +++ root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2010-07-20 11:40:39 UTC (rev 18155) @@ -60,8 +60,8 @@ private boolean state = true; // sorting - private SortOrder capitalsOrder = SortOrder.unsorted; - private SortOrder statesOrder = SortOrder.unsorted; + private SortOrder capitalsOrder = SortOrder.UNSORTED; + private SortOrder statesOrder = SortOrder.UNSORTED; // filtering private String sexFilter; @@ -180,20 +180,20 @@ } public void sortByCapitals() { - statesOrder = SortOrder.unsorted; - if (capitalsOrder.equals(SortOrder.ascending)) { - setCapitalsOrder(SortOrder.descending); + statesOrder = SortOrder.UNSORTED; + if (capitalsOrder.equals(SortOrder.ASCENDING)) { + setCapitalsOrder(SortOrder.DESCENDING); } else { - setCapitalsOrder(SortOrder.ascending); + setCapitalsOrder(SortOrder.ASCENDING); } } public void sortByStates() { - capitalsOrder = SortOrder.unsorted; - if (statesOrder.equals(SortOrder.ascending)) { - setStatesOrder(SortOrder.descending); + capitalsOrder = SortOrder.UNSORTED; + if (statesOrder.equals(SortOrder.ASCENDING)) { + setStatesOrder(SortOrder.DESCENDING); } else { - setStatesOrder(SortOrder.ascending); + setStatesOrder(SortOrder.ASCENDING); } } Modified: root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java =================================================================== --- root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2010-07-20 05:30:54 UTC (rev 18154) +++ root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2010-07-20 11:40:39 UTC (rev 18155) @@ -60,8 +60,8 @@ private boolean state = true; // sorting - private SortOrder capitalsOrder = SortOrder.unsorted; - private SortOrder statesOrder = SortOrder.unsorted; + private SortOrder capitalsOrder = SortOrder.UNSORTED; + private SortOrder statesOrder = SortOrder.UNSORTED; // filtering private String sexFilter; @@ -195,20 +195,20 @@ } public void sortByCapitals() { - statesOrder = SortOrder.unsorted; - if (capitalsOrder.equals(SortOrder.ascending)) { - setCapitalsOrder(SortOrder.descending); + statesOrder = SortOrder.UNSORTED; + if (capitalsOrder.equals(SortOrder.ASCENDING)) { + setCapitalsOrder(SortOrder.DESCENDING); } else { - setCapitalsOrder(SortOrder.ascending); + setCapitalsOrder(SortOrder.ASCENDING); } } public void sortByStates() { - capitalsOrder = SortOrder.unsorted; - if (statesOrder.equals(SortOrder.ascending)) { - setStatesOrder(SortOrder.descending); + capitalsOrder = SortOrder.UNSORTED; + if (statesOrder.equals(SortOrder.ASCENDING)) { + setStatesOrder(SortOrder.DESCENDING); } else { - setStatesOrder(SortOrder.ascending); + setStatesOrder(SortOrder.ASCENDING); } }