Changeset 4591

Timestamp:

02/28/14 10:07:00 (10 years ago)

Author:

Twan Goosen

Message:

refactoring for readability in faceted search page

File:

• vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/pages/FacetedSearchPage.java (modified) (2 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.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;
 import org.apache.wicket.model.Model;
@@ -41 +42 @@
         final Model<QueryFacetsSelection> queryModel = new Model<QueryFacetsSelection>(selection);
 
+        add(createCollectionsPanel("collectionsFacet", queryModel));
+        add(createFacetsPanel("facets", queryModel));
+        
+        add(new SearchForm("search", queryModel));
+        add(new SearchResultsPanel("searchResults", queryModel));
+    }
+
+    private Panel createFacetsPanel(final String id, final Model<QueryFacetsSelection> queryModel) {
+        final IModel<List<FacetField>> facetFieldsModel = new FacetFieldsModel(facetFieldsService, vloConfig.getFacetFields(), queryModel);
+        final FacetsPanel facetsPanel = new FacetsPanel(id, facetFieldsModel, queryModel);
+        return facetsPanel;
+    }
+
+    private Panel createCollectionsPanel(final String id, final Model<QueryFacetsSelection> queryModel) {
         final FacetFieldModel collectionFacetFieldModel = new FacetFieldModel(facetFieldsService, vloConfig.getCollectionFacet(), queryModel);
         final FacetSelectionModel collectionSelectionModel = new FacetSelectionModel(collectionFacetFieldModel, queryModel);
-        add(new FacetPanel("collectionsFacet", collectionSelectionModel));
-
-        final IModel<List<FacetField>> facetFieldsModel = new FacetFieldsModel(facetFieldsService, vloConfig.getFacetFields(), queryModel);
-        add(new FacetsPanel("facets", facetFieldsModel, queryModel));
-
-        add(new SearchForm("search", queryModel));
-
-        add(new SearchResultsPanel("searchResults", queryModel));
+        final FacetPanel facetPanel = new FacetPanel(id, collectionSelectionModel);
+        return facetPanel;
     }