Changeset 4199 for vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java

Timestamp:

12/18/13 09:51:19 (10 years ago)

Author:

keeloo

Message:

 

Location:

vlo/branches/to-wicket-1.6

Files:

• . (copied) (copied from vlo/trunk)
• vlo_web_app (copied) (copied from vlo/trunk/vlo_web_app)
• vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java (modified) (4 diffs)

vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.pages;
 
-import eu.clarin.cmdi.vlo.VloWebApplication;
-import eu.clarin.cmdi.vlo.VloWebApplication.ThemedSession;
+import eu.clarin.cmdi.vlo.VloPageParameters;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -9 +8 @@
 import org.apache.solr.client.solrj.response.FacetField;
 import org.apache.solr.client.solrj.response.FacetField.Count;
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.behavior.SimpleAttributeModifier;
+import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
@@ -36 +34 @@
         setOutputMarkupId(true);
         setMaxNrOfFacetValues(MAX_NR_OF_FACET_VALUES);
-        SimpleAttributeModifier tooltip = new SimpleAttributeModifier("title", tooltipText);
-        add(tooltip);
+        add(new AttributeModifier("title", tooltipText));
+        
     }
-    
+     
     @SuppressWarnings({"serial"})
     public FacetBoxPanel create(final SearchPageQuery query) {
@@ -67 +65 @@
         };
         add(facetList);
-        PageParameters pageParameters = query.getPageParameters();
-        pageParameters.add(ShowAllFacetValuesPage.SELECTED_FACET_PARAM, facetField.getName());
-        pageParameters.add(ShowAllFacetValuesPage.FACET_MIN_OCCURS, "1");
+        VloPageParameters facetParameters = new VloPageParameters ();
+                
+        facetParameters.add(ShowAllFacetValuesPage.SELECTED_FACET_PARAM, facetField.getName());
+        facetParameters.add(ShowAllFacetValuesPage.FACET_MIN_OCCURS, "1");
+        facetParameters.addToSession();
 
-        // pageParameters = webApp.reflectPersistentParameters(pageParameters);
-        pageParameters = ((ThemedSession)getSession()).reflectPersistentParameters(pageParameters);
-        
-        
-        add(new BookmarkablePageLink("showMore", ShowAllFacetValuesPage.class, pageParameters) {
-
+        add(new BookmarkablePageLink("showMore", ShowAllFacetValuesPage.class, facetParameters) {
             @Override
-                        public boolean isVisible() {
+            public boolean isVisible() {
                 return !facetModel.isSelected() && showMore;
             }
-
         });
         return this;