Changeset 4512

Timestamp:

02/13/14 16:24:20 (10 years ago)

Author:

twagoo

Message:

Some tidying up in the connection between FacetsPanel? en FacetFieldsService?

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo

Files:

• components/FacetsPanel.java (modified) (2 diffs)
• service/impl/FacetFieldsDataProvider.java (modified) (3 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/components/FacetsPanel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.components;
 
-import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.FacetFieldsService;
 import eu.clarin.cmdi.vlo.service.impl.FacetFieldsDataProvider;
-import java.util.List;
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.markup.repeater.data.DataView;
-import org.apache.wicket.markup.repeater.data.IDataProvider;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.PropertyModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -42 +38 @@
     public FacetsPanel(String id, IModel<QueryFacetsSelection> model) {
         super(id, model);
+        add(new FacetsDataView("facets", model));
+    }
 
-        final IDataProvider<FacetField> provider = new FacetFieldsDataProvider(facetFieldsService, 
-                new PropertyModel<List<FacetSelection>>(model, "selection"),
-                new PropertyModel<String>(model, "query"));
-        add(new DataView<FacetField>("facets", provider) {
+    private class FacetsDataView extends DataView<FacetField> {
 
-            @Override
-            protected void populateItem(Item<FacetField> item) {
-                item.add(new FacetPanel("facet", item.getModel()));
-            }
-        });
+        public FacetsDataView(String id, IModel<QueryFacetsSelection> model) {
+            super(id, new FacetFieldsDataProvider(facetFieldsService, model));
+        }
+
+        @Override
+        protected void populateItem(Item<FacetField> item) {
+            item.add(new FacetPanel("facet", item.getModel()));
+        }
     }
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/service/impl/FacetFieldsDataProvider.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.FacetFieldsService;
 import java.util.Iterator;
@@ -25 +26 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
 
 /**
@@ -35 +37 @@
     private final IModel<List<FacetSelection>> selectionModel;
     private final IModel<String> searchQuery;
+
+    public FacetFieldsDataProvider(FacetFieldsService facetFieldService, IModel<QueryFacetsSelection> model) {
+        this(facetFieldService,
+                new PropertyModel<List<FacetSelection>>(model, "selection"),
+                new PropertyModel<String>(model, "query"));
+    }
 
     public FacetFieldsDataProvider(FacetFieldsService facetFieldService, IModel<List<FacetSelection>> selectionModel, IModel<String> searchQuery) {