Author: mvitenkov Date: 2008-05-02 11:59:42 -0400 (Fri, 02 May 2008) New Revision: 8414 Modified: trunk/test-applications/jsp/src/main/java/sortingAndFiltering/SortingAndFiltering.java Log: modify comparator: add checking for null values. Modified: trunk/test-applications/jsp/src/main/java/sortingAndFiltering/SortingAndFiltering.java =================================================================== --- trunk/test-applications/jsp/src/main/java/sortingAndFiltering/SortingAndFiltering.java 2008-05-02 15:54:52 UTC (rev 8413) +++ trunk/test-applications/jsp/src/main/java/sortingAndFiltering/SortingAndFiltering.java 2008-05-02 15:59:42 UTC (rev 8414) @@ -22,7 +22,14 @@ private final Comparator<Data> comparator = new Comparator<Data> () { public int compare(Data o1, Data o2) { - return o1.getStr1().length() - o2.getStr1().length(); + if ((o1.getStr1() != null) && (o2.getStr1() != null)) + return 0; + else if((o1.getStr1() != null) && (o2.getStr1() == null)) + return 1; + else if((o1.getStr1() == null) && (o2.getStr1() != null)) + return -1; + else + return o1.getStr1().length() - o2.getStr1().length(); } }; @@ -53,6 +60,11 @@ Random r = new Random(); for(int i = 0; i < 10; i++) data.add(new Data(i, r.nextInt(1000), Data.Random(6), r.nextInt(10000) + 98389, Data.Random(r.nextInt(10) + 1), r.nextInt(500000), Data.statusIcon[i % 5], Data.Random(3), false)); //new Data(i, Data.Random(5), Data.statusIcon[i % 5], Data.Random(6), false)); + + data.get(0).setStr0(null); + data.get(1).setStr1(null); + data.get(2).setStr2(null); + data.get(3).setStr3(null); } public String getSortMode() {