Changeset 5058

Timestamp:

04/25/14 07:13:56 (10 years ago)

Author:

Twan Goosen

Message:

refactoring for readability in facet values panel

File:

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

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetValuesPanel.java

@@ -58 +58 @@
 
     private final ModalWindow valuesWindow;
-    private final FacetFieldValuesProvider valuesProvider;
     private final IModel<QueryFacetsSelection> selectionModel;
     private final WebMarkupContainer valuesContainer;
@@ -72 +71 @@
         add(createFilterForm("filter"));
 
-        valuesProvider = new FacetFieldValuesProvider(model, MAX_NUMBER_OF_FACETS_TO_SHOW, LOW_PRIORITY_VALUES) {
-
-            @Override
-            protected IModel<FieldValuesFilter> getFilterModel() {
-                return filterModel;
-            }
-
-        };
-
         // create a container for values to allow for AJAX updates when filtering
         valuesContainer = new WebMarkupContainer("valuesContainer");
@@ -87 +77 @@
 
         // create a view for the actual values
-        final DataView<Count> valuesView = new DataView<Count>("facetValues", valuesProvider) {
-
-            @Override
-            protected void populateItem(final Item<Count> item) {
-                addFacetValue(item);
-            }
-        };
-        valuesView.setOutputMarkupId(true);
-        valuesContainer.add(valuesView);
+        valuesContainer.add(createValuesView("facetValues"));
 
         // create a link for showing all values        
@@ -103 +85 @@
         valuesWindow = createAllValuesWindow("allValues");
         add(valuesWindow);
+    }
+
+    private DataView<Count> createValuesView(String id) {
+        final FacetFieldValuesProvider valuesProvider = new FacetFieldValuesProvider(getModel(), MAX_NUMBER_OF_FACETS_TO_SHOW, LOW_PRIORITY_VALUES) {
+
+            @Override
+            protected IModel<FieldValuesFilter> getFilterModel() {
+                return filterModel;
+            }
+
+        };
+        final DataView<Count> valuesView = new DataView<Count>(id, valuesProvider) {
+
+            @Override
+            protected void populateItem(final Item<Count> item) {
+                addFacetValue(item);
+            }
+        };
+        valuesView.setOutputMarkupId(true);
+        return valuesView;
     }
 
@@ -140 +142 @@
                         target);
             }
-        };  
+        };
         item.add(selectLink);