Changeset 4653 for vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java

Timestamp:

03/07/14 15:58:35 (10 years ago)

Author:

Twan Goosen

Message:

made a VLO base page that is now parent to record page and faceted search page (for now just a shared header and footer)

File:

• vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java (modified) (5 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java

@@ -17 +17 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
@@ -28 +27 @@
  * @author twagoo
  */
-public class FacetedSearchPage extends WebPage {
+public class FacetedSearchPage extends VloBasePage<QueryFacetsSelection> {
 
     private static final long serialVersionUID = 1L;
@@ -47 +46 @@
 
         final QueryFacetsSelection selection = paramsConverter.fromParameters(parameters);
-        final Model<QueryFacetsSelection> queryModel = new Model<QueryFacetsSelection>(selection);
+        final IModel<QueryFacetsSelection> queryModel = new Model<QueryFacetsSelection>(selection);
+        setModel(queryModel);
 
         final SearchForm searchForm = new SearchForm("search", queryModel);
         add(searchForm);
 
-        collectionsPanel = createCollectionsPanel("collectionsFacet", queryModel);
+        collectionsPanel = createCollectionsPanel("collectionsFacet");
         add(collectionsPanel);
 
-        facetsPanel = createFacetsPanel("facets", queryModel);
+        facetsPanel = createFacetsPanel("facets");
         add(facetsPanel);
 
@@ -62 +62 @@
     }
 
-    private Panel createCollectionsPanel(final String id, final IModel<QueryFacetsSelection> queryModel) {
+    private Panel createCollectionsPanel(final String id) {
+        final IModel<QueryFacetsSelection> queryModel = getModel();
         final FacetFieldModel collectionFacetFieldModel = new FacetFieldModel(facetFieldsService, vloConfig.getCollectionFacet(), queryModel);
         final FacetSelectionModel collectionSelectionModel = new FacetSelectionModel(collectionFacetFieldModel, queryModel);
@@ -76 +77 @@
     }
 
-    private Panel createFacetsPanel(final String id, final IModel<QueryFacetsSelection> queryModel) {
+    private Panel createFacetsPanel(final String id) {
+        final IModel<QueryFacetsSelection> queryModel = getModel();
         final IModel<List<FacetField>> facetFieldsModel = new FacetFieldsModel(facetFieldsService, vloConfig.getFacetFields(), queryModel);
         final FacetsPanel panel = new FacetsPanel(id, facetFieldsModel, queryModel) {