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

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

@@ -3 +3 @@
 import eu.clarin.cmdi.vlo.VloWebApplication;
 import eu.clarin.cmdi.vlo.VloSession;
-import eu.clarin.cmdi.vlo.VloPageParameters;
 import org.apache.wicket.markup.head.CssHeaderItem;
 import org.apache.wicket.markup.head.IHeaderResponse;
@@ -57 +56 @@
         
         // set the applications start page link to the faceted search page
-        VloPageParameters startPageParameters = new VloPageParameters ();
+        PageParameters startPageParameters = new PageParameters ();
+        // add the session persistent parameters
+        startPageParameters.mergeWith(((VloSession)this.getSession()).getVloSessionPageParameters());
 
         BookmarkablePageLink link = new BookmarkablePageLink("startpage",
@@ -71 +72 @@
         leftImage = new Image("leftimage", leftImageRes);
  
-        // merge the image to the page
+        // add the image to the page
         link.add(leftImage);
 
@@ -82 +83 @@
         rightImage = new Image("rightimage", rightImageRes);
         
-        // merge it to the page
+        // add it to the page
         add (rightImage);