Changeset 4974

Timestamp:

04/14/14 15:18:14 (10 years ago)

Author:

Twan Goosen

Message:

Fixed removal of facet selection if selection is empty (like with string collection before)

Location:

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

Files:

• FacetSelection.java (modified) (1 diff)
• QueryFacetsSelection.java (modified) (1 diff)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FacetSelection.java

@@ -108 +108 @@
     }
 
+    /**
+     *
+     * @return whether this instance represents an actual selection
+     */
+    public boolean isEmpty() {
+        return selectionType != FacetSelectionType.NOT_EMPTY // 'not empty' does not require any value, other types do
+                && (values == null || values.isEmpty());
+    }
+
 }

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/QueryFacetsSelection.java

@@ -112 +112 @@
 
     public void selectValues(String facet, FacetSelection values) {
-        if (values == null) {
+        if (values == null || values.isEmpty()) {
             selection.remove(facet);
         } else {