Changeset 5105

Timestamp:

04/30/14 14:08:25 (10 years ago)

Author:

Twan Goosen

Message:

turned selected facet panel into a generic panel

File:

• vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SelectedFacetPanel.java (modified) (5 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/SelectedFacetPanel.java

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.pojo.FacetFieldSelection;
-import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import java.util.Collection;
 import java.util.Collections;
@@ -27 +26 @@
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.html.panel.GenericPanel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
@@ -37 +36 @@
  * @author twagoo
  */
-public abstract class SelectedFacetPanel extends Panel {
-
-    private final IModel<FacetFieldSelection> model;
+public abstract class SelectedFacetPanel extends GenericPanel<FacetFieldSelection> {
 
     public SelectedFacetPanel(String id, final IModel<FacetFieldSelection> model) {
         super(id, model);
-        this.model = model;
 
         // Add removers for all selected values for collapsed state
@@ -53 +49 @@
     private ListView<String> createSelectionRemovers(String id) {
         // Model of the list of selected values in this facet
-        final PropertyModel<List<String>> propertyModel = new PropertyModel<List<String>>(model, "facetValues");
+        final PropertyModel<List<String>> propertyModel = new PropertyModel<List<String>>(getModel(), "facetValues");
         // Repeating container of value + unselection links
         final ListView<String> listView = new ListView<String>(id, propertyModel) {
@@ -98 +94 @@
             // Call callback
             onValuesUnselected(
-                    model.getObject().getFacetField().getName(),
+                    SelectedFacetPanel.this.getModelObject().getFacetField().getName(),
                     Collections.singleton(valueModel.getObject()), target);
         }