Changeset 4924

Timestamp:

04/08/14 15:34:30 (10 years ago)

Author:

Twan Goosen

Message:

Created 'single facet panel' from collection panel in faceted search page so that it can be reused more easily

Location:

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

Files:

• pages/FacetedSearchPage.java (modified) (4 diffs)
• panels/SingleFacetPanel.java (added)
• panels/search/FacetPanel.java (modified) (7 diffs)

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

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.wicket.pages;
 
+import eu.clarin.cmdi.vlo.wicket.panels.SingleFacetPanel;
 import eu.clarin.cmdi.vlo.config.VloConfig;
-import eu.clarin.cmdi.vlo.pojo.ExpansionState;
 import eu.clarin.cmdi.vlo.wicket.panels.search.FacetsPanel;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
@@ -10 +10 @@
 import eu.clarin.cmdi.vlo.wicket.components.SearchForm;
 import eu.clarin.cmdi.vlo.wicket.panels.search.SearchResultsPanel;
-import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
 import eu.clarin.cmdi.vlo.wicket.model.FacetFieldsModel;
-import eu.clarin.cmdi.vlo.wicket.model.FacetSelectionModel;
 import eu.clarin.cmdi.vlo.wicket.panels.BreadCrumbPanel;
 import eu.clarin.cmdi.vlo.wicket.panels.search.FacetValuesPanel;
@@ -34 +32 @@
 
     private static final long serialVersionUID = 1L;
-    
+
     @SpringBean
     private FacetFieldsService facetFieldsService;
@@ -105 +103 @@
 
     private Panel createCollectionsPanel(final String id) {
-        final IModel<QueryFacetsSelection> queryModel = getModel();
-        final FacetFieldModel collectionFacetFieldModel = new FacetFieldModel(facetFieldsService, vloConfig.getCollectionFacet(), queryModel, FacetValuesPanel.MAX_NUMBER_OF_FACETS_TO_SHOW);
-        final FacetSelectionModel collectionSelectionModel = new FacetSelectionModel(collectionFacetFieldModel, queryModel);
-        final FacetPanel panel = new FacetPanel(id, collectionSelectionModel, new Model<ExpansionState>(ExpansionState.COLLAPSED)) {
+        final FacetPanel panel = new SingleFacetPanel(id, getModel(), vloConfig.getCollectionFacet(), facetFieldsService) {
 
             @Override
             protected void selectionChanged(AjaxRequestTarget target) {
                 updateSelection(target);
-            }
-
-            @Override
-            protected boolean isHideIfNoValues() {
-                // collections facets should always be visible, even if no
-                // values are present (due to no search results)
-                return false;
             }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetPanel.java

@@ -29 +29 @@
 import org.apache.wicket.extensions.ajax.markup.html.IndicatingAjaxFallbackLink;
 import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.html.panel.GenericPanel;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
@@ -42 +42 @@
  * @author twagoo
  */
-public abstract class FacetPanel extends Panel {
-
-    private final IModel<FacetSelection> selectionModel;
+public abstract class FacetPanel extends GenericPanel<FacetSelection> {
+
     private final IModel<ExpansionState> expansionStateModel;
 
@@ -53 +52 @@
         super(id, selectionModel);
 
-        this.selectionModel = selectionModel;
         this.expansionStateModel = expansionState;
 
@@ -89 +87 @@
 
         // Facet name becomes title
-        titleLink.add(new Label("title", new SolrFieldNameModel(new PropertyModel(selectionModel, "facetField.name"))));
+        titleLink.add(new Label("title", new SolrFieldNameModel(new PropertyModel(getModel(), "facetField.name"))));
         return titleLink;
     }
@@ -97 +95 @@
         super.onConfigure();
 
-        final boolean valuesSelected = !selectionModel.getObject().getFacetValues().isEmpty();
+        final boolean valuesSelected = !getModelObject().getFacetValues().isEmpty();
         facetValuesPanel.setVisible(!valuesSelected);
         selectedFacetPanel.setVisible(valuesSelected);
 
         // hide this entire panel is no values are selectable
-        setVisible(!isHideIfNoValues() || valuesSelected || selectionModel.getObject().getFacetField().getValueCount() > 0);
+        setVisible(!isHideIfNoValues() || valuesSelected || getModelObject().getFacetField().getValueCount() > 0);
     }
 
@@ -116 +114 @@
     private FacetValuesPanel createFacetValuesPanel(String id) {
         return new FacetValuesPanel(id,
-                new PropertyModel<FacetField>(selectionModel, "facetField"),
-                new PropertyModel<QueryFacetsSelection>(selectionModel, "selection")) {
+                new PropertyModel<FacetField>(getModel(), "facetField"),
+                new PropertyModel<QueryFacetsSelection>(getModel(), "selection")) {
                     @Override
                     public void onValuesSelected(String facet, Collection<String> value, AjaxRequestTarget target) {
                         // A value has been selected on this facet's panel, update the model!
-                        selectionModel.getObject().getSelection().selectValues(facet, value);
+                        FacetPanel.this.getModelObject().getSelection().selectValues(facet, value);
                         if (target != null) {
                             // reload entire page for now
@@ -131 +129 @@
 
     private SelectedFacetPanel createSelectedFacetPanel(String id) {
-        return new SelectedFacetPanel(id, selectionModel) {
+        return new SelectedFacetPanel(id, getModel()) {
             @Override
             public void onValuesUnselected(String facet, Collection<String> valuesRemoved, AjaxRequestTarget target) {
-                final QueryFacetsSelection selection = selectionModel.getObject().getSelection();
+                final QueryFacetsSelection selection = getModelObject().getSelection();
 
                 // Values have been removed, calculate remainder