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

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

@@ -138 +138 @@
             }
 
-            // finally, add the label to the form
+            // finally, merge the label to the form
             this.add(facetOverview);
         }
@@ -157 +157 @@
             add(submit);
             
-            // add link to help menu page 
+            // merge link to help menu page 
             String helpUrl = VloConfig.getHelpUrl();            
             ExternalLink helpLink = new ExternalLink("helpLink", helpUrl, "help");
@@ -186 +186 @@
 
             VloPageParameters newParam = new VloPageParameters();
-            newParam.mergeWith(param);
-            newParam.addToSession();
             
             setResponsePage(FacetedSearchPage.class, newParam);
@@ -304 +302 @@
                 }
 
-                // add HTML form to container
+                // merge HTML form to container
                 String labelString;
                 if (totalResults == 1) {
@@ -316 +314 @@
                 contentSearchLabel.setEscapeModelStrings(false);
                 contentSearchContainer.add(contentSearchLabel);
-                // contentSearchContainer.add(link);
+                // contentSearchContainer.merge(link);
             } catch (UnsupportedEncodingException uee) {
                 contentSearchContainer.setVisible(false);