Changeset 5140 for vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java

Timestamp:

05/07/14 11:48:38 (10 years ago)

Author:

Twan Goosen

Message:

Improved layout of Collections facet by allowing for a partitioned facet values view via a partioned data provider (+tests)

File:

• vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java (modified) (2 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java

@@ -47 +47 @@
  * @author twagoo
  */
-public class FacetFieldValuesProvider extends SortableDataProvider<FacetField.Count, FieldValuesOrder> {
+public class FacetFieldValuesProvider extends SortableDataProvider<FacetField.Count, FieldValuesOrder> implements ListProvider<FacetField.Count> {
 
     private final static Logger logger = LoggerFactory.getLogger(FacetFieldValuesProvider.class);
@@ -115 +115 @@
     @Override
     public Iterator<? extends FacetField.Count> iterator(long first, long count) {
-        final Iterable<Count> filtered = getFilteredValues();
+        // return iterator starting at specified offset
+        return getList().listIterator((int) first);
+    }
+
+    @Override
+    public List<? extends FacetField.Count> getList() {
+        final Iterable<Count> filteredValues = getFilteredValues();
         // sort what remains
-        final ImmutableList sorted = getOrdering().immutableSortedCopy(filtered);
+        final ImmutableList sorted = getOrdering().immutableSortedCopy(filteredValues);
         if (sorted.size() > maxNumberOfItems) {
-            return sorted.subList(0, maxNumberOfItems).listIterator((int) first);
+            return sorted.subList(0, maxNumberOfItems);
         } else {
             // return iterator starting at specified offset
-            return sorted.listIterator((int) first);
+            return sorted;
         }
     }