Changeset 4604

Timestamp:

02/28/14 14:26:00 (10 years ago)

Author:

Twan Goosen

Message:

Made facet list view reuse its items (FacetPanels?)

Location:

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

Files:

• FacetPanel.java (modified) (3 diffs)
• FacetsPanel.java (modified) (2 diffs)

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

@@ -26 +26 @@
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxFallbackLink;
-import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.AbstractReadOnlyModel;
 import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
 import org.apache.wicket.model.PropertyModel;
 
@@ -63 +61 @@
 
         addExpansionComponents();
-    }
-
-    private void addExpansionComponents() {
-
-        // class modifier to apply correct class depending on state
-        add(new AttributeModifier("class", new AbstractReadOnlyModel<String>() {
-
-            @Override
-            public String getObject() {
-                switch (expansionStateModel.getObject()) {
-                    case COLLAPSED:
-                        return "facet collapsedfacet";
-                    case EXPANDED:
-                        return "facet expandedfacet";
-                    default:
-                        return "facet";
-                }
-            }
-        }));
-
-        // add expansion link
-        add(new AjaxFallbackLink("expand") {
-
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                expansionStateModel.setObject(ExpansionState.EXPANDED);
-                if (target != null) {
-                    target.add(FacetPanel.this);
-                }
-            }
-        });
-
-        // add collapse link
-        add(new AjaxFallbackLink("collapse") {
-
-            @Override
-            public void onClick(AjaxRequestTarget target) {
-                expansionStateModel.setObject(ExpansionState.COLLAPSED);
-                if (target != null) {
-                    target.add(FacetPanel.this);
-                }
-            }
-        });
-        setOutputMarkupId(true);
     }
 
@@ -155 +109 @@
     }
 
+    private void addExpansionComponents() {
+
+        // class modifier to apply correct class depending on state
+        add(new AttributeModifier("class", new AbstractReadOnlyModel<String>() {
+
+            @Override
+            public String getObject() {
+                switch (expansionStateModel.getObject()) {
+                    case COLLAPSED:
+                        return "facet collapsedfacet";
+                    case EXPANDED:
+                        return "facet expandedfacet";
+                    default:
+                        return "facet";
+                }
+            }
+        }));
+
+        // add expansion link
+        add(new AjaxFallbackLink("expand") {
+
+            @Override
+            public void onClick(AjaxRequestTarget target) {
+                expansionStateModel.setObject(ExpansionState.EXPANDED);
+                if (target != null) {
+                    target.add(FacetPanel.this);
+                }
+            }
+        });
+
+        // add collapse link
+        add(new AjaxFallbackLink("collapse") {
+
+            @Override
+            public void onClick(AjaxRequestTarget target) {
+                expansionStateModel.setObject(ExpansionState.COLLAPSED);
+                if (target != null) {
+                    target.add(FacetPanel.this);
+                }
+            }
+        });
+        setOutputMarkupId(true);
+    }
+
     protected abstract void selectionChanged(AjaxRequestTarget target);
 

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

@@ -56 +56 @@
         final MapModel<String, ExpansionState> expansionModel = new MapModel<String, ExpansionState>(expansionStateMap);
         
-        add(new ListView<FacetField>("facets", facetsModel) {
+        final ListView<FacetField> facetsView = new ListView<FacetField>("facets", facetsModel) {
             
             @Override
@@ -64 +64 @@
                                 new FacetSelectionModel(item.getModel(), selectionModel),
                                 new FacetExpansionStateModel(item.getModel(), expansionModel)) {
-                            
-                            @Override
-                            protected void selectionChanged(AjaxRequestTarget target) {
-                                FacetsPanel.this.selectionChanged(target);
-                            }
-                        }
+                                    
+                                    @Override
+                                    protected void selectionChanged(AjaxRequestTarget target) {
+                                        FacetsPanel.this.selectionChanged(target);
+                                    }
+                                }
                 );
             }
-        });
+        };
+        // facet list is not dynamic, so reuse items
+        facetsView.setReuseItems(true);
+        add(facetsView);
     }