Mark all elements as known in the processing method, not after rendering.

[Sone.git] / src / main / java / net / pterodactylus / sone / web / KnownSonesPage.java

diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
index a2ebc66..6b1b4e3 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
+++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
@@ -23,9 +23,10 @@ import java.util.List;
 
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.collection.Pagination;
+import net.pterodactylus.util.filter.Filters;
 import net.pterodactylus.util.number.Numbers;
-import net.pterodactylus.util.template.DataProvider;
 import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
 
 /**
  * This page shows all known Sones.
@@ -54,24 +55,16 @@ public class KnownSonesPage extends SoneTemplatePage {
         * {@inheritDoc}
         */
        @Override
-       protected void processTemplate(Request request, DataProvider dataProvider) throws RedirectException {
-               super.processTemplate(request, dataProvider);
-               List<Sone> knownSones = new ArrayList<Sone>(webInterface.getCore().getSones());
+       protected void processTemplate(Request request, TemplateContext templateContext) throws RedirectException {
+               super.processTemplate(request, templateContext);
+               List<Sone> knownSones = Filters.filteredList(new ArrayList<Sone>(webInterface.getCore().getSones()), Sone.EMPTY_SONE_FILTER);
                Collections.sort(knownSones, Sone.NICE_NAME_COMPARATOR);
                Pagination<Sone> sonePagination = new Pagination<Sone>(knownSones, 25).setPage(Numbers.safeParseInteger(request.getHttpRequest().getParam("page"), 0));
-               dataProvider.set("pagination", sonePagination);
-               dataProvider.set("knownSones", sonePagination.getItems());
-       }
+               templateContext.set("pagination", sonePagination);
+               templateContext.set("knownSones", sonePagination.getItems());
 
-       /**
-        * {@inheritDoc}
-        */
-       @Override
-       protected void postProcess(Request request, DataProvider dataProvider) {
-               super.postProcess(request, dataProvider);
-               @SuppressWarnings("unchecked")
-               List<Sone> sones = (List<Sone>) dataProvider.get("knownSones");
-               for (Sone sone : sones) {
+               /* mark Sones as known. */
+               for (Sone sone : sonePagination.getItems()) {
                        webInterface.getCore().markSoneKnown(sone);
                }
        }