Changeset 6480 for vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetsPanel.java

Timestamp:

08/19/15 11:31:02 (9 years ago)

Author:

davor.ostojic@oeaw.ac.at

Message:

Model of FacetsPanel? is replaced with FacetNamesModel?
components in FacetPanel? are rendered only if state is expanded and smth is selected -> reduces number of SOLR requests

File:

• vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetsPanel.java (modified) (3 diffs)

vlo/branches/vlo-3.3-oeaw/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetsPanel.java

@@ -50 +50 @@
  * @author twagoo
  */
-public abstract class FacetsPanel extends GenericPanel<List<FacetField>> {
+public abstract class FacetsPanel extends GenericPanel<List<String>> {
 
     @SpringBean
@@ -64 +64 @@
      * selection state
      */
-    public FacetsPanel(final String id, final IModel<List<FacetField>> facetsModel, final IModel<QueryFacetsSelection> selectionModel) {
-        super(id, facetsModel);
+    public FacetsPanel(final String id, final IModel<List<String>> facetNamesModel, final IModel<List<FacetField>> facetsModel, final IModel<QueryFacetsSelection> selectionModel) {
+        super(id, facetNamesModel);
 
         final Map<String, ExpansionState> expansionStateMap = new HashMap<String, ExpansionState>();
@@ -140 +140 @@
     private void setAllFacetsExpansionState(final ExpansionState state) {
         final Map<String, ExpansionState> expansionMap = expansionModel.getObject();
-        for (FacetField facet : getModelObject()) {
-            expansionMap.put(facet.getName(), state);
+        for (String facetName : getModelObject()) {
+            expansionMap.put(facetName, state);
         }
     }