Changeset 6005 for vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.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/provider/FacetFieldValuesProvider.java (modified) (19 diffs)

vlo/trunk/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java

@@ -38 +38 @@
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.apache.wicket.util.convert.IConverter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -49 +50 @@
  */
 public class FacetFieldValuesProvider extends SortableDataProvider<FacetField.Count, FieldValuesOrder> implements ListProvider<FacetField.Count> {
-
+    
     private final static Logger logger = LoggerFactory.getLogger(FacetFieldValuesProvider.class);
     private final IModel<FacetField> model;
     private final int maxNumberOfItems;
     private final Collection<String> lowPriorityValues;
+    private final FieldValueConverterProvider fieldValueConverterProvider;
 
     /**
@@ -71 +73 @@
      * @param lowPriorityValues values that should with low priority (e.g.
      * unknown, unspecified)
-     */
-    public FacetFieldValuesProvider(IModel<FacetField> model, Collection<String> lowPriorityValues) {
-        this(model, Integer.MAX_VALUE, lowPriorityValues);
+     * @param fieldValueConverterProvider
+     */
+    public FacetFieldValuesProvider(IModel<FacetField> model, Collection<String> lowPriorityValues, FieldValueConverterProvider fieldValueConverterProvider) {
+        this(model, Integer.MAX_VALUE, lowPriorityValues, fieldValueConverterProvider);
     }
 
@@ -81 +84 @@
      * @param max maximum number of values to show
      * @param lowPriorityValues (e.g. unknown, unspecified)
-     */
-    public FacetFieldValuesProvider(IModel<FacetField> model, int max, Collection<String> lowPriorityValues) {
-        this(model, max, lowPriorityValues, new SortParam<FieldValuesOrder>(FieldValuesOrder.COUNT, false));
-    }
-
-    public FacetFieldValuesProvider(IModel<FacetField> model, int max, SortParam<FieldValuesOrder> sort) {
-        this(model, max, null, sort);
+     * @param fieldValueConverterProvider
+     */
+    public FacetFieldValuesProvider(IModel<FacetField> model, int max, Collection<String> lowPriorityValues, FieldValueConverterProvider fieldValueConverterProvider) {
+        this(model, max, lowPriorityValues, new SortParam<FieldValuesOrder>(FieldValuesOrder.COUNT, false), fieldValueConverterProvider);
+    }
+    
+    public FacetFieldValuesProvider(IModel<FacetField> model, int max, SortParam<FieldValuesOrder> sort, FieldValueConverterProvider fieldValueConverterProvider) {
+        this(model, max, null, sort, fieldValueConverterProvider);
     }
 
@@ -97 +101 @@
      * @param lowPriorityValues (e.g. unknown, unspecified)
      * @param sort initial sort property and order
-     */
-    public FacetFieldValuesProvider(IModel<FacetField> model, int max, Collection<String> lowPriorityValues, SortParam<FieldValuesOrder> sort) {
+     * @param fieldValueConverterProvider
+     */
+    public FacetFieldValuesProvider(IModel<FacetField> model, int max, Collection<String> lowPriorityValues, SortParam<FieldValuesOrder> sort, FieldValueConverterProvider fieldValueConverterProvider) {
         this.model = model;
         this.maxNumberOfItems = max;
         this.lowPriorityValues = lowPriorityValues;
+        this.fieldValueConverterProvider = fieldValueConverterProvider;
         setSort(sort);
     }
@@ -113 +119 @@
         return null;
     }
-
+    
     @Override
     public Iterator<? extends FacetField.Count> iterator(long first, long count) {
@@ -119 +125 @@
         return getList().listIterator((int) first);
     }
-
+    
     @Override
     public List<? extends FacetField.Count> getList() {
@@ -132 +138 @@
         }
     }
-
+    
     @Override
     public long size() {
@@ -140 +146 @@
         return size;
     }
-
+    
     @Override
     public IModel<FacetField.Count> model(FacetField.Count object) {
@@ -161 +167 @@
         }
     }
-
+    
     private Iterable<Count> getFilteredValues() {
         if (filtered == null) {
@@ -170 +176 @@
         return filtered;
     }
-
+    
     private long getSize() {
         if (hasFilter()) {
@@ -182 +188 @@
         }
     }
-
+    
     private boolean hasFilter() {
         return getFilterModel() != null && getFilterModel().getObject() != null && !getFilterModel().getObject().isEmpty();
@@ -200 +206 @@
         }
     }
-
+    
     private Ordering getBaseOrdering() {
         final Ordering ordering;
@@ -206 +212 @@
             ordering = new CountOrdering();
         } else if (getSort().getProperty() == FieldValuesOrder.NAME) {
-            ordering = new NameOrdering(getLocale());
+            ordering = new NameOrdering(getLocale(), fieldValueConverterProvider.getConverter(model.getObject().getName()));
         } else {
             ordering = Ordering.natural();
         }
-
+        
         if (getSort().isAscending()) {
             return ordering;
@@ -217 +223 @@
         }
     }
-
+    
     protected Locale getLocale() {
         try {
@@ -229 +235 @@
         return Locale.getDefault();
     }
-
+    
     private final static class CountOrdering extends Ordering<FacetField.Count> {
-
+        
         @Override
         public int compare(Count arg0, Count arg1) {
@@ -237 +243 @@
         }
     };
-
+    
     private final static class NameOrdering extends Ordering<FacetField.Count> implements Serializable {
-
+        
         private final Collator collator;
-
-        public NameOrdering(Locale locale) {
+        private final IConverter<String> converter;
+        private final Locale locale;
+        
+        public NameOrdering(Locale locale, IConverter<String> converter) {
             collator = Collator.getInstance(locale);
             collator.setStrength(Collator.PRIMARY);
-        }
-
+            this.converter = converter;
+            this.locale = locale;
+        }
+        
         @Override
         public int compare(Count arg0, Count arg1) {
-            return collator.compare(arg0.getName(), arg1.getName());
+            if (converter == null) {
+                return collator.compare(arg0.getName(), arg1.getName());
+            } else {
+                return collator.compare(
+                        converter.convertToString(arg0.getName(), locale),
+                        converter.convertToString(arg1.getName(), locale));
+            }
         }
     };
@@ -258 +274 @@
      */
     private static class PriorityOrdering extends Ordering<FacetField.Count> {
-
+        
         private final Collection<String> lowPriorityValues;
-
+        
         public PriorityOrdering(Collection<String> lowPriorityValues) {
             this.lowPriorityValues = lowPriorityValues;
         }
-
+        
         @Override
         public int compare(Count arg0, Count arg1) {
-
+            
             if (lowPriorityValues.contains(arg0.getName())) {
                 if (!lowPriorityValues.contains(arg1.getName())) {
@@ -281 +297 @@
             return 0;
         }
-
+        
     };
-
+    
     @Override
     public void detach() {