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

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

@@ -10 +10 @@
 import javax.servlet.ServletContext;
 import org.apache.wicket.Application;
-import org.apache.wicket.PageParameters;
-import org.apache.wicket.Request;
 import org.apache.wicket.RequestCycle;
+import org.apache.wicket.request.RequestParameters;
 import org.apache.wicket.Response;
 import org.apache.wicket.protocol.http.WebApplication;
 import org.apache.wicket.protocol.http.WebRequest;
 import org.apache.wicket.protocol.http.WebRequestCycle;
-import org.apache.wicket.protocol.http.WebSession;
-import org.apache.wicket.request.RequestParameters;
+import org.apache.wicket.protocol.http.WebResponse;
 
 /**
@@ -31 +29 @@
     
     /**
-     * Customized client request cycle<br><br>
+     * Customised client request cycle<br><br>
      * 
      * <intercept resquest in order to update session parameter list>
      * 
-     * Add behavior to the web request handling by retrieving persistent
+     * Add behaviour to the web request handling by retrieving persistent
      * parameters to the application from from client requests, and store
      * the in the application object.
@@ -47 +45 @@
 
         /**
-         * Add the behavior to the beginning of the processing of a request
+         * Add the behaviour to the beginning of the processing of a request
          */
         @Override
@@ -64 +62 @@
             } else {
                 // check if the users requests a different theme 
-                if (object[0].matches(((ThemedSession)getSession()).getCurrentTheme().name)) {
+                if (object[0].matches(((VloSession)getSession()).getCurrentTheme().name)) {
                     // current theme requested, nothing to do
                 } else {
                     // different theme requested, compose it
-                    ((ThemedSession)getSession()).setCurrentTheme(new Theme (object[0]));
-                    // remember the theme as a persistent parameter
-                    ((ThemedSession)getSession()).persistentParameters.put("theme", object[0]);
+                    ((VloSession)getSession()).setCurrentTheme(new Theme (object[0]));
+                    // remember the theme as a vlo session page parameter
+                    ((VloSession)getSession()).vloSessionPageParameters.add("theme", object[0]);
                 }
             }
         }
     }
-
-    /**
-     * Put the the customized request cycle up for installation<br><br>
-     * 
-     * Note that casting the request to a WebRequest is assumed to be safe.
-     * 
-     * @param request the request to be passed on the the new handler
-     * @param response the response to be passed on the the new handler
-     * @return the new handler
-     */
-    @Override
-    public RequestCycle newRequestCycle(Request request, Response response){
         
-        /* Pass on the application object and  parameters to new the request 
-         * cycle when creating it.
-         */
-        CustomCycle cycle = new CustomCycle(this, (WebRequest)request, response);
-        
-        return cycle;
-    }
-    
-    /**
-     * Compose a map to be included in the HTML document, designating the 
-     * positions of the links to partner web sites
-     * 
-     * @return 
-     */
-    private String getClarinDPartnerLinkMap(){
-        String map;
-        
-        map = "<map name=\"partnerLinks\">\n";
-        map = map + "</map>";
-       
-        return map;
-    }
-    
-    /**
-     * Compose a map to be included in the HTML document, designating the 
-     * positions of the links to partner web sites
-     * 
-     * @return 
-     */
-    private String getDefaultPartnerLinkMap(){
-        String map;
-        
-        map = "<map name=\"partnerLinks\">\n";
-        map = appendToPartnerLinkMap (map,
-                "114.00,65,167.50,104",
-                "http://www.clarin.eu",
-                "clarin link");
-        map = appendToPartnerLinkMap (map,
-                "177.00,65,214,104",
-                "http://wals.info",
-                "wals link");
-        map = appendToPartnerLinkMap (map,
-                "229,65,279,104",
-                "http://linguistlist.org",
-                "linguistlist link");
-        map = appendToPartnerLinkMap (map,
-                "290,65,320,104",
-                "http://www.elra.info",
-                "elra link");
-        map = appendToPartnerLinkMap (map,
-                "328,65,370,104",
-                "http://www.mpi.nl/dobes",
-                "dobes link");
-        map = appendToPartnerLinkMap (map,
-                "379,65,428,104",
-                "http://www.dfki.de/web",
-                "dfki link");
-        map = appendToPartnerLinkMap (map,
-                "434,65,484,104",
-                "http://www.delaman.org",
-                "deleman link");
-        
-        map = map + "</map>";
-       
-        return map;
-    }
-    
-    /**
-     * Add a link location to the map indicating the partner links
-     * 
-     * @param map
-     * @return 
-     */
-    private String appendToPartnerLinkMap(String map, String coordinates,
-            String URL, String alt) {
-        
-        if (map == null) {
-          map = "<map name=\"partnerLinks\">\n";
-        } else if (map.equals("")) {
-            map = "<map name=\"partnerLinks\">\n";
-        }
-        
-        map = map + "<AREA SHAPE=\"rect\" COORDS=\"" + coordinates + "\" HREF=\"" + 
-                URL + "\" alt=\"" + alt + "\"/>\n";
-        
-        return map;
-    }
-    
-    public class ThemedSession extends WebSession {
-        
-        /**
-         * Remember the parameters that should persist in URLs to VLO pages
-         * <br><br>
-         */
-        public PageParameters persistentParameters = new PageParameters();
-        
-        /**
-         *
-         * @return
-         */
-        public PageParameters getPersistentParameters (){
-            return persistentParameters; 
-        }
-
-        /**
-         * Reflect the persistent parameters in the page parameter map<br><br>
-         *
-         * @param parameters a page parameter map
-         * @return the page parameter map including the current persistent
-         * parameters
-         */
-        public PageParameters reflectPersistentParameters(PageParameters parameters) {
-
-            parameters.putAll(persistentParameters);
-
-            // parameters.add("theme", "defaultTheme");
-            return parameters;
-        }
-
-        /**
-         * Theme currently applied in the VLO web application
-         */
-        private Theme currentTheme = new Theme ("defaultTheme"); 
-
-        public ThemedSession(Application application, Request request) {
-            super(application, request);
-        }
-
-        public Theme getCurrentTheme() {
-            return currentTheme;
-        }
-
-        public void setCurrentTheme(Theme currentTheme) {
-            this.currentTheme = currentTheme;
-        }
-    }
-    
-
-    @Override
-    public ThemedSession newSession(Request request, Response response) {
-        
-        return new ThemedSession(this, request);
-    }
-    
-    /**
-     * A theme is composed from a page title, a CSS file, two image files, and a
-     * partner link map relating coordinates in the right image to partner links
-     */
-    public class Theme {
-
-        public String name, pageTitle, topLeftImage, topRightImage, cssFile, 
-                partnerLinkMap;
-
-        /**
-         * Compose a theme<br><br>
-         *
-         * @param name the name of the theme to be composed
-         */
-        public Theme(String themeName) {
-            
-            String prefix = VloConfig.getReverseProxyPrefix();
-
-            if (themeName.matches("CLARIN-D")) {
-                // select the CLARIN-D theme's components
-                
-                pageTitle = "CLARIN-D Virtual Language Observatory - Resources";
-                topLeftImage = "Images/topleft-clarin-d.png";
-                topRightImage = "Images/topright-clarin-d.png";
-                if (prefix.length() == 0) {
-                    cssFile = "css/clarin-d.css";
-                } else {
-                    cssFile = prefix + "css/clarin-d.css";
-                }
-                partnerLinkMap = getClarinDPartnerLinkMap();
-                name = "CLARIN-D";
-            } else {
-                // select the default theme elements
-                pageTitle = "CLARIN Virtual Language Observatory - Resources";
-                topLeftImage = "Images/topleftvlo.gif";
-                topRightImage = "Images/toprightvlo.gif";
-
-                if (prefix.length() == 0) {
-                    cssFile = "css/main.css";
-                } else {
-                    cssFile = prefix + "css/main.css";
-                }
-                partnerLinkMap = getDefaultPartnerLinkMap();
-                name = "defaultTheme";
-            }
-            // remember the theme as a persistent parameter
-            // getPersistentParameters.put("theme", name);
-        }
-    }
-
     /**
      * Flag indicating whether or not the application object lives in a web
@@ -320 +112 @@
             VloContextConfig.switchToExternalConfig(servletContext);
         }
+        
+        // install the custom request cycle
+        WebRequest req = (WebRequest) RequestCycle.get().getRequest();
+        WebResponse res = (WebResponse) RequestCycle.get().getResponse();
+            
+        CustomCycle cycle;
+        cycle = new CustomCycle(this, req, res);
 
         // creata an object referring to the search results