Changeset 5106

Timestamp:

05/01/14 12:32:10 (10 years ago)

Author:

Twan Goosen

Message:

Some local refactoring

Location:

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

Files:

• FacetsPanel.java (modified) (1 diff)
• SearchResultItemExpandedPanel.java (modified) (4 diffs)

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

@@ -74 +74 @@
                 // set of available values changes
                 // TODO: Limit to number of items shown while keeping 'more' function?
-                final FacetFieldModel facetFieldModel = new FacetFieldModel(facetFieldsService, item.getModelObject(), selectionModel);
+                final IModel<FacetField> facetFieldModel = new FacetFieldModel(facetFieldsService, item.getModelObject(), selectionModel);
                 item.add(
                         new FacetPanel("facet",

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

@@ -65 +65 @@
     private List<String> fieldOrder;
 
-    public SearchResultItemExpandedPanel(String id, final IModel<SolrDocument> documentModel, final IModel<SearchContext> selectionModel) {
+    public SearchResultItemExpandedPanel(String id, final IModel<SolrDocument> documentModel, final IModel<SearchContext> searchContextModel) {
         super(id, documentModel);
 
@@ -73 +73 @@
         
         // add link to record
-        add(new RecordPageLink("recordLink", documentModel, selectionModel));
+        add(new RecordPageLink("recordLink", documentModel, searchContextModel));
 
         // table with some basic properties
@@ -87 +87 @@
 
         // add a container for the resources (only visible if there are actual resources)
-        add(createResourcesView("resources", documentModel, selectionModel));
+        add(createResourcesView("resources", searchContextModel));
     }
 
-    private WebMarkupContainer createResourcesView(String id, final IModel<SolrDocument> documentModel, final IModel<SearchContext> selectionModel) {
+    private WebMarkupContainer createResourcesView(String id, final IModel<SearchContext> selectionModel) {
         final SolrFieldModel<String> resourceModel = new SolrFieldModel<String>(getModel(), FacetConstants.FIELD_RESOURCE);
         // create a container for the list view that is only visible if there actually are resources
@@ -106 +106 @@
 
         // create a link to the record page that is only visible when there are more resources than shown
-        final RecordPageLink moreLink = new RecordPageLink("more", documentModel, selectionModel) {
+        final RecordPageLink moreLink = new RecordPageLink("more", getModel(), selectionModel) {
 
             @Override