Changeset 4727

Timestamp:

03/17/14 10:57:22 (11 years ago)

Author:

Twan Goosen

Message:

specialised map entry model towards collection values and ensured serialisability

Location:

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket

Files:

• model/CollectionMapEntryModel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/MapEntryModel.java) (2 diffs)
• provider/FacetSelectionProvider.java (modified) (2 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/CollectionMapEntryModel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.model;
 
+import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import java.io.Serializable;
-import java.util.AbstractMap;
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collection;
 import java.util.Map.Entry;
 import org.apache.wicket.model.LoadableDetachableModel;
@@ -33 +32 @@
  * @param <V> value type
  */
-public class MapEntryModel<K extends Serializable, V extends Serializable> extends LoadableDetachableModel<Entry<K, V>> {
+public class CollectionMapEntryModel<K extends Serializable, V extends Serializable> extends LoadableDetachableModel<Entry<K, Collection<V>>> {
 
     private final K key;
-    private final V value;
+    private final Collection<V> value;
 
-    public MapEntryModel(Entry<K, V> entry) {
+    public CollectionMapEntryModel(Entry<K, Collection<V>> entry) {
         super(entry);
         key = entry.getKey();
-        value = entry.getValue();
+
+        final Collection<V> entryValue = entry.getValue();
+        if (entryValue instanceof Serializable) {
+            value = entryValue;
+        } else {
+            // copy to a serialisable collection
+            value = Lists.newArrayList(entryValue);
+        }
     }
 
     @Override
-    protected Entry<K, V> load() {
+    protected Entry<K, Collection<V>> load() {
         return Maps.immutableEntry(key, value);
     }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetSelectionProvider.java

@@ -19 +19 @@
 
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
-import eu.clarin.cmdi.vlo.wicket.model.MapEntryModel;
+import eu.clarin.cmdi.vlo.wicket.model.CollectionMapEntryModel;
 import java.util.Collection;
 import java.util.Iterator;
@@ -49 +49 @@
     @Override
     public IModel<Map.Entry<String, Collection<String>>> model(Map.Entry<String, Collection<String>> object) {
-        return new MapEntryModel<String, Collection<String>>(object);
+        return new CollectionMapEntryModel<String, String>(object);
     }