Changeset 4582 for vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SelectedFacetPanel.java

Timestamp:

02/27/14 15:14:16 (10 years ago)

Author:

twagoo

Message:

refactored construction of facet panels, both in facets panel and single collections facet panel

File:

• vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SelectedFacetPanel.java (modified) (2 diffs)

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

@@ -44 +44 @@
         super(id, model);
         this.model = model;
-        setDefaultModel(new CompoundPropertyModel<FacetSelection>(model));
 
         // Facet name becomes title
-        add(new Label("facet"));
+        add(new Label("facet", new PropertyModel(model, "facetField.name")));
         // Add removers for all selected values
         add(createSelectionRemovers("facetValueRemover"));
@@ -79 +78 @@
                         // Call callback
                         onValuesUnselected(
-                                model.getObject().getFacet(),
+                                model.getObject().getFacetField().getName(),
                                 // Remove a single value
                                 Collections.singleton(item.getModel().getObject()), target);