Changeset 5157

Timestamp:

05/08/14 09:33:09 (10 years ago)

Author:

Twan Goosen

Message:

Merged a number of fixes from trunk to 3.0

Location:

vlo/branches/vlo-3.0/vlo-web-app

Files:

• . (modified) (1 prop)
• src/main/java/eu/clarin/cmdi/vlo/wicket/panels/search/FacetValuesPanel.html (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/vlo/wicket/provider/FacetFieldValuesProvider.java (modified) (2 diffs)
• src/main/java/eu/clarin/cmdi/vlo/wicket/provider/PartitionedDataProvider.java (modified) (2 diffs)
• src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-facets.less (modified) (1 diff)

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

@@ -30 +30 @@
                     <input type="submit" value="Search" class="nonjsfallback" />
                 </form>
-                <wicket:container wicket:id="valuesContainer">
+                <div wicket:id="valuesContainer">
                     <ul wicket:id="valuesList">
                         <li wicket:id="facetValues"><a wicket:id="facetSelect" href="index3.html"><span wicket:id="name">Dutch</span> (<span wicket:id="count">148167</span>)</a></li>
@@ -39 +39 @@
                         </ul>
                     </wicket:enclosure>
-                </wicket:container>
+                </div>
             </div>               
         </wicket:panel>

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

@@ -20 +20 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
+import com.google.common.collect.Lists;
 import com.google.common.collect.Ordering;
 import eu.clarin.cmdi.vlo.pojo.FieldValuesFilter;
@@ -125 +126 @@
         final ImmutableList sorted = getOrdering().immutableSortedCopy(filteredValues);
         if (sorted.size() > maxNumberOfItems) {
-            return sorted.subList(0, maxNumberOfItems);
+            return Lists.newArrayList(sorted.subList(0, maxNumberOfItems));
         } else {
             // return iterator starting at specified offset

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

@@ -27 +27 @@
 
 /**
- * Wrapper for a sortable data provider that partitions the returned data in sublist of a
- * predefined maximum size
+ * Wrapper for a sortable data provider that partitions the returned data in
+ * sublist of a predefined maximum size
  *
  * @author twagoo
@@ -92 +92 @@
     @Override
     public IModel<List<? extends T>> model(List<? extends T> object) {
-        return Model.ofList(object);
+        // Iterators.partition sometimes returns lists that are not deeply serializable, 
+        // so we need to copy this into a serializable list here :(
+        return Model.ofList(ImmutableList.copyOf(object));
     }
 

vlo/branches/vlo-3.0/vlo-web-app/src/main/less/eu/clarin/cmdi/vlo/wicket/pages/inc/vlo-facets.less

@@ -186 +186 @@
 }
 
-.filterform input {
+.filterform input[type='text'] {
     width: 85%;
     background-image: url('search-3-128.png');