Changeset 4219

Timestamp:

01/07/14 10:40:28 (10 years ago)

Author:

twagoo

Message:

Fixed parameterized links to faceted search page

Location:

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

Files:

• VloPageParameters.java (modified) (1 diff)
• pages/FacetHeaderPanel.java (modified) (1 diff)
• pages/FacetLinkPanel.java (modified) (1 diff)
• pages/FacetedSearchPage.java (modified) (1 diff)

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

@@ -52 +52 @@
      * @return 
      */
-    public VloPageParameters convert (PageParameters param){
+    public static VloPageParameters convert (PageParameters param){
         List<NamedPair> entries = param.getAllNamed();
         

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

@@ -16 +16 @@
         copy.removeFilterQuery(model.getObject().getFacetField());
         PageParameters param = copy.getPageParameters();
-        
-        VloPageParameters newParam = new VloPageParameters ();
  
-        add(new BookmarkablePageLink("allLink", FacetedSearchPage.class, newParam));
+        add(new BookmarkablePageLink("allLink", FacetedSearchPage.class, param));
         add(new Label("headerLabelSelect", model.getObject().getSelectedValue()));
     }

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

@@ -21 +21 @@
         PageParameters param = q.getPageParameters();
         
-        VloPageParameters newParam = new VloPageParameters ();
-        
-        Link<Count> facetLink = new BookmarkablePageLink("facetLink", FacetedSearchPage.class, newParam);
+        Link<Count> facetLink = new BookmarkablePageLink("facetLink", FacetedSearchPage.class, param);
         facetLink.add(new Label("facetLinkLabel", model.getObject().getName()));
         add(facetLink);

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

@@ -54 +54 @@
     private final static Map<String, FacetConcept> facetNameMap = VLOMarshaller.getFacetConceptMapping(facetConceptsFile).getFacetConceptMap();
 
-    public FacetedSearchPage() {
-        this(new VloPageParameters());
+    public FacetedSearchPage(PageParameters params) {
+        this(VloPageParameters.convert(params));
     }