Changeset 4208 for vlo/branches/to-wicket-1.6/vlo_web_app/src/main/java/eu/clarin/cmdi/vlo/VloPageParameters.java

Timestamp:

12/20/13 10:03:18 (10 years ago)

Author:

keeloo

Message:

Finished the upgrade. The web application still needs to be tested.

File:

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

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

@@ -21 +21 @@
         // needs to be here because of the other constructor
         super ();
+        // add the theme parameter
+        // ...
     }
     
@@ -33 +35 @@
         // needs to be implemented
         
+        // present the page parameters in the old style
+        
         param = null;
         
@@ -39 +43 @@
 
     /**
+     * Take in  old style parameters. 
+     * 
+     * 
+     * not being used at the moment; use code in the previous method
      * 
      * @param param
@@ -61 +69 @@
 
     /**
-     * Add this, VLO page parameters, to the parameters that are already 
-     * associated with the session
      * 
+     * @param PersistentParameters parameters concerning theme and other 
+     * non query related parameters. These parameters are to kept in the URL
+     * during the session.
      */
-    public void addToSession() {        
+    public void merge(PageParameters parameters) {   
         
         // get a themed session from the current thread 
@@ -71 +80 @@
         themedSession = (VloSession)Session.get();
         
-        // store the parameters in the session object
-        themedSession.addVloSessionPageParameters (this);
+        // get the parameters associated with the session
+        PageParameters persistentParameters;
+        persistentParameters = themedSession.getVloSessionPageParameters();
+        
+        // merge the parameters with the persistent ones and return the result
+        
+        // ...
+        
     }
 }