Context Navigation

Changeset 4606

Timestamp:

02/28/14 15:00:19 (10 years ago)

Author:

Twan Goosen

Message:

detaching in compound models

Location:

Files:

-                      r4601
+                      r4606
     public void setObject(ExpansionState object) {
         final String facet = facetModel.getObject().getName();
         final ExpansionState state = expansionStateMapModel.getObject().put(facet, object);
+        expansionStateMapModel.getObject().put(facet, object);
+    }
     @Override
     public void detach() {
+        facetModel.detach();
+        expansionStateMapModel.detach();
+    }

-                      r4588
+                      r4606
 public class FacetFieldModel extends AbstractReadOnlyModel<FacetField> {
     //todo: can be made more efficient/elegant than wrapping fields model
+    //todo: can probably be made more efficient/elegant than wrapping fields model
     private final FacetFieldsModel fieldsModel;
 …
+    }
+    @Override
+    public void detach() {
+        super.detach();
+        fieldsModel.detach();
+    }
+}

-                      r4588
+                      r4606
 import java.util.List;
 import org.apache.solr.client.solrj.response.FacetField;
+import org.apache.wicket.model.IChainingModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
 …
+    }
+    @Override
+    public void detach() {
+        super.detach();
+        selectionModel.detach();
+    }
+}

r4533	r4606
78	78	return valuesBuilder.toString();
79	79	}
	80
	81	@Override
	82	public void detach() {
	83	super.detach();
	84	documentModel.detach();
	85	}
	86
	87
80	88	}

-                      r4530
+                      r4606
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
-import org.apache.wicket.util.convert.converter.BigDecimalConverter;
 /**
 …
     private final SolrDocumentService documentService;
     private final IModel<QueryFacetsSelection> selection;
+    private final IModel<QueryFacetsSelection> selectionModel;
     public SolrDocumentProvider(SolrDocumentService documentService, IModel<QueryFacetsSelection> selection) {
         this.documentService = documentService;
         this.selection = selection;
+        this.selectionModel = selection;
+    }
     @Override
     public Iterator<? extends SolrDocument> iterator(long first, long count) {
         final List<SolrDocument> documents = documentService.getDocuments(selection.getObject(),
+        final List<SolrDocument> documents = documentService.getDocuments(selectionModel.getObject(),
                 BigDecimal.valueOf(first).intValueExact(), // safe long->int conversion
                 BigDecimal.valueOf(count).intValueExact()); // safe long->int conversion
 …
     @Override
     public long size() {
         return documentService.getDocumentCount(selection.getObject());
+        return documentService.getDocumentCount(selectionModel.getObject());
+    }
 …
     @Override
     public void detach() {
+        selectionModel.detach();
+    }

Note: See TracChangeset for help on using the changeset viewer.