Author: bleny Date: 2013-08-01 15:34:06 +0200 (Thu, 01 Aug 2013) New Revision: 359 Url: http://forge.codelutin.com/projects/franciaflex-magalie/repository/revisions... Log: refs #2996 use guava instead of manuel code Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java Modified: trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java =================================================================== --- trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-08-01 13:19:34 UTC (rev 358) +++ trunk/magalie-persistence/src/main/java/com/franciaflex/magalie/persistence/RequestedArticles.java 2013-08-01 13:34:06 UTC (rev 359) @@ -33,28 +33,12 @@ public class RequestedArticles { - protected static class RequestedListComparator implements Comparator<RequestedArticle> { - - public RequestedListComparator(Comparator<RequestedList> requestedListComparator) { - this.requestedListComparator = requestedListComparator; - } - - protected Comparator<RequestedList> requestedListComparator; - - @Override - public int compare(RequestedArticle x, RequestedArticle y) { - return requestedListComparator.compare(x.getRequestedList(), y.getRequestedList()); - } - } - public static Comparator<RequestedArticle> comparator(RequestedList affectedRequestedList) { + Comparator<RequestedList> requestedListComparator = RequestedLists.comparator(affectedRequestedList); Comparator<RequestedArticle> comparator = Ordering.compound( Lists.newArrayList( - - new RequestedListComparator(RequestedLists.comparator(affectedRequestedList)), - - // we can still have ambiguous or priorities, so to be deterministic, use arbitrary order + Ordering.from(requestedListComparator).onResultOf(getRequestList()), priorityComparator() ) );