Changeset 4235

Timestamp:

01/09/14 15:28:21 (10 years ago)

Author:

twagoo

Message:

Refactored adding theme as session page parameter
Merging with session parameters in FacetBoxPanel?

File:

• vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/FacetBoxPanel.java (modified) (2 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.VloSession;
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -66 +67 @@
         add(facetList);
         PageParameters facetParameters = new PageParameters ();
-           
-        PageParameters extraParameters = new PageParameters ();
-        // kj; add the new values directly
-        // extraParameters.add(ShowAllFacetValuesPage.SELECTED_FACET_PARAM, facetField.getName());
-        // extraParameters.add(ShowAllFacetValuesPage.FACET_MIN_OCCURS, "1");
         facetParameters.add(ShowAllFacetValuesPage.SELECTED_FACET_PARAM, facetField.getName());
         facetParameters.add(ShowAllFacetValuesPage.FACET_MIN_OCCURS, "1");
-        //TODO: merge again once implemented
-        // facetParameters.add(extraParameters);
+        facetParameters.mergeWith(((VloSession)VloSession.get()).getVloSessionPageParameters());
 
-        add(new BookmarkablePageLink("showMore", ShowAllFacetValuesPage.class, extraParameters) {
+        add(new BookmarkablePageLink("showMore", ShowAllFacetValuesPage.class, facetParameters) {
             @Override
             public boolean isVisible() {