Changeset 4199 for vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetLinkPanel.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/FacetLinkPanel.java (modified) (2 diffs)

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

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.pages;
 
-import eu.clarin.cmdi.vlo.VloWebApplication.ThemedSession;
+import eu.clarin.cmdi.vlo.VloPageParameters;
 import org.apache.solr.client.solrj.response.FacetField.Count;
-import org.apache.wicket.PageParameters;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.markup.html.link.Link;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 public class FacetLinkPanel extends BasePanel {
@@ -19 +19 @@
         SearchPageQuery q = query.getShallowCopy();
         q.setFilterQuery(count);
-        PageParameters params = q.getPageParameters();
-
-//      params = webApp.reflectPersistentParameters(params);
-        params = ((ThemedSession)getSession()).reflectPersistentParameters(params);
+        PageParameters param = q.getPageParameters();
         
-        Link<Count> facetLink = new BookmarkablePageLink("facetLink", FacetedSearchPage.class, params);
+        VloPageParameters newParam = new VloPageParameters ();
+        newParam.mergeWith(param);
+        newParam.addToSession();
+        
+        Link<Count> facetLink = new BookmarkablePageLink("facetLink", FacetedSearchPage.class, newParam);
         facetLink.add(new Label("facetLinkLabel", model.getObject().getName()));
         add(facetLink);