Changeset 4481

Timestamp:

02/07/14 16:26:50 (10 years ago)

Author:

twagoo

Message:

facetvalue -> facetselection

Location:

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

Files:

• components/FacetPanel.java (modified) (2 diffs)
• components/FacetsPanel.java (modified) (2 diffs)
• pages/FacetedSearchPage.java (modified) (2 diffs)
• pojo/FacetSelection.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FacetValue.java) (3 diffs)

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/components/FacetPanel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.components;
 
-import eu.clarin.cmdi.vlo.pojo.FacetValue;
+import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.panel.Panel;
@@ -29 +29 @@
 public class FacetPanel extends Panel {
 
-    public FacetPanel(String id, IModel<FacetValue> model) {
+    public FacetPanel(String id, IModel<FacetSelection> model) {
         super(id, model);
-        setDefaultModel(new CompoundPropertyModel<FacetValue>(model));
+        setDefaultModel(new CompoundPropertyModel<FacetSelection>(model));
         
         add(new Label("facet.name"));

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/components/FacetsPanel.java

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.components;
 
-import eu.clarin.cmdi.vlo.pojo.FacetValue;
+import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.markup.html.list.ListView;
@@ -29 +29 @@
 public class FacetsPanel extends Panel {
 
-    public FacetsPanel(String id, ListModel<FacetValue> model) {
+    public FacetsPanel(String id, ListModel<FacetSelection> model) {
         super(id, model);
-        add(new ListView<FacetValue>("facets", model) {
+        add(new ListView<FacetSelection>("facets", model) {
 
             @Override
-            protected void populateItem(ListItem<FacetValue> item) {
+            protected void populateItem(ListItem<FacetSelection> item) {
                 //TODO: Check whether a value has been selected or not
                 item.add(new FacetPanel("facet", item.getModel()));

vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetedSearchPage.java

@@ -3 +3 @@
 import eu.clarin.cmdi.vlo.components.FacetsPanel;
 import eu.clarin.cmdi.vlo.pojo.Facet;
-import eu.clarin.cmdi.vlo.pojo.FacetValue;
+import eu.clarin.cmdi.vlo.pojo.FacetSelection;
 import java.util.Arrays;
+import java.util.Collections;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.markup.html.WebPage;
@@ -16 +17 @@
         super(parameters);
 
-        add(new FacetsPanel("facets", new ListModel<FacetValue>(Arrays.asList(
-                new FacetValue(new Facet("Language"), "Dutch"),
-                new FacetValue(new Facet("Resource type"), "Text")
+        add(new FacetsPanel("facets", new ListModel<FacetSelection>(Arrays.asList(
+                new FacetSelection(new Facet("Language"), Collections.singleton("Dutch")),
+                new FacetSelection(new Facet("Resource type"), Collections.singleton("Text"))
         ))));
     }

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

@@ -18 +18 @@
 
 import java.io.Serializable;
+import java.util.Collection;
 
 /**
@@ -23 +24 @@
  * @author twagoo
  */
-public class FacetValue implements Serializable {
+public class FacetSelection implements Serializable {
 
     private final Facet facet;
 
-    private final String value;
+    private final Collection<String> values;
 
-    public FacetValue(Facet facet, String value) {
+    public FacetSelection(Facet facet, Collection<String> values) {
         this.facet = facet;
-        this.value = value;
+        this.values = values;
     }
 
@@ -38 +39 @@
     }
 
-    public String getValue() {
-        return value;
+    public Collection getValue() {
+        return values;
     }