Changeset 4962

Timestamp:

04/14/14 08:30:27 (10 years ago)

Author:

Twan Goosen

Message:

Renamed FacetSelection? to FacetFieldSelection? and FacetSelectionModel? to FacetFieldSelectionModel?

Location:

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

Files:

• pojo/FacetFieldSelection.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/pojo/FacetSelection.java) (1 diff)
• wicket/model/FacetFieldSelectionModel.java (moved) (moved from vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/model/FacetSelectionModel.java) (4 diffs)
• wicket/panels/SingleFacetPanel.java (modified) (2 diffs)
• wicket/panels/search/FacetPanel.java (modified) (3 diffs)
• wicket/panels/search/FacetsPanel.java (modified) (2 diffs)
• wicket/panels/search/SelectedFacetPanel.java (modified) (2 diffs)

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

@@ -25 +25 @@
  * @author twagoo
  */
-public interface FacetSelection {
+public interface FacetFieldSelection {
 
     FacetField getFacetField();

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.model;
 
-import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.pojo.FacetFieldSelection;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import java.util.Collection;
@@ -28 +28 @@
 
 /**
- * Model for FacetSelection that simply wraps a QueryFacetsSelection model and
+ * Model for FacetFieldSelection that simply wraps a QueryFacetsSelection model and
  * 'filters' for the specified facet
  *
  * @author twagoo
  */
-public class FacetSelectionModel extends AbstractReadOnlyModel<FacetSelection> implements FacetSelection {
+public class FacetFieldSelectionModel extends AbstractReadOnlyModel<FacetFieldSelection> implements FacetFieldSelection {
 
     private final IModel<QueryFacetsSelection> selectionModel;
@@ -43 +43 @@
      * @param selectionModel broad (multi-facet) selection model
      */
-    public FacetSelectionModel(IModel<FacetField> facetFieldModel, IModel<QueryFacetsSelection> selectionModel) {
+    public FacetFieldSelectionModel(IModel<FacetField> facetFieldModel, IModel<QueryFacetsSelection> selectionModel) {
         this.facetFieldModel = facetFieldModel;
         this.selectionModel = selectionModel;
@@ -70 +70 @@
 
     @Override
-    public FacetSelection getObject() {
+    public FacetFieldSelection getObject() {
         return this;
     }

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

@@ -22 +22 @@
 import eu.clarin.cmdi.vlo.service.solr.FacetFieldsService;
 import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
-import eu.clarin.cmdi.vlo.wicket.model.FacetSelectionModel;
+import eu.clarin.cmdi.vlo.wicket.model.FacetFieldSelectionModel;
 import eu.clarin.cmdi.vlo.wicket.panels.search.FacetPanel;
 import org.apache.wicket.model.IModel;
@@ -35 +35 @@
     public SingleFacetPanel(String id, IModel<QueryFacetsSelection> queryModel, String facetName, FacetFieldsService facetFieldsService) {
         //TODO: Limit to number of items shown while keeping 'more' function?
-        super(id, new FacetSelectionModel(new FacetFieldModel(facetFieldsService, facetName, queryModel, -1), queryModel), Model.of(ExpansionState.COLLAPSED));
+        super(id, new FacetFieldSelectionModel(new FacetFieldModel(facetFieldsService, facetName, queryModel, -1), queryModel), Model.of(ExpansionState.COLLAPSED));
     }
 

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

@@ -18 +18 @@
 
 import eu.clarin.cmdi.vlo.pojo.ExpansionState;
-import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.pojo.FacetFieldSelection;
 import eu.clarin.cmdi.vlo.pojo.QueryFacetsSelection;
 import eu.clarin.cmdi.vlo.wicket.model.SolrFieldNameModel;
@@ -42 +42 @@
  * @author twagoo
  */
-public abstract class FacetPanel extends GenericPanel<FacetSelection> {
+public abstract class FacetPanel extends GenericPanel<FacetFieldSelection> {
 
     private final IModel<ExpansionState> expansionStateModel;
@@ -49 +49 @@
     private final FacetValuesPanel facetValuesPanel;
 
-    public FacetPanel(String id, IModel<FacetSelection> selectionModel, IModel<ExpansionState> expansionState) {
+    public FacetPanel(String id, IModel<FacetFieldSelection> selectionModel, IModel<ExpansionState> expansionState) {
         super(id, selectionModel);
 

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

@@ -22 +22 @@
 import eu.clarin.cmdi.vlo.wicket.model.FacetExpansionStateModel;
 import eu.clarin.cmdi.vlo.wicket.model.FacetFieldModel;
-import eu.clarin.cmdi.vlo.wicket.model.FacetSelectionModel;
+import eu.clarin.cmdi.vlo.wicket.model.FacetFieldSelectionModel;
 import java.util.Collection;
 import java.util.HashMap;
@@ -78 +78 @@
                 item.add(
                         new FacetPanel("facet",
-                                new FacetSelectionModel(facetFieldModel, selectionModel),
+                                new FacetFieldSelectionModel(facetFieldModel, selectionModel),
                                 new FacetExpansionStateModel(facetFieldModel, expansionModel)) {
 

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

@@ -17 +17 @@
 package eu.clarin.cmdi.vlo.wicket.panels.search;
 
-import eu.clarin.cmdi.vlo.pojo.FacetSelection;
+import eu.clarin.cmdi.vlo.pojo.FacetFieldSelection;
 import java.util.Collection;
 import java.util.Collections;
@@ -38 +38 @@
 public abstract class SelectedFacetPanel extends Panel {
 
-    private final IModel<FacetSelection> model;
+    private final IModel<FacetFieldSelection> model;
 
-    public SelectedFacetPanel(String id, final IModel<FacetSelection> model) {
+    public SelectedFacetPanel(String id, final IModel<FacetFieldSelection> model) {
         super(id, model);
         this.model = model;