Changeset 4594

Timestamp:

02/28/14 10:34:18 (10 years ago)

Author:

Twan Goosen

Message:

refactoring for readability in selected facet panel

File:

• vlo/branches/vlo-3.0/vlo-web-app/src/main/java/eu/clarin/cmdi/vlo/wicket/components/SelectedFacetPanel.java (modified) (3 diffs)

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

@@ -27 +27 @@
 import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.CompoundPropertyModel;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.PropertyModel;
@@ -66 +65 @@
                 // A label showing the name of the facet
                 item.add(new Label("facetValue", item.getModel()));
-
                 // A link to remove the value selection from this facet
-                item.add(createRemoveLink(item));
-            }
-
-            private AjaxFallbackLink createRemoveLink(final ListItem<String> item) {
-                return new AjaxFallbackLink("unselectValue") {
-
-                    @Override
-                    public void onClick(AjaxRequestTarget target) {
-                        // Call callback
-                        onValuesUnselected(
-                                model.getObject().getFacetField().getName(),
-                                // Remove a single value
-                                Collections.singleton(item.getModel().getObject()), target);
-                    }
-                };
+                item.add(new RemoveLink("unselectValue", item.getModel()));
             }
 
@@ -99 +83 @@
     protected abstract void onValuesUnselected(String facet, Collection<String> valuesRemoved, AjaxRequestTarget target);
 
+    public class RemoveLink extends AjaxFallbackLink {
+
+        private final IModel<String> valueModel;
+
+        public RemoveLink(String id, IModel<String> valueModel) {
+            super(id);
+            this.valueModel = valueModel;
+        }
+
+        @Override
+        public void onClick(AjaxRequestTarget target) {
+            // Remove a single value
+            // Call callback
+            onValuesUnselected(
+                    model.getObject().getFacetField().getName(),
+                    Collections.singleton(valueModel.getObject()), target);
+        }
+
+    }
 }