Changeset 4240

Timestamp:

01/09/14 16:13:48 (10 years ago)

Author:

twagoo

Message:

Replaced calls getting session (either on component or statically) and casting to VloSession? with new convenience method VloSession?.get()

Location:

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

Files:

• VloSession.java (modified) (2 diffs)
• VloWebApplication.java (modified) (1 diff)
• pages/BasePage.java (modified) (6 diffs)
• pages/DocumentLinkPanel.java (modified) (1 diff)
• pages/FacetBoxPanel.java (modified) (1 diff)
• pages/FacetLinkPanel.java (modified) (1 diff)
• pages/FacetedSearchPage.java (modified) (2 diffs)
• pages/ShowResultPage.java (modified) (3 diffs)

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

@@ -1 +1 @@
 package eu.clarin.cmdi.vlo;
 
+import org.apache.wicket.Session;
 import org.apache.wicket.protocol.http.WebSession;
 import org.apache.wicket.request.Request;
@@ -68 +69 @@
         vloSessionPageParameters.mergeWith(parameters);
     }
+
+    /**
+     * @return the VLO session associated to current thread
+     */
+    public static VloSession get() {
+        return (VloSession) Session.get();
+    }
 }

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

@@ -62 +62 @@
                 } else {
                     // different theme requested, compose it
-                    ((VloSession) Session.get()).setCurrentTheme(new Theme(object.toString()));
+                    VloSession.get().setCurrentTheme(new Theme(object.toString()));
                     // remember the theme as a vlo session page parameter
                     PageParameters params = new PageParameters();
                     params.add("theme", object);
-                    ((VloSession) Session.get()).addVloSessionPageParameters(params);
+                    VloSession.get().addVloSessionPageParameters(params);
                 }
             }

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

@@ -52 +52 @@
         
         Label pageTitle;
-        pageTitle = new Label ("pagetitle", ((VloSession)getSession()).getCurrentTheme().pageTitle);
+        pageTitle = new Label ("pagetitle", VloSession.get().getCurrentTheme().pageTitle);
         add (pageTitle);
         
@@ -58 +58 @@
         PageParameters startPageParameters = new PageParameters ();
         // add the session persistent parameters
-        startPageParameters.mergeWith(((VloSession)this.getSession()).getVloSessionPageParameters());
+        startPageParameters.mergeWith(VloSession.get().getVloSessionPageParameters());
 
         BookmarkablePageLink link = new BookmarkablePageLink("startpage",
@@ -66 +66 @@
         // refer to the the left part of the vlo banner as a resource
         ContextRelativeResource leftImageRes;
-        leftImageRes = new ContextRelativeResource(((VloSession)getSession()).getCurrentTheme().topLeftImage);
+        leftImageRes = new ContextRelativeResource(VloSession.get().getCurrentTheme().topLeftImage);
 
         // create the image
@@ -77 +77 @@
         // refer to the right part of the vlo banner as a resource
         ContextRelativeResource rightImageRes;
-        rightImageRes = new ContextRelativeResource(((VloSession)getSession()).getCurrentTheme().topRightImage);
+        rightImageRes = new ContextRelativeResource(VloSession.get().getCurrentTheme().topRightImage);
         
         // create the image
@@ -89 +89 @@
         
         Label partnerLinkMap;
-        partnerLinkMap = new Label ("partnerlinkmap", ((VloSession)getSession()).getCurrentTheme().partnerLinkMap);
+        partnerLinkMap = new Label ("partnerlinkmap", VloSession.get().getCurrentTheme().partnerLinkMap);
         partnerLinkMap.setEscapeModelStrings(false);
         add (partnerLinkMap);
@@ -102 +102 @@
      */
     public void renderHead(IHeaderResponse response) {
-        response.render(CssHeaderItem.forUrl(((VloSession) getSession()).getCurrentTheme().cssFile));
+        response.render(CssHeaderItem.forUrl(VloSession.get().getCurrentTheme().cssFile));
     }    
 }

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

@@ -2 +2 @@
 
 import eu.clarin.cmdi.vlo.FacetConstants;
-import eu.clarin.cmdi.vlo.VloSession;
 import org.apache.solr.common.SolrDocument;
 import org.apache.wicket.markup.html.basic.Label;

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

@@ -69 +69 @@
         facetParameters.add(ShowAllFacetValuesPage.SELECTED_FACET_PARAM, facetField.getName());
         facetParameters.add(ShowAllFacetValuesPage.FACET_MIN_OCCURS, "1");
-        facetParameters.mergeWith(((VloSession)VloSession.get()).getVloSessionPageParameters());
+        facetParameters.mergeWith(VloSession.get().getVloSessionPageParameters());
 
         add(new BookmarkablePageLink("showMore", ShowAllFacetValuesPage.class, facetParameters) {

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

@@ -20 +20 @@
         q.setFilterQuery(count);
         PageParameters param = q.getPageParameters();
-        param.mergeWith(((VloSession) VloSession.get()).getVloSessionPageParameters());
+        param.mergeWith(VloSession.get().getVloSessionPageParameters());
         
         Link<Count> facetLink = new BookmarkablePageLink("facetLink", FacetedSearchPage.class, param);

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

@@ -167 +167 @@
             param = new PageParameters(query.getPageParameters());
             // add the session persistent parameters
-            param.mergeWith(((VloSession)this.getSession()).getVloSessionPageParameters());
+            param.mergeWith(VloSession.get().getVloSessionPageParameters());
 
             final RequestCycle reqCycle = getRequestCycle();
@@ -191 +191 @@
             PageParameters param = query.getPageParameters();
             // add the session persistent parameters
-            param.mergeWith(((VloSession)this.getSession()).getVloSessionPageParameters());
+            param.mergeWith(VloSession.get().getVloSessionPageParameters());
 
             setResponsePage(FacetedSearchPage.class, param);

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

@@ -85 +85 @@
             PageParameters newParam = new PageParameters(query.getPageParameters());
             // add the session persistent parameters
-            newParam.mergeWith(((VloSession) this.getSession()).getVloSessionPageParameters());
+            newParam.mergeWith(VloSession.get().getVloSessionPageParameters());
 
             BookmarkablePageLink<String> backLink = new BookmarkablePageLink<String>("backLink", FacetedSearchPage.class, newParam);
@@ -428 +428 @@
         PageParameters newParam = new PageParameters(parameters);
         // add the session persistent paremeters
-        newParam.mergeWith(((VloSession) this.getSession()).getVloSessionPageParameters());
+        newParam.mergeWith(VloSession.get().getVloSessionPageParameters());
 
         final RequestCycle reqCycle = getRequestCycle();
@@ -463 +463 @@
                 Application.get().getRequestCycleSettings().getResponseRequestEncoding())); // get current character set from request cycle
         // add the session persistent parameters
-        newParam.mergeWith(((VloSession) VloSession.get()).getVloSessionPageParameters());
+        newParam.mergeWith(VloSession.get().getVloSessionPageParameters());
         BookmarkablePageLink<ShowResultPage> docLink = new BookmarkablePageLink<ShowResultPage>(linkId, ShowResultPage.class,
                 newParam);