Changeset 5120

Timestamp:

05/02/14 12:20:10 (10 years ago)

Author:

Twan Goosen

Message:

Fixed serialisation issue in FacetFieldValuesProvider?

File:

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

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

@@ -23 +23 @@
 import eu.clarin.cmdi.vlo.pojo.FieldValuesFilter;
 import eu.clarin.cmdi.vlo.pojo.FieldValuesOrder;
+import java.io.Serializable;
 import java.text.Collator;
 import java.util.Collection;
@@ -43 +44 @@
  * SOLR) present on a {@link FacetField}, sortable by either count or name
  *
- * TODO: Add option to hide values with only 1 record (as in VLO 2.x)
+ * TODO: cache values list/size
  *
  * @see FieldValuesOrder
@@ -176 +177 @@
         final Ordering ordering;
         if (getSort().getProperty() == FieldValuesOrder.COUNT) {
-            ordering = countOrdering;
+            ordering = new CountOrdering();
         } else if (getSort().getProperty() == FieldValuesOrder.NAME) {
-            ordering = nameOrdering;
+            ordering = new NameOrdering(getLocale());
         } else {
             ordering = Ordering.natural();
@@ -189 +190 @@
         }
     }
-
-    private final Ordering<FacetField.Count> countOrdering = new Ordering<FacetField.Count>() {
-
-        @Override
-        public int compare(Count arg0, Count arg1) {
-            return Long.compare(arg0.getCount(), arg1.getCount());
-        }
-    };
-
-    private final Ordering<FacetField.Count> nameOrdering = new Ordering<FacetField.Count>() {
-        private final Collator collator;
-
-        {
-            collator = Collator.getInstance(getLocale());
-            collator.setStrength(Collator.PRIMARY);
-        }
-
-        @Override
-        public int compare(Count arg0, Count arg1) {
-            return collator.compare(arg0.getName(), arg1.getName());
-        }
-    };
 
     protected Locale getLocale() {
@@ -223 +202 @@
         return Locale.getDefault();
     }
+
+    private final static class CountOrdering extends Ordering<FacetField.Count> {
+
+        @Override
+        public int compare(Count arg0, Count arg1) {
+            return Long.compare(arg0.getCount(), arg1.getCount());
+        }
+    };
+
+    private final static class NameOrdering extends Ordering<FacetField.Count> implements Serializable {
+
+        private final Collator collator;
+
+        public NameOrdering(Locale locale) {
+            collator = Collator.getInstance(locale);
+            collator.setStrength(Collator.PRIMARY);
+        }
+
+        @Override
+        public int compare(Count arg0, Count arg1) {
+            return collator.compare(arg0.getName(), arg1.getName());
+        }
+    };
 
     /**