Author: ppitonak(a)redhat.com Date: 2010-07-26 07:53:04 -0400 (Mon, 26 Jul 2010) New Revision: 18232 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: * refactored 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-26 11:36:55 UTC (rev 18231) +++ root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichDataTableBean.java 2010-07-26 11:53:04 UTC (rev 18232) @@ -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-26 11:36:55 UTC (rev 18231) +++ root/tests/metamer/trunk/application/src/main/java/org/richfaces/tests/metamer/bean/RichExtendedDataTableBean.java 2010-07-26 11:53:04 UTC (rev 18232) @@ -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); } }