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

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

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo.pages;
 
-import eu.clarin.cmdi.vlo.VloWebApplication.ThemedSession;
-import org.apache.wicket.PageParameters;
+import eu.clarin.cmdi.vlo.VloPageParameters;
 import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 public class FacetHeaderPanel extends BasePanel {
@@ -15 +15 @@
         SearchPageQuery copy = query.getShallowCopy();
         copy.removeFilterQuery(model.getObject().getFacetField());
-        PageParameters pageParameters = copy.getPageParameters();
+        PageParameters param = copy.getPageParameters();
         
-        // pageParameters = webApp.reflectPersistentParameters(pageParameters);
-        pageParameters = ((ThemedSession)getSession()).reflectPersistentParameters(pageParameters);
-        
-        add(new BookmarkablePageLink("allLink", FacetedSearchPage.class, pageParameters));
+        VloPageParameters newParam = new VloPageParameters ();
+        newParam.mergeWith(param);
+        newParam.addToSession();
+       
+        add(new BookmarkablePageLink("allLink", FacetedSearchPage.class, newParam));
         add(new Label("headerLabelSelect", model.getObject().getSelectedValue()));
     }