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

Timestamp:

01/09/14 13:44:11 (10 years ago)

Author:

keeloo

Message:

Removed VloPageParameters? class. ResourceLinkPanel? test is failing.

File:

• vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/pages/ShowResultPage.java (modified) (4 diffs)

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

@@ -4 +4 @@
 import eu.clarin.cmdi.vlo.Resources;
 import eu.clarin.cmdi.vlo.StringUtils;
-import eu.clarin.cmdi.vlo.VloPageParameters;
+import eu.clarin.cmdi.vlo.VloSession;
 import eu.clarin.cmdi.vlo.config.VloConfig;
 import eu.clarin.cmdi.vlo.dao.DaoLocator;
@@ -82 +82 @@
             final SearchPageQuery query = new SearchPageQuery(currentParam);
 
-            // create parameters from the query, and merge them with session related parameters
-            VloPageParameters newParam;
-            newParam = new VloPageParameters(query.getPageParameters());
+            // create parameters from the query, and add them with session related parameters
+            PageParameters newParam;
+            newParam = new PageParameters(query.getPageParameters());
+            // add the session persistent parameters
+            newParam.mergeWith(((VloSession)this.getSession()).getVloSessionPageParameters());
 
             BookmarkablePageLink<String> backLink = new BookmarkablePageLink<String>("backLink", FacetedSearchPage.class, newParam);
@@ -425 +427 @@
     private void addFeedbackLink(final PageParameters parameters) {
 
-        // create VloPageParameters in orde to be able to convert to old style parameters
-        VloPageParameters newParam = new VloPageParameters(parameters);
+        PageParameters newParam = new PageParameters(parameters);
+        // add the session persistent paremeters
+        newParam.mergeWith(((VloSession)this.getSession()).getVloSessionPageParameters());
 
         final RequestCycle reqCycle = getRequestCycle();
-        final Url reqUrl = Url.parse(reqCycle.urlFor(ShowResultPage.class, newParam.convert()));
+        // the following will not be necessary anymore
+        // final Url reqUrl = Url.parse(reqCycle.urlFor(ShowResultPage.class, newParam.convert()));
+        final Url reqUrl = Url.parse(reqCycle.urlFor(ShowResultPage.class, newParam));
         String thisURL = reqCycle.getUrlRenderer().renderFullUrl(reqUrl);
 
@@ -453 +458 @@
 
         // create new page parameters from the query parameters and the session related ones
-        VloPageParameters newParam;
-        newParam = new VloPageParameters(query.getPageParameters());
+        PageParameters newParam;
+        newParam = new PageParameters(query.getPageParameters());
+        // add the session persistent parameters
+        // newParam.add(((VloSession)this.getSession()).getVloSessionPageParameters());
         newParam.add(ShowResultPage.PARAM_DOC_ID, UrlEncoder.QUERY_INSTANCE.encode(
                 docId,