Changeset 6005 for vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/AllFacetValuesPanel.java

Timestamp:

02/23/15 08:18:26 (9 years ago)

Author:

Twan Goosen

Message:

Values provider uses converted field value when sorting
Refs #553

File:

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

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

@@ -27 +27 @@
 import eu.clarin.cmdi.vlo.wicket.model.BridgeOuterModel;
 import eu.clarin.cmdi.vlo.wicket.provider.FacetFieldValuesProvider;
+import eu.clarin.cmdi.vlo.wicket.provider.FieldValueConverterProvider;
 import java.util.Collections;
 import org.apache.solr.client.solrj.response.FacetField;
@@ -49 +50 @@
 import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
+import org.apache.wicket.spring.injection.annot.SpringBean;
 
 /**
@@ -59 +61 @@
  */
 public abstract class AllFacetValuesPanel extends GenericPanel<FacetField> {
+
+    @SpringBean
+    private FieldValueConverterProvider fieldValueConverterProvider;
 
     private final FacetFieldValuesProvider valuesProvider;
@@ -89 +94 @@
 
         // create a provider that shows all values and is sorted by name by default
-        valuesProvider = new FacetFieldValuesProvider(model, Integer.MAX_VALUE, FieldValueOrderSelector.NAME_SORT) {
+        valuesProvider = new FacetFieldValuesProvider(model, Integer.MAX_VALUE, FieldValueOrderSelector.NAME_SORT, fieldValueConverterProvider) {
 
             @Override
@@ -226 +231 @@
     }
 
-
     private class UpdateOptionsFormBehavior extends OnChangeAjaxBehavior {