Changeset 4542

Timestamp:

02/20/14 16:29:00 (10 years ago)

Author:

twagoo

Message:

Refactored FacetSelection?, now an interface with the wicket model implementing it itself

Location:

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

Files:

• pojo/FacetSelection.java (modified) (2 diffs)
• wicket/components/FacetsPanel.java (modified) (3 diffs)
• wicket/model/FacetSelectionModel.java (copied) (copied from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FacetSelection.java) (1 diff)

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

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 package eu.clarin.cmdi.vlo.pojo;
 
-import java.io.Serializable;
 import java.util.List;
-import java.util.concurrent.CopyOnWriteArrayList;
-import org.apache.wicket.model.IModel;
 
 /**
@@ -26 +24 @@
  * @author twagoo
  */
-public class FacetSelection implements Serializable {
+public interface FacetSelection {
 
-    private final String facet;
-    private final IModel<QueryFacetsSelection> selectionModel;
+    String getFacet();
 
-    public FacetSelection(String facet, IModel<QueryFacetsSelection> selectionModel) {
-        this.facet = facet;
-        this.selectionModel = selectionModel;
-    }
+    List<String> getFacetValues();
 
-    public String getFacet() {
-        return facet;
-    }
-
-    public QueryFacetsSelection getSelection() {
-        return selectionModel.getObject();
-    }
-
-    public List<String> getFacetValues() {
-        return new CopyOnWriteArrayList<String>(getSelection().getSelectionValues(facet));
-    }
-
+    QueryFacetsSelection getSelection();
+    
 }

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.components;
 
-import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.wicket.model.FacetSelectionModel;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.service.FacetFieldsService;
@@ -29 +29 @@
 import org.apache.wicket.markup.repeater.data.DataView;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -96 +95 @@
 
     private SelectedFacetPanel createSelectedFacetPanel(String facetName) {
-        final FacetSelection selection = new FacetSelection(facetName, model);
-        return new SelectedFacetPanel("facet", new Model(selection)) {
+        return new SelectedFacetPanel("facet", new FacetSelectionModel(facetName, model)) {
 
             @Override

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

@@ -15 +15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package eu.clarin.cmdi.vlo.pojo;
+package eu.clarin.cmdi.vlo.wicket.model;
 
-import java.io.Serializable;
+import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import java.util.List;
 import java.util.concurrent.CopyOnWriteArrayList;
+import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
 
 /**
+ * Model for FacetSelection that simply wraps a QueryFacetsSelection model and
+ * 'filters' for the specified facet
  *
  * @author twagoo
  */
-public class FacetSelection implements Serializable {
+public class FacetSelectionModel extends AbstractReadOnlyModel<FacetSelection> implements FacetSelection {
 
     private final String facet;
     private final IModel<QueryFacetsSelection> selectionModel;
 
-    public FacetSelection(String facet, IModel<QueryFacetsSelection> selectionModel) {
+    /**
+     * 
+     * @param facet facet to represent selection for
+     * @param selectionModel broad (multi-facet) selection model
+     */
+    public FacetSelectionModel(String facet, IModel<QueryFacetsSelection> selectionModel) {
         this.facet = facet;
         this.selectionModel = selectionModel;
     }
 
+    @Override
     public String getFacet() {
         return facet;
     }
 
+    @Override
+    public List<String> getFacetValues() {
+        return new CopyOnWriteArrayList<String>(getSelection().getSelectionValues(facet));
+    }
+
+    @Override
     public QueryFacetsSelection getSelection() {
         return selectionModel.getObject();
     }
 
-    public List<String> getFacetValues() {
-        return new CopyOnWriteArrayList<String>(getSelection().getSelectionValues(facet));
+    @Override
+    public FacetSelection getObject() {
+        return this;
+    }
+
+    @Override
+    public void detach() {
+        selectionModel.detach();
     }