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

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

@@ -2 +2 @@
 
 import eu.clarin.cmdi.vlo.VloWebApplication;
-import eu.clarin.cmdi.vlo.VloWebApplication.ThemedSession;
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.Resource;
+import eu.clarin.cmdi.vlo.VloSession;
+import eu.clarin.cmdi.vlo.VloPageParameters;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.markup.html.IHeaderContributor;
 import org.apache.wicket.markup.html.IHeaderResponse;
@@ -11 +11 @@
 import org.apache.wicket.markup.html.image.Image;
 import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.resource.ContextRelativeResource;
+import org.apache.wicket.request.resource.ContextRelativeResource;
 
 /**
@@ -52 +52 @@
         
         Label pageTitle;
-        pageTitle = new Label ("pagetitle", ((ThemedSession)getSession()).getCurrentTheme().pageTitle);
+        pageTitle = new Label ("pagetitle", ((VloSession)getSession()).getCurrentTheme().pageTitle);
         add (pageTitle);
         
         // set the applications start page link to the faceted search page
-        PageParameters startPageParameters = new PageParameters ();
-        
-        ((ThemedSession)getSession()).reflectPersistentParameters(startPageParameters);
-                
-                BookmarkablePageLink link = new BookmarkablePageLink("startpage", 
+        VloPageParameters startPageParameters = new VloPageParameters ();
+        startPageParameters.addToSession();
+
+        BookmarkablePageLink link = new BookmarkablePageLink("startpage",
                 FacetedSearchPage.class, startPageParameters);
         add(link);
-                       
+                   
         // refer to the the left part of the vlo banner as a resource
-        Resource leftImageRes;
-        leftImageRes = new ContextRelativeResource(((ThemedSession)getSession()).getCurrentTheme().topLeftImage);
+        ContextRelativeResource leftImageRes;
+        leftImageRes = new ContextRelativeResource(((VloSession)getSession()).getCurrentTheme().topLeftImage);
 
         // create the image
@@ -76 +75 @@
 
         // refer to the right part of the vlo banner as a resource
-        Resource rightImageRes;
-        rightImageRes = new ContextRelativeResource(((ThemedSession)getSession()).getCurrentTheme().topRightImage);
+        ContextRelativeResource rightImageRes;
+        rightImageRes = new ContextRelativeResource(((VloSession)getSession()).getCurrentTheme().topRightImage);
         
         // create the image
@@ -89 +88 @@
         
         Label partnerLinkMap;
-        partnerLinkMap = new Label ("partnerlinkmap", ((ThemedSession)getSession()).getCurrentTheme().partnerLinkMap);
+        partnerLinkMap = new Label ("partnerlinkmap", ((VloSession)getSession()).getCurrentTheme().partnerLinkMap);
         partnerLinkMap.setEscapeModelStrings(false);
         add (partnerLinkMap);
@@ -96 +95 @@
     /**
      * Include the theme's CSS file in the HTML page<br><br>
-     * 
+     *
      * This method is invoked when Wicket renders a VLO page.
-     * 
-     * @param response 
+     *
+     * @param response
      */
-    @Override
     public void renderHead(IHeaderResponse response) {
-                
-        response.renderCSSReference(((ThemedSession)getSession()).getCurrentTheme().cssFile);
+
+        response.renderCSSReference(((VloSession) getSession()).getCurrentTheme().cssFile);
     }