Changeset 4608

Timestamp:

02/28/14 15:22:54 (10 years ago)

Author:

Twan Goosen

Message:

detaching from components with multiple models

Location:

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

Files:

• components/FacetPanel.java (modified) (5 diffs)
• components/FacetsPanel.java (modified) (3 diffs)
• pages/FacetedSearchPage.java (modified) (3 diffs)

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

@@ -41 +41 @@
 public abstract class FacetPanel extends Panel {
 
-    private final IModel<FacetSelection> model;
+    private final IModel<FacetSelection> selectionModel;
+    private final IModel<ExpansionState> expansionStateModel;
 
     private final SelectedFacetPanel selectedFacetPanel;
     private final FacetValuesPanel facetValuesPanel;
-    private final IModel<ExpansionState> expansionStateModel;
 
-    public FacetPanel(String id, IModel<FacetSelection> model, IModel<ExpansionState> expansionState) {
-        super(id, model);
-        this.model = model;
+    public FacetPanel(String id, IModel<FacetSelection> selectionModel, IModel<ExpansionState> expansionState) {
+        super(id, selectionModel);
+        this.selectionModel = selectionModel;
         this.expansionStateModel = expansionState;
 
@@ -67 +67 @@
         super.onConfigure();
 
-        final boolean valuesSelected = !model.getObject().getFacetValues().isEmpty();
+        final boolean valuesSelected = !selectionModel.getObject().getFacetValues().isEmpty();
         facetValuesPanel.setVisible(!valuesSelected);
         selectedFacetPanel.setVisible(valuesSelected);
@@ -73 +73 @@
 
     private FacetValuesPanel createFacetValuesPanel(String id) {
-        return new FacetValuesPanel(id, new PropertyModel<FacetField>(model, "facetField")) {
+        return new FacetValuesPanel(id, new PropertyModel<FacetField>(selectionModel, "facetField")) {
             @Override
             public void onValuesSelected(String facet, Collection<String> value, AjaxRequestTarget target) {
                 // A value has been selected on this facet's panel, update the model!
-                model.getObject().getSelection().selectValues(facet, value);
+                selectionModel.getObject().getSelection().selectValues(facet, value);
                 // collapse after selection
                 expansionStateModel.setObject(ExpansionState.COLLAPSED);
@@ -89 +89 @@
 
     private SelectedFacetPanel createSelectedFacetPanel(String id) {
-        return new SelectedFacetPanel(id, model) {
+        return new SelectedFacetPanel(id, selectionModel) {
             @Override
             public void onValuesUnselected(String facet, Collection<String> valuesRemoved, AjaxRequestTarget target) {
-                final QueryFacetsSelection selection = model.getObject().getSelection();
+                final QueryFacetsSelection selection = selectionModel.getObject().getSelection();
                 // Values have been removed, calculate remainder
                 final Collection<String> currentSelection = selection.getSelectionValues(facet);
@@ -153 +153 @@
     }
 
+    @Override
+    public void detachModels() {
+        // this will detach selection model (passed to super through constructor)
+        super.detachModels();
+        // additional model not known by supertype
+        expansionStateModel.detach();
+    }
+
     protected abstract void selectionChanged(AjaxRequestTarget target);
 

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

@@ -51 +51 @@
      */
     public FacetsPanel(final String id, final IModel<List<FacetField>> facetsModel, final IModel<QueryFacetsSelection> selectionModel) {
-        super(id, selectionModel);
-        
+        super(id);
+
         final Map<String, ExpansionState> expansionStateMap = new HashMap<String, ExpansionState>();
         final MapModel<String, ExpansionState> expansionModel = new MapModel<String, ExpansionState>(expansionStateMap);
-        
+
         final ListView<FacetField> facetsView = new ListView<FacetField>("facets", facetsModel) {
-            
+
             @Override
             protected void populateItem(ListItem<FacetField> item) {
@@ -64 +64 @@
                                 new FacetSelectionModel(item.getModel(), selectionModel),
                                 new FacetExpansionStateModel(item.getModel(), expansionModel)) {
-                                    
-                                    @Override
-                                    protected void selectionChanged(AjaxRequestTarget target) {
-                                        FacetsPanel.this.selectionChanged(target);
-                                    }
-                                }
+
+                            @Override
+                            protected void selectionChanged(AjaxRequestTarget target) {
+                                FacetsPanel.this.selectionChanged(target);
+                            }
+                        }
                 );
             }
@@ -77 +77 @@
         add(facetsView);
     }
-    
+
     protected abstract void selectionChanged(AjaxRequestTarget target);
 }

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

@@ -61 +61 @@
     }
 
-    private Panel createCollectionsPanel(final String id, final Model<QueryFacetsSelection> queryModel) {
+    private Panel createCollectionsPanel(final String id, final IModel<QueryFacetsSelection> queryModel) {
         final FacetFieldModel collectionFacetFieldModel = new FacetFieldModel(facetFieldsService, vloConfig.getCollectionFacet(), queryModel);
         final FacetSelectionModel collectionSelectionModel = new FacetSelectionModel(collectionFacetFieldModel, queryModel);
@@ -75 +75 @@
     }
 
-    private Panel createFacetsPanel(final String id, final Model<QueryFacetsSelection> queryModel) {
+    private Panel createFacetsPanel(final String id, final IModel<QueryFacetsSelection> queryModel) {
         final IModel<List<FacetField>> facetFieldsModel = new FacetFieldsModel(facetFieldsService, vloConfig.getFacetFields(), queryModel);
         final FacetsPanel panel = new FacetsPanel(id, facetFieldsModel, queryModel) {
@@ -95 +95 @@
     }
 
-    private QueryFacetsSelection paramsToQueryFacetSelection(final PageParameters parameters) {
+    private static QueryFacetsSelection paramsToQueryFacetSelection(final PageParameters parameters) {
         final String query = parameters.get("q").toOptionalString();